Merge tag 'omap-for-v4.21/driver-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers

Few more omap driver fixes and improvments for v4.21 merge window

This series of changes improves the TI module flag handling to allow
booting with older dts files until the module flags have been moved
to the interconnect target module level. And there's a of_node_name_eq()
clean-up patch from Rob Herring for the GPMC driver.

* tag 'omap-for-v4.21/driver-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  memory: omap-gpmc: Use of_node_name_eq for node name comparisons
  bus: ti-sysc: Check for no-reset and no-idle flags at the child level
  ARM: OMAP2+: Check also the first dts child for hwmod flags

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index c215287e80cf..a66dea4f1ed2 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -2060,7 +2060,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
          * timings.
          */
         name = gpmc_cs_get_name(cs);
-        if (name && of_node_cmp(child->name, name) == 0)
+        if (name && of_node_name_eq(child, name))
                 goto no_timings;
 
         ret = gpmc_cs_request(cs, resource_size(&res), &base);
@@ -2068,7 +2068,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
                 dev_err(&pdev->dev, "cannot request GPMC CS %d\n", cs);
                 return ret;
         }
-        gpmc_cs_set_name(cs, child->name);
+        gpmc_cs_set_name(cs, child->full_name);
 
         gpmc_read_settings_dt(child, &gpmc_s);
         gpmc_read_timings_dt(child, &gpmc_t);
@@ -2113,7 +2113,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
                 goto err;
         }
 
-        if (of_node_cmp(child->name, "nand") == 0) {
+        if (of_node_name_eq(child, "nand")) {
                 /* Warn about older DT blobs with no compatible property */
                 if (!of_property_read_bool(child, "compatible")) {
                         dev_warn(&pdev->dev,
@@ -2123,7 +2123,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
                 }
         }
 
-        if (of_node_cmp(child->name, "onenand") == 0) {
+        if (of_node_name_eq(child, "onenand")) {
                 /* Warn about older DT blobs with no compatible property */
                 if (!of_property_read_bool(child, "compatible")) {
                         dev_warn(&pdev->dev,