Merge remote-tracking branch 'arm-soc/for-next'

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

diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index ece47556afe677d5c229d9c827a501c5a285855e..d50dc2dbfd89e53571a716b80e01bd567400ea36 100644 (file)
--- 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;