Merge tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd

[linux-2.6-block.git] / arch / arm / boot / dts / spear600.dtsi

diff --git a/arch/arm/boot/dts/spear600.dtsi b/arch/arm/boot/dts/spear600.dtsi
index 4ecc66f5ac88e5282f04cd930b6f3ae25b4a1025..19f99dc4115e164c8903a3259ea873675be16ee2 100644 (file)
--- a/arch/arm/boot/dts/spear600.dtsi
+++ b/arch/arm/boot/dts/spear600.dtsi
@@ -45,6 +45,14 @@
                        #interrupt-cells = <1>;
                };
 
+               clcd@fc200000 {
+                       compatible = "arm,pl110", "arm,primecell";
+                       reg = <0xfc200000 0x1000>;
+                       interrupt-parent = <&vic1>;
+                       interrupts = <12>;
+                       status = "disabled";
+               };
+
                dma@fc400000 {
                        compatible = "arm,pl080", "arm,primecell";
                        reg = <0xfc400000 0x1000>;
@@ -59,6 +67,7 @@
                        interrupt-parent = <&vic1>;
                        interrupts = <24 23>;
                        interrupt-names = "macirq", "eth_wake_irq";
+                       phy-mode = "gmii";
                        status = "disabled";
                };
 
@@ -178,6 +187,13 @@
                                status = "disabled";
                        };
 
+                       rtc@fc900000 {
+                               compatible = "st,spear600-rtc";
+                               reg = <0xfc900000 0x1000>;
+                               interrupts = <10>;
+                               status = "disabled";
+                       };
+
                        timer@f0000000 {
                                compatible = "st,spear-timer";
                                reg = <0xf0000000 0x400>;