diff options
11 files changed, 36 insertions, 68 deletions
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts index e15eb66b04..a61972518e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts @@ -131,12 +131,6 @@ lantiq,open-drain = <0>; lantiq,output = <1>; }; - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; exin { lantiq,groups = "exin1", "exin2"; lantiq,function = "exin"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts index ba7f302c2e..74318a5f65 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts @@ -21,10 +21,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - }; exin { lantiq,groups = "exin1"; lantiq,function = "exin"; @@ -33,11 +29,6 @@ lantiq,groups = "gnt1"; lantiq,function = "pci"; }; - conf_out { - lantiq,pins = "io4", "io5", "io6"; /* stp */ - lantiq,open-drain; - lantiq,pull = <0>; - }; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts index 4f101151d1..492dbac98e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts @@ -21,10 +21,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - }; exin { lantiq,groups = "exin1"; lantiq,function = "exin"; @@ -33,11 +29,6 @@ lantiq,groups = "gnt1"; lantiq,function = "pci"; }; - conf_out { - lantiq,pins = "io4", "io5", "io6"; /* stp */ - lantiq,open-drain; - lantiq,pull = <0>; - }; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi index 33c8dd19f7..37ba1c0c9a 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi @@ -189,17 +189,12 @@ lantiq,groups = "exin3"; lantiq,function = "exin"; }; - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - }; pci { lantiq,groups = "gnt1", "req1"; lantiq,function = "pci"; }; conf_out { - lantiq,pins = "io4", "io5", "io6", /* stp */ - "io21", + lantiq,pins = "io21", "io33"; lantiq,open-drain; lantiq,pull = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts b/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts index a9a5cbae2f..0072f7e2b1 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts @@ -52,18 +52,6 @@ }; }; -&gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - }; - }; -}; - &gpios { status = "okay"; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts index c238826932..c31945fff0 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts @@ -103,13 +103,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; exin { lantiq,groups = "exin1"; lantiq,function = "exin"; @@ -118,11 +111,6 @@ lantiq,groups = "gnt1"; lantiq,function = "pci"; }; - conf_out { - lantiq,pins = "io4", "io5", "io6"; - lantiq,open-drain; - lantiq,pull = <0>; - }; }; usb_vbus: regulator-usb-vbus { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi index f22dc912de..d6879009db 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi @@ -201,13 +201,6 @@ lantiq,groups = "exin3"; lantiq,function = "exin"; }; - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; pci-in { lantiq,groups = "req1"; lantiq,function = "pci"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi index f9e60774cb..e82407d7c3 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi @@ -212,13 +212,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - lantiq,open-drain = <0>; - lantiq,output = <1>; - lantiq,pull = <0>; - }; pci-rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi index da56485214..a613131e48 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi @@ -223,6 +223,14 @@ lantiq,output = <1>; }; }; + + stp_pins: stp { + lantiq,groups = "stp"; + lantiq,function = "stp"; + lantiq,pull = <0>; + lantiq,open-drain = <0>; + lantiq,output = <1>; + }; }; stp: stp@e100bb0 { @@ -230,6 +238,10 @@ compatible = "lantiq,gpio-stp-xway"; gpio-controller; reg = <0xe100bb0 0x40>; + + pinctrl-0 = <&stp_pins>; + pinctrl-names = "default"; + status = "disabled"; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi index eec7a5d054..795df712e2 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi @@ -144,6 +144,10 @@ compatible = "lantiq,gpio-stp-xway"; gpio-controller; reg = <0xe100bb0 0x40>; + + pinctrl-0 = <&stp_pins>; + pinctrl-names = "default"; + lantiq,shadow = <0xfff>; lantiq,groups = <0x3>; status = "disabled"; @@ -188,6 +192,14 @@ lantiq,pull = <0>; }; }; + + stp_pins: stp { + lantiq,groups = "stp"; + lantiq,function = "stp"; + lantiq,pull = <0>; + lantiq,open-drain = <0>; + lantiq,output = <1>; + }; }; asc1: serial@e100c00 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi index 2cb34eab01..fa8d2fae63 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi @@ -313,6 +313,14 @@ lantiq,output = <1>; }; }; + + stp_pins: stp { + lantiq,groups = "stp"; + lantiq,function = "stp"; + lantiq,pull = <0>; + lantiq,open-drain = <0>; + lantiq,output = <1>; + }; }; stp: stp@e100bb0 { @@ -322,6 +330,9 @@ #gpio-cells = <2>; gpio-controller; + pinctrl-0 = <&stp_pins>; + pinctrl-names = "default"; + lantiq,shadow = <0xffffff>; lantiq,groups = <0x7>; lantiq,dsl = <0x0>; |