syscon: dm: Add a new method to get a regmap from DTS

syscon_regmap_lookup_by_phandle() can be used to get the regmap of a syscon
device from a reference in the DTS. It operates similarly to the linux
version of the namesake function.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 6722e18bc39c035e8fe6eac593c2f039030edeef..515acbb8b19e51f5c4a7fd129983a6c7046417c6 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -460,6 +460,8 @@
 
                test4 {
                        compatible = "denx,u-boot-probe-test";
+                       first-syscon = <&syscon0>;
+                       second-sys-ctrl = <&another_system_controller>;
                };
        };
 
@@ -540,12 +542,12 @@
                };
        };
 
-       syscon@0 {
+       syscon0: syscon@0 {
                compatible = "sandbox,syscon0";
                reg = <0x10 16>;
        };
 
-       syscon@1 {
+       another_system_controller: syscon@1 {
                compatible = "sandbox,syscon1";
                reg = <0x20 5
                        0x28 6

diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c
index 303e166a69c1b769f5006712c06dc3d855e1c2c4..661cf61d62abfb82167b29f895f7e6b1437c6332 100644 (file)
--- a/drivers/core/syscon-uclass.c
+++ b/drivers/core/syscon-uclass.c
@@ -53,6 +53,29 @@ static int syscon_pre_probe(struct udevice *dev)
 #endif
 }
 
+struct regmap *syscon_regmap_lookup_by_phandle(struct udevice *dev,
+                                              const char *name)
+{
+       struct udevice *syscon;
+       struct regmap *r;
+       int err;
+
+       err = uclass_get_device_by_phandle(UCLASS_SYSCON, dev,
+                                          name, &syscon);
+       if (err) {
+               dev_dbg(dev, "unable to find syscon device\n");
+               return ERR_PTR(err);
+       }
+
+       r = syscon_get_regmap(syscon);
+       if (!r) {
+               dev_dbg(dev, "unable to find regmap\n");
+               return ERR_PTR(-ENODEV);
+       }
+
+       return r;
+}
+
 int syscon_get_by_driver_data(ulong driver_data, struct udevice **devp)
 {
        struct udevice *dev;

diff --git a/include/syscon.h b/include/syscon.h
index 2aa73e520af1a70b02d5f676c65792b2f09bb21f..3df96e32764cd681d88804dc1dd0b9107ac4be0b 100644 (file)
--- a/include/syscon.h
+++ b/include/syscon.h
@@ -73,6 +73,19 @@ int syscon_get_by_driver_data(ulong driver_data, struct udevice **devp);
  */
 struct regmap *syscon_get_regmap_by_driver_data(ulong driver_data);
 
+/**
+ * syscon_regmap_lookup_by_phandle() - Look up a controller by a phandle
+ *
+ * This operates by looking up the given name in the device (device
+ * tree property) of the device using the system controller.
+ *
+ * @dev:       Device using the system controller
+ * @name:      Name of property referring to the system controller
+ * @return     A pointer to the regmap if found, ERR_PTR(-ve) on error
+ */
+struct regmap *syscon_regmap_lookup_by_phandle(struct udevice *dev,
+                                              const char *name);
+
 /**
  * syscon_get_first_range() - get the first memory range from a syscon regmap
  *

diff --git a/test/dm/syscon.c b/test/dm/syscon.c
index 77c79285d933a2079d468ebd4ab7847bab74a877..a294dda02e7dd6a5ce087d601ac67a7c919931db 100644 (file)
--- a/test/dm/syscon.c
+++ b/test/dm/syscon.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <syscon.h>
+#include <regmap.h>
 #include <asm/test.h>
 #include <dm/test.h>
 #include <test/ut.h>
@@ -43,3 +44,31 @@ static int dm_test_syscon_by_driver_data(struct unit_test_state *uts)
        return 0;
 }
 DM_TEST(dm_test_syscon_by_driver_data, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+
+/* Test system controller by phandle */
+static int dm_test_syscon_by_phandle(struct unit_test_state *uts)
+{
+       struct udevice *dev;
+       struct regmap *map;
+
+       ut_assertok(uclass_get_device_by_name(UCLASS_TEST_PROBE, "test4",
+                                             &dev));
+
+       ut_assertok_ptr(syscon_regmap_lookup_by_phandle(dev, "first-syscon"));
+       map = syscon_regmap_lookup_by_phandle(dev, "first-syscon");
+       ut_assert(map);
+       ut_assert(!IS_ERR(map));
+       ut_asserteq(1, map->range_count);
+
+       ut_assertok_ptr(syscon_regmap_lookup_by_phandle(dev,
+                                                       "second-sys-ctrl"));
+       map = syscon_regmap_lookup_by_phandle(dev, "second-sys-ctrl");
+       ut_assert(map);
+       ut_assert(!IS_ERR(map));
+       ut_asserteq(4, map->range_count);
+
+       ut_assert(IS_ERR(syscon_regmap_lookup_by_phandle(dev, "not-present")));
+
+       return 0;
+}
+DM_TEST(dm_test_syscon_by_phandle, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);