Merge tag 'uapi-20121219' into for-linus

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / spear310.dtsi

diff --git a/arch/arm/boot/dts/spear310.dtsi b/arch/arm/boot/dts/spear310.dtsi
index 930303e48df932e42f1c9d4042cbe5290fff4d20..ab45b8c81982d17937052943370517bdfb6cb261 100644 (file)
--- a/arch/arm/boot/dts/spear310.dtsi
+++ b/arch/arm/boot/dts/spear310.dtsi
@@ -33,13 +33,21 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
                        reg = <0x44000000 0x1000        /* FSMC Register */
-                              0x40000000 0x0010>;      /* NAND Base */
-                       reg-names = "fsmc_regs", "nand_data";
-                       st,ale-off = <0x10000>;
-                       st,cle-off = <0x20000>;
+                              0x40000000 0x0010        /* NAND Base DATA */
+                              0x40020000 0x0010        /* NAND Base ADDR */
+                              0x40010000 0x0010>;      /* NAND Base CMD */
+                       reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
                        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";
                        };