diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-13 20:03:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-13 20:03:33 -0400 |
| commit | 4504062b271bf4d1cf256e4e87e156de6029e088 (patch) | |
| tree | a0cac720a2687f2ed4ccf15f473d06bb7c8dcb07 /drivers/pinctrl/meson/pinctrl-meson.c | |
| parent | 44afdc4a12b9f6f48338e7975e4f08cfe90dba74 (diff) | |
| parent | 42b7600d62ae288a8c12431d232b89b26ec61721 (diff) | |
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'drivers/pinctrl/meson/pinctrl-meson.c')
| -rw-r--r-- | drivers/pinctrl/meson/pinctrl-meson.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index d21a3dd755..30f7cfc820 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -122,7 +122,7 @@ static fdt_addr_t parse_address(int offset, const char *name, int na, int ns) int index, len = 0; const fdt32_t *reg; - index = fdt_find_string(gd->fdt_blob, offset, "reg-names", name); + index = fdt_stringlist_search(gd->fdt_blob, offset, "reg-names", name); if (index < 0) return FDT_ADDR_T_NONE; @@ -154,7 +154,7 @@ int meson_pinctrl_probe(struct udevice *dev) return -EINVAL; } - fdt_for_each_subnode(gd->fdt_blob, node, dev->of_offset) { + fdt_for_each_subnode(node, gd->fdt_blob, dev->of_offset) { if (fdt_getprop(gd->fdt_blob, node, "gpio-controller", &len)) { gpio = node; break; |