Commit 51dab7d9 authored by Andrew Lunn's avatar Andrew Lunn Committed by Shawn Guo

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: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent e3abb14e
...@@ -459,18 +459,6 @@ VF610_PAD_PTB18__GPIO_40 0x33e2 ...@@ -459,18 +459,6 @@ VF610_PAD_PTB18__GPIO_40 0x33e2
>; >;
}; };
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 { pinctrl_mdio_mux: pinctrl-mdio-mux {
fsl,pins = < fsl,pins = <
VF610_PAD_PTA18__GPIO_8 0x31c2 VF610_PAD_PTA18__GPIO_8 0x31c2
......
...@@ -67,11 +67,17 @@ mdio_mux_1: mdio@1 { ...@@ -67,11 +67,17 @@ mdio_mux_1: mdio@1 {
switch0: switch@0 { switch0: switch@0 {
compatible = "marvell,mv88e6190"; compatible = "marvell,mv88e6190";
pinctrl-0 = <&pinctrl_gpio_switch0>;
pinctrl-names = "default";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0>; reg = <0>;
dsa,member = <0 0>; dsa,member = <0 0>;
eeprom-length = <512>; eeprom-length = <512>;
interrupt-parent = <&gpio0>;
interrupts = <27 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <2>;
ports { ports {
#address-cells = <1>; #address-cells = <1>;
...@@ -125,11 +131,17 @@ mdio_mux_2: mdio@2 { ...@@ -125,11 +131,17 @@ mdio_mux_2: mdio@2 {
switch1: switch@0 { switch1: switch@0 {
compatible = "marvell,mv88e6190"; compatible = "marvell,mv88e6190";
pinctrl-0 = <&pinctrl_gpio_switch1>;
pinctrl-names = "default";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0>; reg = <0>;
dsa,member = <0 1>; dsa,member = <0 1>;
eeprom-length = <512>; eeprom-length = <512>;
interrupt-parent = <&gpio0>;
interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <2>;
ports { ports {
#address-cells = <1>; #address-cells = <1>;
......
...@@ -296,6 +296,18 @@ VF610_PAD_PTB18__GPIO_40 0x33e2 ...@@ -296,6 +296,18 @@ VF610_PAD_PTB18__GPIO_40 0x33e2
>; >;
}; };
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 { pinctrl_i2c_mux_reset: pinctrl-i2c-mux-reset {
fsl,pins = < fsl,pins = <
VF610_PAD_PTE14__GPIO_119 0x31c2 VF610_PAD_PTE14__GPIO_119 0x31c2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment