Merge tag 'driver-core-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / drivers / of / property.c

diff --git a/drivers/of/property.c b/drivers/of/property.c
index c651aad6f34b1db3311e230f7ec8993e97d63897..fb210e921ca9452ddf59f1a539968f37cea28ed7 100644 (file)
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -1144,8 +1144,8 @@ static struct device_node *parse_prop_cells(struct device_node *np,
        if (strcmp(prop_name, list_name))
                return NULL;
 
-       if (of_parse_phandle_with_args(np, list_name, cells_name, index,
-                                      &sup_args))
+       if (__of_parse_phandle_with_args(np, list_name, cells_name, 0, index,
+                                        &sup_args))
                return NULL;
 
        return sup_args.np;
@@ -1249,7 +1249,7 @@ DEFINE_SIMPLE_PROP(dmas, "dmas", "#dma-cells")
 DEFINE_SIMPLE_PROP(power_domains, "power-domains", "#power-domain-cells")
 DEFINE_SIMPLE_PROP(hwlocks, "hwlocks", "#hwlock-cells")
 DEFINE_SIMPLE_PROP(extcon, "extcon", NULL)
-DEFINE_SIMPLE_PROP(nvmem_cells, "nvmem-cells", NULL)
+DEFINE_SIMPLE_PROP(nvmem_cells, "nvmem-cells", "#nvmem-cell-cells")
 DEFINE_SIMPLE_PROP(phys, "phys", "#phy-cells")
 DEFINE_SIMPLE_PROP(wakeup_parent, "wakeup-parent", NULL)
 DEFINE_SIMPLE_PROP(pinctrl0, "pinctrl-0", NULL)