3 files changed, 52 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/spear300.dtsi b/arch/arm/boot/dts/spear300.dtsi
index fdac8713367..090adc65601 100644
--- a/arch/arm/boot/dts/spear300.dtsi
+++ b/arch/arm/boot/dts/spear300.dtsi
@@ -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";
                         };
                 };
diff --git a/arch/arm/boot/dts/spear310.dtsi b/arch/arm/boot/dts/spear310.dtsi
index 930303e48df..e814e5e9708 100644
--- a/arch/arm/boot/dts/spear310.dtsi
+++ b/arch/arm/boot/dts/spear310.dtsi
@@ -40,6 +40,14 @@
                         status = "disabled";
                 };
 
+                shirq: interrupt-controller@0xb4000000 {
+                        compatible = "st,spear310-shirq";
+                        reg = <0xb4000000 0x1000>;
+                        interrupts = <28 29 30 1>;
+                        #interrupt-cells = <1>;
+                        interrupt-controller;
+                };
+
                 apb {
                         #address-cells = <1>;
                         #size-cells = <1>;
@@ -50,30 +58,40 @@
                         serial@b2000000 {
                                 compatible = "arm,pl011", "arm,primecell";
                                 reg = <0xb2000000 0x1000>;
+                                interrupts = <8>;
+                                interrupt-parent = <&shirq>;
                                 status = "disabled";
                         };
 
                         serial@b2080000 {
                                 compatible = "arm,pl011", "arm,primecell";
                                 reg = <0xb2080000 0x1000>;
+                                interrupts = <9>;
+                                interrupt-parent = <&shirq>;
                                 status = "disabled";
                         };
 
                         serial@b2100000 {
                                 compatible = "arm,pl011", "arm,primecell";
                                 reg = <0xb2100000 0x1000>;
+                                interrupts = <10>;
+                                interrupt-parent = <&shirq>;
                                 status = "disabled";
                         };
 
                         serial@b2180000 {
                                 compatible = "arm,pl011", "arm,primecell";
                                 reg = <0xb2180000 0x1000>;
+                                interrupts = <11>;
+                                interrupt-parent = <&shirq>;
                                 status = "disabled";
                         };
 
                         serial@b2200000 {
                                 compatible = "arm,pl011", "arm,primecell";
                                 reg = <0xb2200000 0x1000>;
+                                interrupts = <12>;
+                                interrupt-parent = <&shirq>;
                                 status = "disabled";
                         };
 
diff --git a/arch/arm/boot/dts/spear320.dtsi b/arch/arm/boot/dts/spear320.dtsi
index 6ff0d1e0e46..c056a84deab 100644
--- a/arch/arm/boot/dts/spear320.dtsi
+++ b/arch/arm/boot/dts/spear320.dtsi
@@ -30,7 +30,8 @@
                 clcd@90000000 {
                         compatible = "arm,pl110", "arm,primecell";
                         reg = <0x90000000 0x1000>;
-                        interrupts = <33>;
+                        interrupts = <8>;
+                        interrupt-parent = <&shirq>;
                         status = "disabled";
                 };
 
@@ -49,13 +50,24 @@
                 sdhci@70000000 {
                         compatible = "st,sdhci-spear";
                         reg = <0x70000000 0x100>;
-                        interrupts = <29>;
+                        interrupts = <10>;
+                        interrupt-parent = <&shirq>;
                         status = "disabled";
                 };
 
+                shirq: interrupt-controller@0xb3000000 {
+                        compatible = "st,spear320-shirq";
+                        reg = <0xb3000000 0x1000>;
+                        interrupts = <30 28 29 1>;
+                        #interrupt-cells = <1>;
+                        interrupt-controller;
+                };
+
                 spi1: spi@a5000000 {
                         compatible = "arm,pl022", "arm,primecell";
                         reg = <0xa5000000 0x1000>;
+                        interrupts = <15>;
+                        interrupt-parent = <&shirq>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                         status = "disabled";
@@ -64,6 +76,8 @@
                 spi2: spi@a6000000 {
                         compatible = "arm,pl022", "arm,primecell";
                         reg = <0xa6000000 0x1000>;
+                        interrupts = <16>;
+                        interrupt-parent = <&shirq>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                         status = "disabled";
@@ -88,18 +102,24 @@
                                 #size-cells = <0>;
                                 compatible = "snps,designware-i2c";
                                 reg = <0xa7000000 0x1000>;
+                                interrupts = <21>;
+                                interrupt-parent = <&shirq>;
                                 status = "disabled";
                         };
 
                         serial@a3000000 {
                                 compatible = "arm,pl011", "arm,primecell";
                                 reg = <0xa3000000 0x1000>;
+                                interrupts = <13>;
+                                interrupt-parent = <&shirq>;
                                 status = "disabled";
                         };
 
                         serial@a4000000 {
                                 compatible = "arm,pl011", "arm,primecell";
                                 reg = <0xa4000000 0x1000>;
+                                interrupts = <14>;
+                                interrupt-parent = <&shirq>;
                                 status = "disabled";
                         };