ARM: integrator: core module registers from compatible strings

[karo-tx-linux.git] / arch / arm / mach-integrator / integrator_cp.c

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 422c3f9b4163daf700d218708e7ccbe690532f9b..1df6e7602cadb75dac78a961352624b8f855d73f 100644 (file)
--- 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;