summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-09-06 09:09:11 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-09-17 23:20:23 +0100
commit73efd53012af7775a4504da46ebf4145528d50e7 (patch)
tree5a287cbba28ac33007223a21e9846b57979bdb87 /arch/arm/boot/dts
parent4672cddff21f6edde857aa4b523bbc1bfc741cf8 (diff)
ARM: 7519/1: integrator: convert platform devices to Device Tree
This moves the physmap flash and SMSC91x ethernet devices over to the device tree, moving the static board code down into the #ifndef CONFIG_OF section. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/integrator.dtsi5
-rw-r--r--arch/arm/boot/dts/integratorcp.dts7
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/integrator.dtsi b/arch/arm/boot/dts/integrator.dtsi
index 9bcc09d54457..813b91d7bea2 100644
--- a/arch/arm/boot/dts/integrator.dtsi
+++ b/arch/arm/boot/dts/integrator.dtsi
@@ -31,6 +31,11 @@
clear-mask = <0xffffffff>;
};
+ flash@24000000 {
+ compatible = "cfi-flash";
+ reg = <0x24000000 0x02000000>;
+ };
+
fpga {
compatible = "arm,amba-bus", "simple-bus";
#address-cells = <1>;
diff --git a/arch/arm/boot/dts/integratorcp.dts b/arch/arm/boot/dts/integratorcp.dts
index 7bd49466cb0d..2dd5e4e48481 100644
--- a/arch/arm/boot/dts/integratorcp.dts
+++ b/arch/arm/boot/dts/integratorcp.dts
@@ -52,6 +52,13 @@
valid-mask = <0x00000fff>;
};
+ ethernet@c8000000 {
+ compatible = "smsc,lan91c111";
+ reg = <0xc8000000 0x10>;
+ interrupt-parent = <&pic>;
+ interrupts = <27>;
+ };
+
fpga {
/*
* These PrimeCells are at the same location and using