Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

reset: Allow reset_get_by_name() with NULL name

Browse source 
This allows devm_reset_control_get(dev, NULL) to work and get the first
reset control, which is common in code ported from Linux.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Link: https://lore.kernel.org/r/20230122000252.53642-2-samuel@sholland.org
This commit is contained in:
Samuel Holland 2023-01-21 18:02:52 -06:00 committed by Sean Anderson
parent 2050f824e1
commit 5a675abfe7
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/reset/reset-uclass.c
View file

@ -147,16 +147,18 @@ int reset_get_bulk(struct udevice *dev, struct reset_ctl_bulk *bulk)
int reset_get_by_name(struct udevice *dev, const char *name, int reset_get_by_name(struct udevice *dev, const char *name,
struct reset_ctl *reset_ctl) struct reset_ctl *reset_ctl)
{ {
int index; int index = 0;
debug("%s(dev=%p, name=%s, reset_ctl=%p)\n", __func__, dev, name, debug("%s(dev=%p, name=%s, reset_ctl=%p)\n", __func__, dev, name,
reset_ctl); reset_ctl);
reset_ctl->dev = NULL; reset_ctl->dev = NULL;
index = dev_read_stringlist_search(dev, "reset-names", name); if (name) {
if (index < 0) { index = dev_read_stringlist_search(dev, "reset-names", name);
debug("fdt_stringlist_search() failed: %d\n", index); if (index < 0) {
return index; debug("fdt_stringlist_search() failed: %d\n", index);
return index;
}
} }
return reset_get_by_index(dev, index, reset_ctl); return reset_get_by_index(dev, index, reset_ctl);

3
include/reset.h
View file

@ -238,7 +238,8 @@ int reset_get_bulk(struct udevice *dev, struct reset_ctl_bulk *bulk);
* *
* @dev: The client device. * @dev: The client device.
* @name: The name of the reset signal to request, within the client's * @name: The name of the reset signal to request, within the client's
* list of reset signals. * list of reset signals, or NULL to request the first reset
* signal in the list.
* @reset_ctl: A pointer to a reset control struct to initialize. * @reset_ctl: A pointer to a reset control struct to initialize.
* Return: 0 if OK, or a negative error code. * Return: 0 if OK, or a negative error code.
*/ */

3
test/dm/reset.c
View file

@ -35,8 +35,7 @@ static int dm_test_reset_base(struct unit_test_state *uts)
/* Get the same reset port in 2 different ways and compare */ /* Get the same reset port in 2 different ways and compare */
ut_assertok(reset_get_by_index(dev, 0, &reset_method1)); ut_assertok(reset_get_by_index(dev, 0, &reset_method1));
ut_assertok(reset_get_by_index_nodev(dev_ofnode(dev), 0, ut_assertok(reset_get_by_name(dev, NULL, &reset_method1_1));
&reset_method1_1));
ut_assertok(reset_get_by_index(dev, 1, &reset_method2)); ut_assertok(reset_get_by_index(dev, 1, &reset_method2));
ut_assertok(reset_get_by_index_nodev(dev_ofnode(dev), 1, ut_assertok(reset_get_by_index_nodev(dev_ofnode(dev), 1,
&reset_method2_1)); &reset_method2_1));