diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2013-10-10 18:24:58 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-16 14:10:14 +0200 |
commit | df36680f1a71eef97685c30eb9eaf55a6813b6cd (patch) | |
tree | 6bf34e2c07d101dab4f93c7863dfb80b23cd8afd /arch/arm/boot/dts | |
parent | 99d14a1d9b876c9847608983606fa1928f5bf8f3 (diff) | |
download | op-kernel-dev-df36680f1a71eef97685c30eb9eaf55a6813b6cd.zip op-kernel-dev-df36680f1a71eef97685c30eb9eaf55a6813b6cd.tar.gz |
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/boot/dts')
-rw-r--r-- | arch/arm/boot/dts/integratorap.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/integratorcp.dts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts index 453ab0e..e6be931 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 ff1aea0..a3a06b8 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>; }; |