ARM: dts: vf610-zii-dev: Wire up devel C switch interrupts

The devel B and devel C board use the same GPIO lines for interrupts
from the two switches. Move the pinmux nodes from devel B into the
shared .dtsi file, and wire up the interrupts on devel C.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
index 7940408838df6c10e086e1246b8ee944bd42fef9..dd2f2b9907ff64bfdfb95030a9c210d3303c5dab 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
+++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
@@ -459,18 +459,6 @@
                >;
        };
 
-       pinctrl_gpio_switch0: pinctrl-gpio-switch0 {
-               fsl,pins = <
-                       VF610_PAD_PTB5__GPIO_27         0x219d
-               >;
-       };
-
-       pinctrl_gpio_switch1: pinctrl-gpio-switch1 {
-               fsl,pins = <
-                       VF610_PAD_PTB4__GPIO_26         0x219d
-               >;
-       };
-
        pinctrl_mdio_mux: pinctrl-mdio-mux {
                fsl,pins = <
                        VF610_PAD_PTA18__GPIO_8         0x31c2

diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
index 6a45bd24ffe608b085bf534a8165e55dd8537b90..352ecec64bb7f5d4a8518466e4fed5a78b3c27ad 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
+++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
@@ -67,11 +67,17 @@
 
                        switch0: switch@0 {
                                compatible = "marvell,mv88e6190";
+                               pinctrl-0 = <&pinctrl_gpio_switch0>;
+                               pinctrl-names = "default";
                                #address-cells = <1>;
                                #size-cells = <0>;
                                reg = <0>;
                                dsa,member = <0 0>;
                                eeprom-length = <512>;
+                               interrupt-parent = <&gpio0>;
+                               interrupts = <27 IRQ_TYPE_LEVEL_LOW>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
 
                                ports {
                                        #address-cells = <1>;
@@ -125,11 +131,17 @@
 
                        switch1: switch@0 {
                                compatible = "marvell,mv88e6190";
+                               pinctrl-0 = <&pinctrl_gpio_switch1>;
+                               pinctrl-names = "default";
                                #address-cells = <1>;
                                #size-cells = <0>;
                                reg = <0>;
                                dsa,member = <0 1>;
                                eeprom-length = <512>;
+                               interrupt-parent = <&gpio0>;
+                               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
 
                                ports {
                                        #address-cells = <1>;

diff --git a/arch/arm/boot/dts/vf610-zii-dev.dtsi b/arch/arm/boot/dts/vf610-zii-dev.dtsi
index ca9e1bc35e45797eb8dd840182b7055e93003ef3..6b58d3a97992c11daa3fabe5aea74f3531bd1f46 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-dev.dtsi
+++ b/arch/arm/boot/dts/vf610-zii-dev.dtsi
@@ -296,6 +296,18 @@
                >;
        };
 
+       pinctrl_gpio_switch0: pinctrl-gpio-switch0 {
+               fsl,pins = <
+                       VF610_PAD_PTB5__GPIO_27         0x219d
+               >;
+       };
+
+       pinctrl_gpio_switch1: pinctrl-gpio-switch1 {
+               fsl,pins = <
+                       VF610_PAD_PTB4__GPIO_26         0x219d
+               >;
+       };
+
        pinctrl_i2c_mux_reset: pinctrl-i2c-mux-reset {
                fsl,pins = <
                         VF610_PAD_PTE14__GPIO_119      0x31c2