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

[platform/kernel/linux-exynos.git] / arch / arm / boot / dts / spear310.dtsi

diff --git a/arch/arm/boot/dts/spear310.dtsi b/arch/arm/boot/dts/spear310.dtsi
index 7840e52..ab45b8c 100644 (file)
--- a/arch/arm/boot/dts/spear310.dtsi
+++ b/arch/arm/boot/dts/spear310.dtsi
@@ -22,9 +22,10 @@
                          0xb0000000 0xb0000000 0x10000000
                          0xd0000000 0xd0000000 0x30000000>;
 
-               pinmux@b4000000 {
+               pinmux: pinmux@b4000000 {
                        compatible = "st,spear310-pinmux";
                        reg = <0xb4000000 0x1000>;
+                       #gpio-range-cells = <2>;
                };
 
                fsmc: flash@44000000 {
@@ -39,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>;
@@ -49,32 +58,61 @@
                        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";
                        };
+
+                       gpiopinctrl: gpio@b4000000 {
+                               compatible = "st,spear-plgpio";
+                               reg = <0xb4000000 0x1000>;
+                               #interrupt-cells = <1>;
+                               interrupt-controller;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               gpio-ranges = <&pinmux 0 102>;
+                               status = "disabled";
+
+                               st-plgpio,ngpio = <102>;
+                               st-plgpio,enb-reg = <0x10>;
+                               st-plgpio,wdata-reg = <0x20>;
+                               st-plgpio,dir-reg = <0x30>;
+                               st-plgpio,ie-reg = <0x50>;
+                               st-plgpio,rdata-reg = <0x40>;
+                               st-plgpio,mis-reg = <0x60>;
+                       };
                };
        };
 };