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

[linux-imx.git] / arch / arm / boot / dts / spear300.dtsi

diff --git a/arch/arm/boot/dts/spear300.dtsi b/arch/arm/boot/dts/spear300.dtsi
index bc436387d7f9bb9b75c96ce7eaf312ea570ecac8..f79b3dfaabe6c2cc3f984148dde816e1674bc803 100644 (file)
--- a/arch/arm/boot/dts/spear300.dtsi
+++ b/arch/arm/boot/dts/spear300.dtsi
@@ -27,7 +27,7 @@
                };
 
                clcd@60000000 {
-                       compatible = "arm,clcd-pl110", "arm,primecell";
+                       compatible = "arm,pl110", "arm,primecell";
                        reg = <0x60000000 0x1000>;
                        interrupts = <30>;
                        status = "disabled";
@@ -52,6 +52,14 @@
                        status = "disabled";
                };
 
+               shirq: interrupt-controller@0x50000000 {
+                       compatible = "st,spear300-shirq";
+                       reg = <0x50000000 0x1000>;
+                       interrupts = <28>;
+                       #interrupt-cells = <1>;
+                       interrupt-controller;
+               };
+
                apb {
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -64,12 +72,16 @@
                                compatible = "arm,pl061", "arm,primecell";
                                gpio-controller;
                                reg = <0xa9000000 0x1000>;
+                               interrupts = <8>;
+                               interrupt-parent = <&shirq>;
                                status = "disabled";
                        };
 
                        kbd@a0000000 {
                                compatible = "st,spear300-kbd";
                                reg = <0xa0000000 0x1000>;
+                               interrupts = <7>;
+                               interrupt-parent = <&shirq>;
                                status = "disabled";
                        };
                };