From: Martin Blumenstingl Date: Mon, 8 Jul 2019 09:40:25 +0000 (+0200) Subject: lantiq: dts: assign the MDIO pins to the gsw node X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b3bdfd5df55b104f3affea116a3c54075ea6549c;p=openwrt%2Fstaging%2Fblogic.git lantiq: dts: assign the MDIO pins to the gsw node Assign the MDIO pins to the switch node instead of using pin hogging (where pins are assigned to the pin controller). This is the preferred way of assigning pins upstream. This converts amazonse, ar9 and vr9. danube is skipped because the pin controller doesn't define a pinmux for the MDIO pins (some of the SoC pads may be hardwired to the MDIO pins instead of being configurable). Signed-off-by: Martin Blumenstingl --- diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts index f245fe370b3d..d6c521cfe7e0 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts @@ -177,10 +177,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pcie-rst { lantiq,pins = "io21"; lantiq,pull = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts index 1c7f03c3554f..3d10f582b01f 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts @@ -119,18 +119,6 @@ lantiq,gphy-mode = ; }; -&gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - }; -}; - &localbus { flash@0 { compatible = "lantiq,nor"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts index c105f0a9aed6..186ed37a9cc9 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts @@ -197,10 +197,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pci_rst { lantiq,pins = "io21"; lantiq,output = <1>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts index 4796123c2085..362dccfda7f3 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts @@ -119,16 +119,6 @@ }; &gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - }; - pins_spi_default: pins_spi_default { spi_in { lantiq,groups = "spi_di"; 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 b7ccb4ed575f..d09a9626bb6b 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi @@ -198,10 +198,6 @@ "nand rd", "nand rdy"; lantiq,function = "ebu"; }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pci { lantiq,groups = "gnt1", "req1"; lantiq,function = "pci"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi index 02e95899697e..6790815a24ec 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi @@ -193,11 +193,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - nand { lantiq,groups = "nand cle", "nand ale", "nand rd", "nand cs1", "nand rdy"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi index f58a414a28f2..1553d2f7f449 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi @@ -155,11 +155,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - phy-rst { lantiq,pins = "io37", "io44"; lantiq,pull = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts index ccf61663ba1e..04aa99d18573 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts @@ -167,10 +167,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pcie-rst { lantiq,pins = "io11"; lantiq,open-drain = <1>; 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 62e5e70169e9..c238826932ef 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts @@ -123,10 +123,6 @@ lantiq,open-drain; lantiq,pull = <0>; }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; }; 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 9956a5b89fda..274abcc50313 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi @@ -196,10 +196,6 @@ lantiq,groups = "exin3"; lantiq,function = "exin"; }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; gphy-leds { lantiq,groups = "gphy0 led1", "gphy1 led1", "gphy0 led2", "gphy1 led2"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi index 1a7d90a5bf9e..00475e734e07 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi @@ -175,10 +175,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; gphy-leds { lantiq,groups = "gphy0 led1", "gphy1 led1"; lantiq,function = "gphy"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts b/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts index 2d52176430ab..f37980a53612 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts @@ -115,10 +115,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; gphy-leds { lantiq,groups = "gphy0 led0", "gphy0 led1", "gphy0 led2", "gphy1 led0", diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi index f10a9dd8e6b2..6dc45f057d98 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi @@ -197,10 +197,6 @@ lantiq,pull = <2>; lantiq,output = <1>; }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pci-rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; 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 0b3e72d3ab80..e71e3837ea43 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi @@ -216,10 +216,6 @@ lantiq,output = <1>; lantiq,pull = <0>; }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pci-rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi index 3c04785314fa..7fedcee92f5c 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi @@ -95,10 +95,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; gphy-leds { lantiq,groups = "gphy0 led1", "gphy1 led1"; lantiq,function = "gphy"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts index 48f6dc71a1a3..7e5f58c71e01 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts @@ -225,10 +225,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; phy-rst { lantiq,pins = "io42"; lantiq,pull = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi index feb4cd529a05..33dc5612bf6d 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi @@ -148,6 +148,13 @@ #gpio-cells = <2>; gpio-controller; reg = <0xe100b10 0xa0>; + + mdio_pins: mdio { + mux { + lantiq,groups = "mdio"; + lantiq,function = "mdio"; + }; + }; }; asc1: serial@e100c00 { @@ -198,6 +205,8 @@ reg = <0xe180000 0x40000>; interrupt-parent = <&icu0>; interrupts = <105 109>; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; }; }; 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 37b44aecdd04..3244908e323e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi @@ -168,6 +168,13 @@ #gpio-cells = <2>; gpio-controller; reg = <0xe100b10 0xa0>; + + mdio_pins: mdio { + mux { + lantiq,groups = "mdio"; + lantiq,function = "mdio"; + }; + }; }; stp: stp@e100bb0 { @@ -238,6 +245,8 @@ interrupt-parent = <&icu0>; interrupts = <73 72>; mac-address = [ 00 11 22 33 44 55 ]; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; }; ppe@e234000 { 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 e8b87dbcc7de..81e2fea54943 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi @@ -210,6 +210,13 @@ #gpio-cells = <2>; gpio-controller; reg = <0xe100b10 0xa0>; + + mdio_pins: mdio { + mux { + lantiq,groups = "mdio"; + lantiq,function = "mdio"; + }; + }; }; stp: stp@e100bb0 { @@ -285,6 +292,8 @@ resets = <&reset0 21 16>, <&reset0 8 8>; reset-names = "switch", "ppe"; lantiq,phys = <&gphy0>, <&gphy1>; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; }; mei@e116000 {