ARM: SPEAr: Add plgpio node in device tree dtsi files

This patch adds plgpio nodes in SPEAr DT files.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
index dd4358bc26e228bd78a1eb35bea71ed1b177a0cf..2e4c5727468e1c4362c911f44dd44c44d0431524 100644 (file)
--- a/arch/arm/boot/dts/spear1310-evb.dts
+++ b/arch/arm/boot/dts/spear1310-evb.dts
@@ -181,6 +181,10 @@
                               status = "okay";
                        };
 
+                       gpio@d8400000 {
+                              status = "okay";
+                       };
+
                        i2c0: i2c@e0280000 {
                               status = "okay";
                        };

diff --git a/arch/arm/boot/dts/spear1310.dtsi b/arch/arm/boot/dts/spear1310.dtsi
index 419ea7413d232b510bdd532064029520ec4336a5..7cd25eb4f8e00a14c317fbbc46854bd7641bdeb9 100644 (file)
--- a/arch/arm/boot/dts/spear1310.dtsi
+++ b/arch/arm/boot/dts/spear1310.dtsi
@@ -70,6 +70,12 @@
                        status = "disabled";
                };
 
+               pinmux: pinmux@e0700000 {
+                       compatible = "st,spear1310-pinmux";
+                       reg = <0xe0700000 0x1000>;
+                       #gpio-range-cells = <2>;
+               };
+
                spi1: spi@5d400000 {
                        compatible = "arm,pl022", "arm,primecell";
                        reg = <0x5d400000 0x1000>;
@@ -179,6 +185,27 @@
                        thermal@e07008c4 {
                                st,thermal-flags = <0x7000>;
                        };
+
+                       gpiopinctrl: gpio@d8400000 {
+                               compatible = "st,spear-plgpio";
+                               reg = <0xd8400000 0x1000>;
+                               interrupts = <0 100 0x4>;
+                               #interrupt-cells = <1>;
+                               interrupt-controller;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               gpio-ranges = <&pinmux 0 246>;
+                               status = "disabled";
+
+                               st-plgpio,ngpio = <246>;
+                               st-plgpio,enb-reg = <0xd0>;
+                               st-plgpio,wdata-reg = <0x90>;
+                               st-plgpio,dir-reg = <0xb0>;
+                               st-plgpio,ie-reg = <0x30>;
+                               st-plgpio,rdata-reg = <0x70>;
+                               st-plgpio,mis-reg = <0x10>;
+                               st-plgpio,eit-reg = <0x50>;
+                       };
                };
        };
 };

diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
index c9a54e06fb6849314d3c4bc25031f7153608d775..045f7123ffac5a26eb42e4e025ec88015164075a 100644 (file)
--- a/arch/arm/boot/dts/spear1340-evb.dts
+++ b/arch/arm/boot/dts/spear1340-evb.dts
@@ -193,6 +193,10 @@
                               status = "okay";
                        };
 
+                       gpio@e2800000 {
+                              status = "okay";
+                       };
+
                        i2c0: i2c@e0280000 {
                               status = "okay";
                        };

diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi
index d71fe2a68f098460249e076d54326d7f58fbd665..6c09eb0a1b2bbad90683f7311c14f052a2e21ac7 100644 (file)
--- a/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@ -24,6 +24,12 @@
                        status = "disabled";
                };
 
+               pinmux: pinmux@e0700000 {
+                       compatible = "st,spear1340-pinmux";
+                       reg = <0xe0700000 0x1000>;
+                       #gpio-range-cells = <2>;
+               };
+
                spi1: spi@5d400000 {
                        compatible = "arm,pl022", "arm,primecell";
                        reg = <0x5d400000 0x1000>;
@@ -51,6 +57,26 @@
                        thermal@e07008c4 {
                                st,thermal-flags = <0x2a00>;
                        };
+
+                       gpiopinctrl: gpio@e2800000 {
+                               compatible = "st,spear-plgpio";
+                               reg = <0xe2800000 0x1000>;
+                               interrupts = <0 107 0x4>;
+                               #interrupt-cells = <1>;
+                               interrupt-controller;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               gpio-ranges = <&pinmux 0 252>;
+                               status = "disabled";
+
+                               st-plgpio,ngpio = <250>;
+                               st-plgpio,wdata-reg = <0x40>;
+                               st-plgpio,dir-reg = <0x00>;
+                               st-plgpio,ie-reg = <0x80>;
+                               st-plgpio,rdata-reg = <0x20>;
+                               st-plgpio,mis-reg = <0xa0>;
+                               st-plgpio,eit-reg = <0x60>;
+                       };
                };
        };
 };

diff --git a/arch/arm/boot/dts/spear310.dtsi b/arch/arm/boot/dts/spear310.dtsi
index 62fc4fb3e5f92f079cd3caaf0ccdf852e1ff01d1..930303e48df932e42f1c9d4042cbe5290fff4d20 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 {
@@ -75,6 +76,25 @@
                                reg = <0xb2200000 0x1000>;
                                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>;
+                       };
                };
        };
 };

diff --git a/arch/arm/boot/dts/spear320-evb.dts b/arch/arm/boot/dts/spear320-evb.dts
index 082328bd64abd1e09591b1555b7b130c35dd06a6..ad4bfc68ee059b4632cde6b69f9a851a064cf90e 100644 (file)
--- a/arch/arm/boot/dts/spear320-evb.dts
+++ b/arch/arm/boot/dts/spear320-evb.dts
@@ -164,6 +164,10 @@
                               status = "okay";
                        };
 
+                       gpio@b3000000 {
+                              status = "okay";
+                       };
+
                        i2c0: i2c@d0180000 {
                               status = "okay";
                        };

diff --git a/arch/arm/boot/dts/spear320.dtsi b/arch/arm/boot/dts/spear320.dtsi
index 1f49d69595a06996b0c8b48d631ed116716f7abb..67d7ada7127556eb5b5264ae171145744f82b36d 100644 (file)
--- a/arch/arm/boot/dts/spear320.dtsi
+++ b/arch/arm/boot/dts/spear320.dtsi
@@ -21,9 +21,10 @@
                ranges = <0x40000000 0x40000000 0x80000000
                          0xd0000000 0xd0000000 0x30000000>;
 
-               pinmux@b3000000 {
+               pinmux: pinmux@b3000000 {
                        compatible = "st,spear320-pinmux";
                        reg = <0xb3000000 0x1000>;
+                       #gpio-range-cells = <2>;
                };
 
                clcd@90000000 {
@@ -90,6 +91,26 @@
                                reg = <0xa4000000 0x1000>;
                                status = "disabled";
                        };
+
+                       gpiopinctrl: gpio@b3000000 {
+                               compatible = "st,spear-plgpio";
+                               reg = <0xb3000000 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 = <0x24>;
+                               st-plgpio,wdata-reg = <0x34>;
+                               st-plgpio,dir-reg = <0x44>;
+                               st-plgpio,ie-reg = <0x64>;
+                               st-plgpio,rdata-reg = <0x54>;
+                               st-plgpio,mis-reg = <0x84>;
+                               st-plgpio,eit-reg = <0x94>;
+                       };
                };
        };
 };