summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/integratorcp.dts
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-11-02 01:20:43 +0100
committerLinus Walleij <linus.walleij@linaro.org>2012-11-16 22:26:07 +0100
commit64100a03ad0b94a45ed2753632d9dd68379ad3ac (patch)
tree2311102288e54bee4810cd435441ea4264e2344f /arch/arm/boot/dts/integratorcp.dts
parentARM: integrator: hook the AP into the SoC bus (diff)
downloadlinux-64100a03ad0b94a45ed2753632d9dd68379ad3ac.tar.xz
linux-64100a03ad0b94a45ed2753632d9dd68379ad3ac.zip
ARM: integrator: hook the CP into the SoC bus
This hooks the Integrator/CP into the SoC bus when booting from device tree, by mapping the CP controller registers first, then registering the SoC device, and then populating the device tree with the SoC device as parent. Cc: Lee Jones <lee.jones@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/integratorcp.dts')
-rw-r--r--arch/arm/boot/dts/integratorcp.dts5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/integratorcp.dts b/arch/arm/boot/dts/integratorcp.dts
index 2dd5e4e48481..8b119399025a 100644
--- a/arch/arm/boot/dts/integratorcp.dts
+++ b/arch/arm/boot/dts/integratorcp.dts
@@ -18,6 +18,11 @@
bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";
};
+ cpcon {
+ /* CP controller registers */
+ reg = <0xcb000000 0x100>;
+ };
+
timer0: timer@13000000 {
compatible = "arm,sp804", "arm,primecell";
};