diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-10-10 16:24:58 (GMT) |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-16 12:10:14 (GMT) |
| commit | df36680f1a71eef97685c30eb9eaf55a6813b6cd (patch) | |
| tree | 6bf34e2c07d101dab4f93c7863dfb80b23cd8afd /arch/arm/mach-integrator/integrator_cp.c | |
| parent | 99d14a1d9b876c9847608983606fa1928f5bf8f3 (diff) | |
| download | linux-df36680f1a71eef97685c30eb9eaf55a6813b6cd.tar.xz | |
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>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_cp.c')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 422c3f9..1df6e76 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; |