summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/integratorcp.dts
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-11-02 00:20:43 (GMT)
committerLinus Walleij <linus.walleij@linaro.org>2012-11-16 21:26:07 (GMT)
commit64100a03ad0b94a45ed2753632d9dd68379ad3ac (patch)
tree2311102288e54bee4810cd435441ea4264e2344f /arch/arm/boot/dts/integratorcp.dts
parente67ae6be734de909954e20317c38472af983b92c (diff)
downloadlinux-fsl-qoriq-64100a03ad0b94a45ed2753632d9dd68379ad3ac.tar.xz
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 2dd5e4e..8b11939 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";
};