ARM: integrator: core module registers from compatible strings

This augments the core machine code for the Integrator platforms
to get their references to the core module device nodes by
using compatible strings instead of predefined node names
and rename the CP syscon node to be simply "syscon".

Reported-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

4 files changed, 17 insertions, 5 deletions

diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts
index 453ab0ea4d2b..e6be9315ff0a 100644
--- a/arch/arm/boot/dts/integratorap.dts
+++ b/arch/arm/boot/dts/integratorap.dts
@@ -19,7 +19,7 @@
         };
 
         syscon {
-                /* AP system controller registers */
+                compatible = "arm,integrator-ap-syscon";
                 reg = <0x11000000 0x100>;
                 interrupt-parent = <&pic>;
                 /* These are the logical module IRQs */
diff --git a/arch/arm/boot/dts/integratorcp.dts b/arch/arm/boot/dts/integratorcp.dts
index ff1aea0ee043..a3a06b893237 100644
--- a/arch/arm/boot/dts/integratorcp.dts
+++ b/arch/arm/boot/dts/integratorcp.dts
@@ -18,8 +18,8 @@
                 bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";
         };
 
-        cpcon {
-                /* CP controller registers */
+        syscon {
+                compatible = "arm,integrator-cp-syscon";
                 reg = <0xcb000000 0x100>;
         };
 
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index ece47556afe6..d50dc2dbfd89 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -470,6 +470,11 @@ static struct of_dev_auxdata ap_auxdata_lookup[] __initdata = {
         { /* sentinel */ },
 };
 
+static const struct of_device_id ap_syscon_match[] = {
+        { .compatible = "arm,integrator-ap-syscon"},
+        { },
+};
+
 static void __init ap_init_of(void)
 {
         unsigned long sc_dec;
@@ -486,7 +491,8 @@ static void __init ap_init_of(void)
         root = of_find_node_by_path("/");
         if (!root)
                 return;
-        syscon = of_find_node_by_path("/syscon");
+
+        syscon = of_find_matching_node(root, ap_syscon_match);
         if (!syscon)
                 return;
 
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 422c3f9b4163..1df6e7602cad 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -286,6 +286,11 @@ static struct of_dev_auxdata intcp_auxdata_lookup[] __initdata = {
         { /* sentinel */ },
 };
 
+static const struct of_device_id intcp_syscon_match[] = {
+        { .compatible = "arm,integrator-cp-syscon"},
+        { },
+};
+
 static void __init intcp_init_of(void)
 {
         struct device_node *root;
@@ -300,7 +305,8 @@ static void __init intcp_init_of(void)
         root = of_find_node_by_path("/");
         if (!root)
                 return;
-        cpcon = of_find_node_by_path("/cpcon");
+
+        cpcon = of_find_matching_node(root, intcp_syscon_match);
         if (!cpcon)
                 return;