diff --git a/qcom-ipq8064-rb3011.dts.orig b/qcom-ipq8064-rb3011.dts index 282b89ce3d..4faaa95b33 100644 --- a/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts +++ b/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts @@ -24,73 +24,6 @@ memory@0 { device_type = "memory"; }; - mdio0: mdio@0 { - status = "okay"; - compatible = "virtual,mdio-gpio"; - gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, - <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; - #address-cells = <1>; - #size-cells = <0>; - - pinctrl-0 = <&mdio0_pins>; - pinctrl-names = "default"; - - switch0: switch@10 { - compatible = "qca,qca8337"; - #address-cells = <1>; - #size-cells = <0>; - - dsa,member = <0 0>; - - pinctrl-0 = <&sw0_reset_pin>; - pinctrl-names = "default"; - - reset-gpios = <&qcom_pinmux 16 GPIO_ACTIVE_LOW>; - reg = <0x10>; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - switch0cpu: port@0 { - reg = <0>; - label = "cpu"; - ethernet = <&gmac0>; - phy-mode = "rgmii-id"; - fixed-link { - speed = <1000>; - full-duplex; - }; - }; - - port@1 { - reg = <1>; - label = "sw1"; - }; - - port@2 { - reg = <2>; - label = "sw2"; - }; - - port@3 { - reg = <3>; - label = "sw3"; - }; - - port@4 { - reg = <4>; - label = "sw4"; - }; - - port@5 { - reg = <5>; - label = "sw5"; - }; - }; - }; - }; - mdio1: mdio@1 { status = "okay"; compatible = "virtual,mdio-gpio"; @@ -216,6 +149,68 @@ led@7 { }; }; +&mdio0 { + status = "okay"; + + pinctrl-0 = <&mdio0_pins>; + pinctrl-names = "default"; + + switch0: switch@10 { + compatible = "qca,qca8337"; + #address-cells = <1>; + #size-cells = <0>; + + dsa,member = <0 0>; + + pinctrl-0 = <&sw0_reset_pin>; + pinctrl-names = "default"; + + reset-gpios = <&qcom_pinmux 16 GPIO_ACTIVE_LOW>; + reg = <0x10>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + switch0cpu: port@0 { + reg = <0>; + label = "cpu"; + ethernet = <&gmac0>; + phy-mode = "rgmii-id"; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + + port@1 { + reg = <1>; + label = "sw1"; + }; + + port@2 { + reg = <2>; + label = "sw2"; + }; + + port@3 { + reg = <3>; + label = "sw3"; + }; + + port@4 { + reg = <4>; + label = "sw4"; + }; + + port@5 { + reg = <5>; + label = "sw5"; + }; + }; + }; +}; + &gmac0 { status = "okay";