]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
qualcommax: ipq60xx/ipq807x: convert to PPE networking stack
authorRobert Marko <robimarko@gmail.com>
Fri, 20 Feb 2026 21:40:38 +0000 (22:40 +0100)
committerRobert Marko <robimarko@gmail.com>
Sat, 11 Jul 2026 20:26:43 +0000 (22:26 +0200)
Convert IPQ60xx and IPQ807x devices from the old NSS dataplane to the new
PPE stack.

IPQ50xx is not yet supported.

Link: https://github.com/openwrt/openwrt/pull/22381
Signed-off-by: Robert Marko <robimarko@gmail.com>
66 files changed:
target/linux/qualcommax/Makefile
target/linux/qualcommax/dts/ipq6000-360v6.dts
target/linux/qualcommax/dts/ipq6000-ap120c-ax.dts
target/linux/qualcommax/dts/ipq6000-gl-ax1800.dts
target/linux/qualcommax/dts/ipq6000-gl-axt1800.dts
target/linux/qualcommax/dts/ipq6000-glinet.dtsi
target/linux/qualcommax/dts/ipq6000-link.dtsi
target/linux/qualcommax/dts/ipq6000-mr7350.dts
target/linux/qualcommax/dts/ipq6000-nn6000-v1.dts
target/linux/qualcommax/dts/ipq6000-nn6000-v2.dts
target/linux/qualcommax/dts/ipq6000-re-ss-01.dts
target/linux/qualcommax/dts/ipq6010-mango-dvk.dts
target/linux/qualcommax/dts/ipq6010-re-cs-02.dts
target/linux/qualcommax/dts/ipq6010-re-cs-07.dts
target/linux/qualcommax/dts/ipq6010-re-cs.dtsi
target/linux/qualcommax/dts/ipq6010-wax214.dts
target/linux/qualcommax/dts/ipq6010-wax610-base.dtsi
target/linux/qualcommax/dts/ipq6010-xe3-4.dts
target/linux/qualcommax/dts/ipq6018-eap620-hd-v3.dts
target/linux/qualcommax/dts/ipq6018-fap650.dts
target/linux/qualcommax/dts/ipq6018-mr7500.dts
target/linux/qualcommax/dts/ipq6018-rbs350.dts
target/linux/qualcommax/dts/ipq6018-rbx350.dtsi
target/linux/qualcommax/dts/ipq6018-tplink-eap6xx-outdoor.dtsi
target/linux/qualcommax/dts/ipq8070-cax1800.dts
target/linux/qualcommax/dts/ipq8070-nwa110ax.dts
target/linux/qualcommax/dts/ipq8070-rm2-6.dts
target/linux/qualcommax/dts/ipq8071-ap8220.dts
target/linux/qualcommax/dts/ipq8071-ax3600.dtsi
target/linux/qualcommax/dts/ipq8071-eap102.dts
target/linux/qualcommax/dts/ipq8071-mf269.dts
target/linux/qualcommax/dts/ipq8071-nwa210ax.dts
target/linux/qualcommax/dts/ipq8072-301w.dts
target/linux/qualcommax/dts/ipq8072-aw1000.dts
target/linux/qualcommax/dts/ipq8072-ax880.dts
target/linux/qualcommax/dts/ipq8072-ax9000.dts
target/linux/qualcommax/dts/ipq8072-dl-wrx36.dts
target/linux/qualcommax/dts/ipq8072-eap620hd-v1.dts
target/linux/qualcommax/dts/ipq8072-eap660hd-v1.dts
target/linux/qualcommax/dts/ipq8072-haze.dts
target/linux/qualcommax/dts/ipq8072-linkhub-hh500v.dts
target/linux/qualcommax/dts/ipq8072-mx5300.dts
target/linux/qualcommax/dts/ipq8072-mx8500.dts
target/linux/qualcommax/dts/ipq8072-sax1v1k.dts
target/linux/qualcommax/dts/ipq8072-wax218.dts
target/linux/qualcommax/dts/ipq8072-wax620.dts
target/linux/qualcommax/dts/ipq8072-wpq873.dts
target/linux/qualcommax/dts/ipq8072-zbt-z800ax.dts
target/linux/qualcommax/dts/ipq8074-deco-x80-5g.dts
target/linux/qualcommax/dts/ipq8074-nbg7815.dts
target/linux/qualcommax/dts/ipq8074-rax120v2.dts
target/linux/qualcommax/dts/ipq8074-rbs750.dts
target/linux/qualcommax/dts/ipq8074-rbx750.dtsi
target/linux/qualcommax/dts/ipq8074-rt-ax89x.dts
target/linux/qualcommax/dts/ipq8074-sxk80.dtsi
target/linux/qualcommax/dts/ipq8074-wax630.dts
target/linux/qualcommax/dts/ipq8074-wxr-5950ax12.dts
target/linux/qualcommax/dts/ipq807x-nwax10ax.dtsi
target/linux/qualcommax/dts/ipq8174-homewrk.dts
target/linux/qualcommax/dts/ipq8174-mx4200.dtsi
target/linux/qualcommax/dts/ipq8174-mx4300.dts
target/linux/qualcommax/dts/ipq8174-mx4x00.dtsi
target/linux/qualcommax/image/ipq807x.mk
target/linux/qualcommax/ipq50xx/target.mk
target/linux/qualcommax/ipq60xx/config-default
target/linux/qualcommax/ipq807x/config-default

index f08a9c83701a1f20188d99d9f7063c1108b6bf6b..1ef9ac337966b0a151ceb09c780443ba08642008 100644 (file)
@@ -14,7 +14,7 @@ include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \
        kmod-usb3 kmod-usb-dwc3 kmod-usb-dwc3-qcom \
        kmod-leds-gpio kmod-gpio-button-hotplug \
-       kmod-qca-nss-dp kmod-ath11k-ahb \
+       kmod-ath11k-ahb \
        wpad-basic-mbedtls uboot-envtools \
        e2fsprogs kmod-fs-ext4 losetup
 
index 07aabe045a6906338ef9af2a5fd2b215a6682d87..46e3d5a8b8fd5d57aa8f3e94b2d1323844a0868e 100644 (file)
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3)>;
-       switch_wan_bmp = <ESS_PORT4>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
                port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+                       reg = <1>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 0>;
                };
+
                port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+                       reg = <2>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
                };
+
                port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+                       reg = <3>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
                };
+
                port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+                       reg = <4>;
+                       label = "wan";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
                };
        };
 };
        status = "okay";
 };
 
-&dp1 {
-       status = "okay";
-       phy-handle = <&qca8075_0>;
-       label = "lan1";
-};
-
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "lan2";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan3";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "wan";
-};
-
 &wifi {
        status = "okay";
 
index 3cc14d77a2360094eea647681fc451d615cf6b28..df558b414c995bf6237fb1ae3977a494e7d7659b 100644 (file)
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <ESS_PORT4>;
-       switch_wan_bmp = <ESS_PORT5>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-       switch_mac_mode = <MAC_MODE_PSGMII>;
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
                port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+                       reg = <4>;
+                       label = "lan";
+                       phy-handle = <&qca8072_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&macaddr_lan>;
+                       nvmem-cell-names = "mac-address";
                };
 
                port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8072_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
+                       nvmem-cells = <&macaddr_wan>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
        status = "okay";
 };
 
-&dp4 {
-       status = "okay";
-
-       phy-handle = <&qca8072_3>;
-       label = "lan";
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp5 {
-       status = "okay";
-
-       phy-handle = <&qca8072_4>;
-       label = "wan";
-       nvmem-cells = <&macaddr_wan>;
-       nvmem-cell-names = "mac-address";
-};
-
 &wifi {
        status = "okay";
 
index bd3f0c3c64316180871af38fce3f16c613443a88..747dacfd2f69101437a5a26cd35f216800c4dcfa 100644 (file)
@@ -9,7 +9,7 @@
        compatible = "glinet,gl-ax1800", "qcom,ipq6018";
 
        aliases {
-               label-mac-device = &dp1;
+               label-mac-device = &swport1;
        };
 };
 
        };
 };
 
-&switch {
-       switch_lan_bmp = <(ESS_PORT2 | ESS_PORT3 | ESS_PORT4 | ESS_PORT5)>;
-       switch_wan_bmp = <ESS_PORT1>;
-};
-
-&dp1 {
-       status = "okay";
-       phy-handle = <&qca8075_0>;
-       label = "wan";
-       nvmem-cells = <&macaddr_wan>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
+&swport2 {
        label = "lan1";
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address";
 };
 
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
+&swport3 {
        label = "lan2";
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address";
 };
 
-&dp4 {
+&swport4 {
        status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan3";
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address";
 };
 
-&dp5 {
+&swport5 {
        status = "okay";
-       phy-handle = <&qca8075_4>;
-       label = "lan4";
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address";
 };
 
 &wifi {
index 5db3c8e1edf907c2e3152c95db07f13142619376..432794a8c3135fda49612ee6eaab217ea815a9f7 100644 (file)
@@ -9,7 +9,7 @@
        compatible = "glinet,gl-axt1800", "qcom,ipq6018";
 
        aliases {
-               label-mac-device = &dp1;
+               label-mac-device = &swport1;
        };
 
        vcc_sd: regulator-vcc-sd {
        status = "okay";
 };
 
-&switch {
-       switch_lan_bmp = <(ESS_PORT2 | ESS_PORT3)>;
-       switch_wan_bmp = <ESS_PORT1>;
+&swport2 {
+       label = "lan2";
 };
 
-&dp1 {
-       status = "okay";
-       phy-handle = <&qca8075_0>;
-       label = "wan";
-       nvmem-cells = <&macaddr_wan>;
-       nvmem-cell-names = "mac-address";
+&swport3 {
+       label = "lan1";
 };
 
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
+&swport2 {
        label = "lan2";
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address";
 };
 
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
+&swport3 {
        label = "lan1";
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address";
 };
 
 &wifi {
index 5c862f39785029ccf9c1b7e99e7a8c067f3eca30..e1563222b2ddf1699154a7f724d356a9320f222e 100644 (file)
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_mac_mode = <MAC_MODE_PSGMII>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+               swport1: port@1 {
+                       reg = <1>;
+                       label = "wan";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 0>;
+                       nvmem-cells = <&macaddr_wan>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+
+               swport2: port@2 {
+                       reg = <2>;
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&macaddr_lan>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+
+               swport3: port@3 {
+                       reg = <3>;
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&macaddr_lan>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&macaddr_lan>;
+                       nvmem-cell-names = "mac-address";
+                       status = "disabled";
                };
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
+                       nvmem-cells = <&macaddr_lan>;
+                       nvmem-cell-names = "mac-address";
+                       status = "disabled";
                };
        };
 };
index c3b7621ec7df3cd64f86a0292028d1f0d5e3bda0..9a5d16c852851f94615326a7e8f8a56d32a3df19 100644 (file)
        qcom,ath11k-calibration-variant = "Link-NN6000";
 };
 
+&mdio {
+       status = "okay";
+
+       pinctrl-0 = <&mdio_pins>;
+       pinctrl-names = "default";
+       reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
+
+       ethernet-phy-package@0 {
+               compatible = "qcom,qca8075-package";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0>;
+
+               qca8075_0: ethernet-phy@0 {
+                       compatible = "ethernet-phy-ieee802.3-c22";
+                       reg = <0>;
+               };
+
+               qca8075_1: ethernet-phy@1 {
+                       compatible = "ethernet-phy-ieee802.3-c22";
+                       reg = <1>;
+               };
+
+               qca8075_2: ethernet-phy@2 {
+                       compatible = "ethernet-phy-ieee802.3-c22";
+                       reg = <2>;
+               };
+
+               qca8075_3: ethernet-phy@3 {
+                       compatible = "ethernet-phy-ieee802.3-c22";
+                       reg = <3>;
+               };
+
+               qca8075_4: ethernet-phy@4 {
+                       compatible = "ethernet-phy-ieee802.3-c22";
+                       reg = <4>;
+               };
+       };
+};
+
+&uniphy0 {
+       status = "okay";
+};
+
+&switch {
+       status = "okay";
+
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+
+               swport1: port@1 {
+                       reg = <1>;
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 0>;
+                       status = "disabled";
+               };
+
+               swport2: port@2 {
+                       reg = <2>;
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
+               };
+
+               swport3: port@3 {
+                       reg = <3>;
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
+               };
+
+               swport4: port@4 {
+                       reg = <4>;
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+               };
+
+               swport5: port@5 {
+                       reg = <5>;
+                       phy-handle = <&qca8075_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
+                       status = "disabled";
+               };
+       };
+};
+
 &edma {
        status = "okay";
 };
index f9b2171bd55b1ad7c6cf8651f1d7360f1d3753d5..9c595cf7dc3d31addd191df2ff37ea652ec5e308 100644 (file)
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>;
-       switch_wan_bmp = <ESS_PORT5>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
                port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+                       reg = <1>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 0>;
+                       nvmem-cells = <&hw_mac_addr 1>;
+                       nvmem-cell-names = "mac-address";
                };
+
                port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+                       reg = <2>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&hw_mac_addr 1>;
+                       nvmem-cell-names = "mac-address";
                };
+
                port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+                       reg = <3>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&hw_mac_addr 1>;
+                       nvmem-cell-names = "mac-address";
                };
+
                port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+                       reg = <4>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&hw_mac_addr 1>;
+                       nvmem-cell-names = "mac-address";
                };
+
                port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8075_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
+                       nvmem-cells = <&hw_mac_addr 0>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
        status = "okay";
 };
 
-&dp1 {
-       status = "okay";
-       phy-handle = <&qca8075_0>;
-       label = "lan1";
-       nvmem-cells = <&hw_mac_addr 1>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "lan2";
-       nvmem-cells = <&hw_mac_addr 1>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan3";
-       nvmem-cells = <&hw_mac_addr 1>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan4";
-       nvmem-cells = <&hw_mac_addr 1>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
-       label = "wan";
-       nvmem-cells = <&hw_mac_addr 0>;
-       nvmem-cell-names = "mac-address";
-};
-
 &wifi {
        status = "okay";
 
index 641e5f0a31626d8d88952164fd5c89b075ccf076..7d62d3f99395b2223fa635cca5280f3c3b8aa8eb 100644 (file)
@@ -9,81 +9,20 @@
        compatible = "link,nn6000-v1", "qcom,ipq6018";
 
        aliases {
-               ethernet1 = &dp2;
-               ethernet2 = &dp3;
-               ethernet3 = &dp4;
+               ethernet1 = &swport2;
+               ethernet2 = &swport3;
+               ethernet3 = &swport4;
        };
 };
 
-&mdio {
-       status = "okay";
-
-       pinctrl-0 = <&mdio_pins>;
-       pinctrl-names = "default";
-       reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
-
-       ethernet-phy-package@0 {
-               compatible = "qcom,qca8075-package";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <0>;
-
-               qca8075_1: ethernet-phy@1 {
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       reg = <1>;
-               };
-
-               qca8075_2: ethernet-phy@2 {
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       reg = <2>;
-               };
-
-               qca8075_3: ethernet-phy@3 {
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       reg = <3>;
-               };
-       };
-};
-
-&switch {
-       status = "okay";
-
-       switch_lan_bmp = <(ESS_PORT3 | ESS_PORT4)>;
-       switch_wan_bmp = <ESS_PORT2>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
-
-       qcom,port_phyinfo {
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
-               };
-
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
-               };
-
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
-               };
-       };
-};
-
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
+&swport2 {
        label = "wan";
 };
 
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
+&swport3 {
        label = "lan1";
 };
 
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
+&swport4 {
        label = "lan2";
 };
index 3ed2614094525e4af1a6e8eb2f0bd7811cbb84a1..300871e85b44dc354a073fd1c451c25b52ff9d8c 100644 (file)
        compatible = "link,nn6000-v2", "qcom,ipq6018";
 
        aliases {
-               ethernet0 = &dp1;
-               ethernet1 = &dp2;
-               ethernet2 = &dp3;
-               ethernet3 = &dp4;
-               ethernet4 = &dp5;
+               ethernet0 = &swport1;
+               ethernet1 = &swport2;
+               ethernet2 = &swport3;
+               ethernet3 = &swport4;
+               ethernet4 = &swport5;
        };
 };
 
-&mdio {
-       status = "okay";
-
-       pinctrl-0 = <&mdio_pins>;
-       pinctrl-names = "default";
-       reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
-
-       ethernet-phy-package@0 {
-               compatible = "qcom,qca8075-package";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <0>;
-
-               qca8075_0: ethernet-phy@0 {
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       reg = <0>;
-               };
-
-               qca8075_1: ethernet-phy@1 {
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       reg = <1>;
-               };
-
-               qca8075_2: ethernet-phy@2 {
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       reg = <2>;
-               };
-
-               qca8075_3: ethernet-phy@3 {
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       reg = <3>;
-               };
-
-               qca8075_4: ethernet-phy@4 {
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       reg = <4>;
-               };
-       };
-};
-
-&switch {
-       status = "okay";
-
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT3 | ESS_PORT4 | ESS_PORT5)>;
-       switch_wan_bmp = <ESS_PORT2>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
-
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
-               };
-
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
-               };
-
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
-               };
-
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
-               };
-
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
-               };
-       };
-};
-
-&dp1 {
-       status = "okay";
-       phy-handle = <&qca8075_0>;
+&swport1 {
        label = "lan1";
+       status = "okay";
 };
 
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
+&swport2 {
        label = "wan";
 };
 
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
+&swport3 {
        label = "lan2";
 };
 
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
+&swport4 {
        label = "lan3";
 };
 
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
+&swport5 {
        label = "lan4";
 };
index a71574cc4f50c2f90d1a71db043c5978e529040e..49a25010b37659c029c710b7153e43814d22ea9f 100644 (file)
        compatible = "jdcloud,re-ss-01", "qcom,ipq6018";
 
        aliases {
-               ethernet1 = &dp2;
-               ethernet2 = &dp3;
-               ethernet3 = &dp4;
-               ethernet4 = &dp5;
+               ethernet1 = &swport2;
+               ethernet2 = &swport3;
+               ethernet3 = &swport4;
+               ethernet4 = &swport5;
                serial0 = &blsp1_uart3;
 
-               label-mac-device = &dp2;
+               label-mac-device = &swport2;
                led-boot = &led_status_red;
                led-failsafe = &led_status_red;
                led-running = &led_status_green;
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>;
-       switch_wan_bmp = <ESS_PORT5>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
+               };
+
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
                };
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8075_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
                };
        };
 };
        status = "okay";
 };
 
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "lan1";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan2";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan3";
-};
-
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
-       label = "wan";
-};
-
 &wifi {
        status = "okay";
 
index 60769457ed45584f27f7392fb6734bb845cdf504..f58f4a169f6d32a80fd993ed99105310a8c659dd 100644 (file)
        };
 };
 
-&dp3 {
-       status = "okay";
-
-       phy-handle = <&qca8072_1>;
-       nvmem-cells = <&macaddr_eth1>;
-       nvmem-cell-names = "mac-address";
-       label = "lan2";
-};
-
-&dp4 {
-       status = "okay";
-
-       phy-handle = <&qca8072_0>;
-       nvmem-cells = <&macaddr_eth0>;
-       nvmem-cell-names = "mac-address";
-       label = "lan1";
-};
-
-&dp5 {
-       status = "okay";
-
-       phy-mode = "sgmii";
-       phy-handle = <&qca8081>;
-       nvmem-cells = <&macaddr_eth2>;
-       nvmem-cell-names = "mac-address";
-       label = "wan";
-};
-
 &edma {
        status = "okay";
 };
        cd-gpios = <&tlmm 62 GPIO_ACTIVE_LOW>;
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy1 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT3 | ESS_PORT4)>;
-       switch_wan_bmp = <ESS_PORT5>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
-       switch_mac_mode1 = <MAC_MODE_SGMII_PLUS>;
-       port3_pcs_channel = <4>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
                port@3 {
-                       port_id = <3>;
-                       phy_address = <4>;
+                       reg = <3>;
+                       label = "lan2";
+                       phy-handle = <&qca8072_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
+                       nvmem-cells = <&macaddr_eth1>;
+                       nvmem-cell-names = "mac-address";
                };
+
                port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+                       reg = <4>;
+                       label = "lan1";
+                       phy-handle = <&qca8072_0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&macaddr_eth0>;
+                       nvmem-cell-names = "mac-address";
                };
+
                port@5 {
-                       port_id = <5>;
-                       phy_address = <24>;
-                       port_mac_sel = "QGMAC_PORT";
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8081>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy1 0>;
+                       nvmem-cells = <&macaddr_eth2>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
index 6a7e3eff3df1eab898d4823a14ee900f86af208b..8594ea7bf0013a7b5384b2c3413db2648cac36c8 100644 (file)
@@ -9,13 +9,13 @@
        compatible = "jdcloud,re-cs-02", "qcom,ipq6018";
 
        aliases {
-               ethernet0 = &dp1;
-               ethernet1 = &dp2;
-               ethernet2 = &dp3;
-               ethernet3 = &dp4;
-               ethernet4 = &dp5;
+               ethernet0 = &swport1;
+               ethernet1 = &swport2;
+               ethernet2 = &swport3;
+               ethernet3 = &swport4;
+               ethernet4 = &swport5;
 
-               label-mac-device = &dp1;
+               label-mac-device = &swport1;
                serial0 = &blsp1_uart3;
                serial1 = &blsp1_uart6;
        };
        };
 };
 
+&uniphy1 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>;
-       switch_wan_bmp = <ESS_PORT5>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
-       switch_mac_mode1 = <MAC_MODE_SGMII_PLUS>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <24>;
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <25>;
+
+               swport1: port@1 {
+                       reg = <1>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 0>;
                };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <26>;
+
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <27>;
+
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
                };
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <12>;
-                       port_mac_sel = "QGMAC_PORT";
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+               };
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8081>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy1 0>;
                };
        };
 };
        status = "okay";
 };
 
-&dp1 {
-       status = "okay";
-       phy-handle = <&qca8075_0>;
-       label = "lan1";
-};
-
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "lan2";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan3";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan4";
-};
-
-&dp5 {
-       status = "okay";
-       phy-mode = "sgmii";
-       phy-handle = <&qca8081>;
-       label = "wan";
-};
-
 &wifi {
        status = "okay";
 
index 650e2c55f35404ffbdfac6caa98fcc48d556231a..1ee45622167f3c310a2b63be1a5e1eab2c030556 100644 (file)
@@ -9,12 +9,12 @@
        compatible = "jdcloud,re-cs-07", "qcom,ipq6018";
 
        aliases {
-               ethernet0 = &dp1;
-               ethernet1 = &dp2;
-               ethernet2 = &dp3;
-               ethernet3 = &dp4;
+               ethernet0 = &swport1;
+               ethernet1 = &swport2;
+               ethernet2 = &swport3;
+               ethernet3 = &swport4;
 
-               label-mac-device = &dp2;
+               label-mac-device = &swport2;
                serial0 = &blsp1_uart3;
        };
 
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>;
-       switch_wan_bmp = <ESS_PORT1>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <24>;
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <25>;
+
+               swport1: port@1 {
+                       reg = <1>;
+                       label = "wan";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 0>;
                };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <26>;
+
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <27>;
+
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
+               };
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
                };
        };
 };
 &edma {
        status = "okay";
 };
-
-&dp1 {
-       status = "okay";
-       phy-handle = <&qca8075_0>;
-       label = "wan";
-};
-
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "lan1";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan2";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan3";
-};
index 7ff432613a528613546be2d6773dbb2261c56e65..bd971145c8c753fcb11e03caf0dce0a88c485f03 100644 (file)
                };
        };
 };
+
+&uniphy0 {
+       status = "okay";
+};
index 90a4828c17bd751dda376ada0694f78f03e0d377..5df12f4ed66bcc92c59792c3fc883886ffcb1813 100644 (file)
@@ -15,8 +15,8 @@
 
        aliases {
                serial0 = &blsp1_uart3;
-               ethernet0 = &dp3;
-               label-mac-device = &dp3;
+               ethernet0 = &swport3;
+               label-mac-device = &swport3;
                led-boot = &pwr;
                led-failsafe = &pwr;
                led-running = &pwr;
        };
 };
 
-&dp3 {
-       status = "okay";
-
-       phy-handle = <&qca8072_4>;
-       label = "lan";
-};
-
 &edma {
        status = "okay";
 };
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <ESS_PORT3>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
-       port3_pcs_channel = <4>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <4>;
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan";
+                       phy-handle = <&qca8072_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
                };
        };
 };
index e51ed90629f948a539911cf9113a70cc456aed2d..2db7294a4bac0880ef9816a7a50316ebc7d60a32 100644 (file)
@@ -8,8 +8,8 @@
 / {
        aliases {
                serial0 = &blsp1_uart3;
-               ethernet0 = &dp5;
-               label-mac-device = &dp5;
+               ethernet0 = &swport5;
+               label-mac-device = &swport5;
 
                led-boot = &led_system_blue;
                led-failsafe = &led_system_orange;
        status = "okay";
 };
 
+&uniphy1 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <ESS_PORT5>;
-       switch_mac_mode1 = <MAC_MODE_SGMII_PLUS>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-       qcom,port_phyinfo {
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <24>;
-                       port_mac_sel = "QGMAC_PORT";
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "lan";
+                       phy-handle = <&qca8081_24>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy1 0>;
                };
        };
 };
        };
 };
 
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8081_24>;
-       label = "lan";
-};
-
 &blsp1_uart3 {
        pinctrl-0 = <&serial_3_pins>;
        pinctrl-names = "default";
index f0094a7d8f03023014914da26ec0d1fb3a348321..7f795e1e5d55ca237379f7342816a848a83fe7e8 100644 (file)
@@ -15,9 +15,9 @@
 
        aliases {
                serial0 = &blsp1_uart3;
-               ethernet0 = &dp5;
-               ethernet1 = &dp4;
-               label-mac-device = &dp5;
+               ethernet0 = &swport5;
+               ethernet1 = &swport4;
+               label-mac-device = &swport5;
 
                led-boot = &led_status_amber;
                led-failsafe = &led_status_amber;
        status = "okay";
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy1 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT4 | ESS_PORT5)>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
-       switch_mac_mode2 = <MAC_MODE_SGMII_PLUS>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan2";
+                       phy-handle = <&qca8072>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cell-names = "mac-address";
+                       nvmem-cells = <&eth1addr 0>;
                };
 
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <24>;
-                       port_mac_sel = "QGMAC_PORT";
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "lan1";
+                       phy-handle = <&qca8081>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy1 0>;
+                       nvmem-cell-names = "mac-address";
+                       nvmem-cells = <&ethaddr 0>;
                };
        };
 };
        };
 };
 
-&dp4 {
-       status = "okay";
-
-       phy-handle = <&qca8072>;
-       nvmem-cell-names = "mac-address";
-       nvmem-cells = <&eth1addr 0>;
-       label = "lan2";
-};
-
-&dp5 {
-       status = "okay";
-
-       phy-mode = "sgmii";
-       phy-handle = <&qca8081>;
-       nvmem-cell-names = "mac-address";
-       nvmem-cells = <&ethaddr 0>;
-       label = "lan1";
-};
-
 &blsp1_spi1 {
        pinctrl-0 = <&spi_0_pins>;
        pinctrl-names = "default";
index fd7b9c54a73a0fe64270794ff334d122636d6927..b2352b203558d11001c3c1b973b65b688dc24791 100644 (file)
@@ -40,8 +40,8 @@
        gpio-reserved-ranges = <20 1>;
 };
 
-&switch {
-       switch_mac_mode1 = <MAC_MODE_SGMII_PLUS>;
+&swport5 {
+       phy-handle = <&rtl8211f_4>;
 };
 
 &wifi {
index c7f7f699929ee2cca5223eccd58ffb2e1fa3b197..2405d6b18dfb5e888b147150b3f9f5fdb8c74120 100644 (file)
        compatible = "yuncore,fap650", "qcom,ipq6018";
 
        aliases {
-               ethernet0 = &dp5;
-               ethernet1 = &dp4;
-               ethernet2 = &dp3;
-               ethernet3 = &dp2;
-               ethernet4 = &dp1;
-               label-mac-device = &dp5;
+               ethernet0 = &swport5;
+               ethernet1 = &swport4;
+               ethernet2 = &swport3;
+               ethernet3 = &swport2;
+               ethernet4 = &swport1;
+               label-mac-device = &swport5;
                serial0 = &blsp1_uart3;
                led-boot = &led_system;
                led-failsafe = &led_system;
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
-       switch_lan_bmp = <(ESS_PORT1|ESS_PORT2|ESS_PORT3|ESS_PORT4)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT5>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
-
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+
+               swport1: port@1 {
+                       reg = <1>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 0>;
                };
 
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
                };
 
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
                };
 
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
                };
 
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8075_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
                };
        };
 };
        status = "okay";
 };
 
-&dp1 {
-       status = "okay";
-       phy-handle = <&qca8075_0>;
-       label = "lan1";
-};
-
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "lan2";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan3";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan4";
-};
-
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
-       phy-mode = "psgmii";
-       label = "wan";
-};
-
 &qpic_bam {
        status = "okay";
 };
index a01299f42a4877f23b9413ab95227dd555946bde..bb58959c9f3581d37729816104f1c57f34c8145b 100644 (file)
@@ -23,7 +23,7 @@
                led-failsafe = &led_system_red;
                led-upgrade = &led_system_green;
 
-               label-mac-device = &dp5_syn;
+               label-mac-device = &swport5;
        };
 
        chosen {
        };
 };
 
-&dp1 {
+&edma {
        status = "okay";
-       label = "lan1";
-       phy-handle = <&qca8075_0>;
-       phy-mode = "qsgmii";
-       nvmem-cells = <&hw_mac_addr 1>;
-       nvmem-cell-names = "mac-address";
 };
 
-&dp2 {
+&uniphy0 {
        status = "okay";
-       label = "lan2";
-       phy-handle = <&qca8075_1>;
-       phy-mode = "qsgmii";
-       nvmem-cells = <&hw_mac_addr 1>;
-       nvmem-cell-names = "mac-address";
 };
 
-&dp3 {
+&uniphy1 {
        status = "okay";
-       label = "lan3";
-       phy-handle = <&qca8075_2>;
-       phy-mode = "qsgmii";
-       nvmem-cells = <&hw_mac_addr 1>;
-       nvmem-cell-names = "mac-address";
 };
 
-&dp4 {
+&switch {
        status = "okay";
-       label = "lan4";
-       phy-handle = <&qca8075_3>;
-       phy-mode = "qsgmii";
-       nvmem-cells = <&hw_mac_addr 1>;
-       nvmem-cell-names = "mac-address";
-};
 
-&dp5_syn {
-       status = "okay";
-       label = "wan";
-       phy-handle = <&aqr114c>;
-       phy-mode = "usxgmii";
-       nvmem-cells = <&hw_mac_addr 0>;
-       nvmem-cell-names = "mac-address";
-};
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-&edma {
-       status = "okay";
-};
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-&switch {
-       status = "okay";
-       switch_lan_bmp = <( ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4 )>;
-       switch_wan_bmp = <ESS_PORT5>;
-       switch_mac_mode = <MAC_MODE_QSGMII>;
-       switch_mac_mode1 = <MAC_MODE_USXGMII>;
-
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+
+               swport1: port@1 {
+                       reg = <1>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 0>;
+                       nvmem-cells = <&hw_mac_addr 1>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&hw_mac_addr 1>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&hw_mac_addr 1>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <8>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       ethernet-phy-ieee802.3-c45;
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&hw_mac_addr 1>;
+                       nvmem-cell-names = "mac-address";
+               };
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&aqr114c>;
+                       phy-mode = "usxgmii";
+                       pcs-handle = <&uniphy1 0>;
+                       nvmem-cells = <&hw_mac_addr 0>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
index 3b3090cdc22135f631213388c858d11c3e741f1d..4c199450faf3ae7b60f8cac4a3236f90911c2620 100644 (file)
@@ -9,10 +9,10 @@
        compatible = "netgear,rbs350", "qcom,ipq6018";
 };
 
-&dp2 {
+&swport2 {
        status = "disabled";
 };
 
-&dp3 {
+&swport3 {
        status = "disabled";
 };
index 2b111736186308d75289d2b67968a2810b43e155..dd6a7b7543fa548079095df5b5783b31a99debf5 100644 (file)
@@ -11,7 +11,7 @@
                led-failsafe = &led_status_red;
                led-upgrade = &led_status_blue;
                serial0 = &blsp1_uart3;
-               label-mac-device = &dp5;
+               label-mac-device = &swport5;
        };
 
 
        status = "okay";
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT2 | ESS_PORT3 | ESS_PORT4 | ESS_PORT5)>;
-       switch_wan_bmp = <ESS_PORT1>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
 
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "wan";
+                       phy-handle = <&phy1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&macaddr_boarddata 3>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan3";
+                       phy-handle = <&phy2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&macaddr_boarddata 2>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan2";
+                       phy-handle = <&phy3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&macaddr_boarddata 1>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "lan1";
+                       phy-handle = <&phy4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
+                       nvmem-cells = <&macaddr_boarddata 0>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
        };
 };
 
-&dp2 {
-       status = "okay";
-       phy-handle = <&phy1>;
-       label = "wan";
-       nvmem-cells = <&macaddr_boarddata 3>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&phy2>;
-       label = "lan3";
-       nvmem-cells = <&macaddr_boarddata 2>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&phy3>;
-       label = "lan2";
-       nvmem-cells = <&macaddr_boarddata 1>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp5 {
-       status = "okay";
-       phy-handle = <&phy4>;
-       label = "lan1";
-       nvmem-cells = <&macaddr_boarddata 0>;
-       nvmem-cell-names = "mac-address";
-};
-
 &blsp1_uart3 {
        pinctrl-0 = <&serial_3_pins>;
        pinctrl-names = "default";
index 9ab252ef378d8912c331ae780111315006f57009..6373ae007658faca8756fa8bc763c0ba6c67bb6a 100644 (file)
        };
 };
 
-&dp5 {
-       phy-handle = <&rtl8211f_4>;
-       phy-mode = "sgmii";
-       label = "lan";
-       status = "okay";
-};
-
 &edma {
        status = "okay";
 };
        };
 };
 
+&uniphy1 {
+       status = "okay";
+};
+
 &switch {
-       switch_lan_bmp = <ESS_PORT5>;
-       switch_mac_mode1 = <MAC_MODE_SGMII_CHANNEL0>;
        status = "okay";
 
-       qcom,port_phyinfo {
-               port@4 {
-                       port_id = <5>;
-                       phy_address = <4>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "lan";
+                       phy-handle = <&rtl8211f_4>;
+                       phy-mode = "sgmii";
+                       pcs-handle = <&uniphy1 0>;
                };
        };
 };
index 728820e6bb4cea184df44fdf9e54343f09136e65..532a01132e1707ae6efbf5772ff3c261e8ce2002 100644 (file)
@@ -20,8 +20,8 @@
                led-running = &led_system_green;
                led-upgrade = &led_system_red;
                /* Aliases as required by u-boot to patch MAC addresses */
-               ethernet0 = &dp5;
-               label-mac-device = &dp5;
+               ethernet0 = &swport5;
+               label-mac-device = &swport5;
        };
 
        chosen {
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <ESS_PORT5>; /* lan port bitmap */
-       switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "lan";
+                       phy-handle = <&qca8075_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
                };
        };
 };
        status = "okay";
 };
 
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
-       label = "lan";
-};
-
 &wifi {
        status = "okay";
 
index c9358a031d84d92d07ad7b945862f58a5b993734..2dfc2a263b4e6a7c8c083934693938f107455204 100644 (file)
        compatible = "zyxel,nwa110ax", "qcom,ipq8074";
 
        aliases {
-               ethernet0 = &dp1;
-               label-mac-device = &dp1;
+               ethernet0 = &swport1;
+               label-mac-device = &swport1;
        };
 };
 
-&switch {
-       switch_lan_bmp = <ESS_PORT1>;
-       switch_mac_mode = <MAC_MODE_SGMII0_RGMII4>;
-};
-
-&dp1 {
+&swport1 {
        label = "uplink";
        nvmem-cell-names = "mac-address";
        nvmem-cells = <&label_mac 0>;
index 5d3123f75ea3ff3aae5371b9e164a8aa7e7447e7..203f2074a44f94168bb66f1d7a5311beeda29f85 100644 (file)
                 * Aliases as required by u-boot
                 * to patch MAC addresses
                 */
-               ethernet0 = &dp4;
-               ethernet1 = &dp2;
-               ethernet2 = &dp5;
-               label-mac-device = &dp4;
+               ethernet0 = &swport4;
+               ethernet1 = &swport2;
+               ethernet2 = &swport5;
+               label-mac-device = &swport4;
        };
 
        chosen {
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT2 | ESS_PORT4)>;
-       switch_wan_bmp = <ESS_PORT5>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+
+               /*
+                * Directly connect to the Hi5630
+                * PLC (Power Line Communication)
+                */
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "plc";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
+               };
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
                };
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8075_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
                };
        };
 };
        status = "okay";
 };
 
-/*
- * Directly connect to the Hi5630
- * PLC (Power Line Communication)
- */
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "plc";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan";
-};
-
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
-       label = "wan";
-};
-
 &wifi {
        status = "okay";
 
index 7e70cfc61892a6d02a9bbd337148e4a71cce22ec..e2802f0cfb1b22c22e8e4d08a0f74d05ea31361f 100644 (file)
        };
 };
 
+&uniphy1 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <ESS_PORT5>;
-       switch_wan_bmp = <ESS_PORT6>;
-       switch_mac_mode1 = <MAC_MODE_SGMII_PLUS>;
-       switch_mac_mode2 = <MAC_MODE_SGMII_PLUS>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <24>;
-                       port_mac_sel = "QGMAC_PORT";
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8081_24>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy1 0>;
+               };
+
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "lan";
+                       phy-handle = <&qca8081_28>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy2 0>;
                };
        };
 };
        status = "okay";
 };
 
-&dp5 {
-       status = "okay";
-       phy-mode = "sgmii";
-       phy-handle = <&qca8081_24>;
-       label = "wan";
-};
-
-&dp6 {
-       status = "okay";
-       phy-handle = <&qca8081_28>;
-       label = "lan";
-};
-
 &wifi {
        status = "okay";
 
index c3c41ae2c1663cef7f0544df8fa9d0b19b15aab5..8439e88c796d41ac727b25327aa93a97468256c3 100644 (file)
@@ -14,7 +14,7 @@
                led-failsafe = &led_system_yellow;
                led-running = &led_system_blue;
                led-upgrade = &led_system_yellow;
-               label-mac-device = &dp2;
+               label-mac-device = &swport2;
        };
 
        chosen {
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT3 | ESS_PORT4 | ESS_PORT5)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT2>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "wan";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&macaddr_dp2>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&macaddr_dp3>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&macaddr_dp4>;
+                       nvmem-cell-names = "mac-address";
+               };
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
+                       nvmem-cells = <&macaddr_dp5>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
        status = "okay";
 };
 
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "wan";
-       nvmem-cells = <&macaddr_dp2>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan1";
-       nvmem-cells = <&macaddr_dp3>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan2";
-       nvmem-cells = <&macaddr_dp4>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
-       label = "lan3";
-       nvmem-cells = <&macaddr_dp5>;
-       nvmem-cell-names = "mac-address";
-};
-
 &wifi {
        status = "okay";
 
index 41b6dd066cc489d5f559ee00dd38042d255be0de..31b226cc0faf4aab4b7518e8f4cfd438db03a862 100644 (file)
@@ -22,9 +22,9 @@
                led-running = &led_system_green;
                led-upgrade = &led_system_green;
                /* Aliases as required by u-boot to patch MAC addresses */
-               ethernet0 = &dp6;
-               ethernet1 = &dp5;
-               label-mac-device = &dp5;
+               ethernet0 = &swport6;
+               ethernet1 = &swport5;
+               label-mac-device = &swport5;
        };
 
        chosen {
        };
 };
 
+&uniphy1 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <ESS_PORT5>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
-       switch_mac_mode1 = <MAC_MODE_SGMII_CHANNEL0>; /* mac mode for uniphy instance1*/
-       switch_mac_mode2 = <MAC_MODE_SGMII_CHANNEL0>; /* mac mode for uniphy instance2*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <24>;
-                       port_mac_sel = "QGMAC_PORT";
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "lan";
+                       phy-handle = <&qca8081_24>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy1 0>;
+               };
+
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "wan";
+                       phy-handle = <&qca8081_28>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy2 0>;
                };
        };
 };
        status = "okay";
 };
 
-&dp5 {
-       status = "okay";
-       phy-mode = "sgmii";
-       phy-handle = <&qca8081_24>;
-       label = "lan";
-};
-
-&dp6 {
-       status = "okay";
-       phy-handle = <&qca8081_28>;
-       label = "wan";
-};
-
 &wifi {
        status = "okay";
 
index da72f6bf7195a47fc6531f9ccc622453fa31601b..a382c73e65f130dc052890b44e4a4e04544cada2 100644 (file)
@@ -19,7 +19,7 @@
                led-failsafe = &led_power;
                led-running = &led_power;
                led-upgrade = &led_power;
-               label-mac-device = &dp6_syn;
+               label-mac-device = &swport6;
        };
 
        chosen {
        };
 };
 
+&uniphy1 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <ESS_PORT5>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
-       switch_mac_mode1 = <MAC_MODE_SGMII_PLUS>; /* mac mode for uniphy instance1*/
-       switch_mac_mode2 = <MAC_MODE_SGMII_PLUS>; /* mac mode for uniphy instance2*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <24>;
-                       port_mac_sel = "QGMAC_PORT";
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "lan";
+                       phy-handle = <&qca8081_24>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy1 0>;
+                       nvmem-cell-names = "mac-address";
+                       nvmem-cells = <&macaddr_mac_0 1>;
+               };
+
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "wan";
+                       phy-handle = <&qca8081_28>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy2 0>;
+                       nvmem-cell-names = "mac-address";
+                       nvmem-cells = <&macaddr_mac_0 0>;
                };
        };
 };
        status = "okay";
 };
 
-&dp5_syn {
-       status = "okay";
-       phy-handle = <&qca8081_24>;
-       label = "lan";
-       nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_mac_0 1>;
-};
-
-&dp6_syn {
-       status = "okay";
-       phy-handle = <&qca8081_28>;
-       label = "wan";
-       nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_mac_0 0>;
-};
-
 &wifi {
        status = "okay";
 
index 91a4027b40b3f661d59dd5bf908058d6c25701a9..388f304ba2a95744b96d11f18dfb1d206ee7605b 100644 (file)
@@ -13,9 +13,9 @@
        compatible = "zyxel,nwa210ax", "qcom,ipq8074";
 
        aliases {
-               ethernet0 = &dp5;
-               ethernet1 = &dp1;
-               label-mac-device = &dp5;
+               ethernet0 = &swport5;
+               ethernet1 = &swport1;
+               label-mac-device = &swport5;
        };
 
        leds {
        };
 };
 
-&switch {
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT5)>;
-       switch_mac_mode = <MAC_MODE_SGMII_CHANNEL0>;
-       switch_mac_mode1 = <MAC_MODE_SGMII_PLUS>;
+&uniphy1 {
+       status = "okay";
 };
 
-&phyinfo {
-       port@5 {
-               port_id = <5>;
-               phy_address = <16>;
-               port_mac_sel = "QGMAC_PORT";
+&swports {
+       swport5: port@5 {
+               reg = <5>;
+               label = "uplink";
+               phy-handle = <&qca8081>;
+               phy-mode = "2500base-x";
+               pcs-handle = <&uniphy1 0>;
+               nvmem-cell-names = "mac-address";
+               nvmem-cells = <&label_mac 0>;
        };
 };
 
+&swport1 {
+       label = "lan1";
+       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&label_mac 1>;
+};
+
 &mdio {
        qca8081: ethernet-phy@16 {
                compatible = "ethernet-phy-id004d.d101";
        };
 };
 
-&dp1 {
-       label = "lan1";
-       nvmem-cell-names = "mac-address";
-       nvmem-cells = <&label_mac 1>;
-};
-
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8081>;
-       phy-mode = "sgmii";
-       label = "uplink";
-       nvmem-cell-names = "mac-address";
-       nvmem-cells = <&label_mac 0>;
-};
-
 &wifi {
        qcom,ath11k-calibration-variant = "Zyxel-NWA210AX";
 };
index 5edb4e1936bd3ca8e5b27e9d06e3c2fe94be3cd4..ce8a4ff4ace93e1196c84e1cef073a0b02bd3fb6 100644 (file)
                led-failsafe = &led_system_red;
                led-running = &led_pwr_green;
                led-upgrade = &led_system_red;
-               ethernet0 = &dp1;
-               ethernet1 = &dp2;
-               ethernet2 = &dp3;
-               ethernet3 = &dp4;
-               ethernet4 = &dp5;
-               ethernet5 = &dp6_syn;
-               label-mac-device = &dp1;
+               ethernet0 = &lan4;
+               ethernet1 = &lan3;
+               ethernet2 = &lan2;
+               ethernet3 = &lan1;
+               ethernet4 = &port_10g_1;
+               ethernet5 = &port_10g_2;
+               label-mac-device = &lan4;
        };
 
        chosen {
        vqmmc-supply = <&l11>;
 };
 
-&switch {
+&uniphy0 {
        status = "okay";
-
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4 | ESS_PORT6)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT5>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_QSGMII>; /* mac mode for uniphy instance0*/
-       switch_mac_mode1 = <MAC_MODE_USXGMII>; /* mac mode for uniphy instance1*/
-       switch_mac_mode2 = <MAC_MODE_USXGMII>; /* mac mode for uniphy instance2*/
-
-       qcom,port_phyinfo {
-               port@0 {
-                       port_id = <1>;
-                       phy_address = <16>;
-               };
-               port@1 {
-                       port_id = <2>;
-                       phy_address = <17>;
-               };
-               port@2 {
-                       port_id = <3>;
-                       phy_address = <18>;
-               };
-               port@3 {
-                       port_id = <4>;
-                       phy_address = <19>;
-               };
-               port@4 {
-                       port_id = <5>;
-                       phy_address = <8>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       ethernet-phy-ieee802.3-c45;
-               };
-               port@5 {
-                       port_id = <6>;
-                       phy_address = <0>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       ethernet-phy-ieee802.3-c45;
-               };
-       };
 };
 
-&edma {
+&uniphy1 {
        status = "okay";
 };
 
-&dp1 {
+&uniphy2 {
        status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_16>;
-       label = "lan4";
 };
 
-&dp2 {
+&switch {
        status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_17>;
-       label = "lan3";
-};
 
-&dp3 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_18>;
-       label = "lan2";
-};
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-&dp4 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_19>;
-       label = "lan1";
-};
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-&dp5 {
-       status = "okay";
-       qcom,mactype = <1>;
-       phy-mode = "usxgmii";
-       phy-handle = <&aqr113c_8>;
-       label = "10g-1";
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+
+               lan4: port@1 {
+                       reg = <1>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_16>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 0>;
+               };
+
+               lan3: port@2 {
+                       reg = <2>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_17>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 1>;
+               };
+
+               lan2: port@3 {
+                       reg = <3>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_18>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 2>;
+               };
+
+
+               lan1: port@4 {
+                       reg = <4>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_19>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 3>;
+               };
+
+               port_10g_1: port@5 {
+                       reg = <5>;
+                       label = "10g-1";
+                       phy-handle = <&aqr113c_8>;
+                       phy-mode = "usxgmii";
+                       pcs-handle = <&uniphy1 0>;
+               };
+
+               port_10g_2: port@6 {
+                       reg = <6>;
+                       label = "10g-2";
+                       phy-handle = <&aqr113c_0>;
+                       phy-mode = "usxgmii";
+                       pcs-handle = <&uniphy2 0>;
+               };
+       };
 };
 
-&dp6_syn {
+&edma {
        status = "okay";
-       phy-mode = "usxgmii";
-       phy-handle = <&aqr113c_0>;
-       label = "10g-2";
 };
 
 &wifi {
index 09adde5dcf771a6c9d7339cc1116e1d8bbd30734..33fa341390d123a24f25b8b70e75de91d9959dfb 100644 (file)
                 * Aliases as required by u-boot
                 * to patch MAC addresses
                 */
-               ethernet0 = &dp1;
-               ethernet1 = &dp2;
-               ethernet2 = &dp3;
-               ethernet3 = &dp4;
-               ethernet4 = &dp6_syn;
-               label-mac-device = &dp1;
+               ethernet0 = &swport1;
+               ethernet1 = &swport2;
+               ethernet2 = &swport3;
+               ethernet3 = &swport4;
+               ethernet4 = &swport6;
+               label-mac-device = &swport1;
        };
 
        chosen {
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_QSGMII>; /* mac mode for uniphy instance0*/
-       switch_mac_mode2 = <MAC_MODE_SGMII_PLUS>; /* mac mode for uniphy instance2*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+
+               swport1: port@1 {
+                       reg = <1>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 0>;
                };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 1>;
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 2>;
                };
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 3>;
+               };
+
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "wan";
+                       phy-handle = <&qca8081>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy2 0>;
                };
        };
 };
        status = "okay";
 };
 
-&dp1 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_0>;
-       label = "lan1";
-};
-
-&dp2 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_1>;
-       label = "lan2";
-};
-
-&dp3 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_2>;
-       label = "lan3";
-};
-
-&dp4 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_3>;
-       label = "lan4";
-};
-
-&dp6_syn {
-       status = "okay";
-       phy-handle = <&qca8081>;
-       label = "wan";
-};
-
 &wifi {
        status = "okay";
 
index 70310daf0fb3445667f04d23f82b0cec1205dc9d..6e6576b1c454ecadded252fda0f0857b6944a7ee 100644 (file)
@@ -22,9 +22,9 @@
                led-running = &led_system;
                led-upgrade = &led_system;
                /* Aliases as required by u-boot to patch MAC addresses */
-               ethernet0 = &dp5_syn;
-               ethernet1 = &dp6_syn;
-               label-mac-device = &dp5_syn;
+               ethernet0 = &swport5;
+               ethernet1 = &swport6;
+               label-mac-device = &swport5;
        };
 
        chosen {
        };
 };
 
+&uniphy1 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <ESS_PORT6>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT5>; /* wan port bitmap */
-       switch_mac_mode1 = <MAC_MODE_SGMII_CHANNEL0>; /* mac mode for uniphy instance1*/
-       switch_mac_mode2 = <MAC_MODE_SGMII_CHANNEL0>; /* mac mode for uniphy instance2*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <24>;
-                       port_mac_sel = "QGMAC_PORT";
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8081_24>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy1 0>;
+               };
+
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "lan";
+                       phy-handle = <&qca8081_28>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy2 0>;
                };
        };
 };
        status = "okay";
 };
 
-&dp5_syn {
-       status = "okay";
-       phy-handle = <&qca8081_24>;
-       label = "wan";
-};
-
-&dp6_syn {
-       status = "okay";
-       phy-handle = <&qca8081_28>;
-       label = "lan";
-};
-
 &wifi {
        status = "okay";
        qcom,ath11k-calibration-variant = "Yuncore-AX880";
index c879c5ef7308263340e8302a4ffc4965392e155b..6e7f552ffe6c9a0310f21c5178be4670446188a1 100644 (file)
@@ -21,7 +21,7 @@
                led-failsafe = &led_system_yellow;
                led-running = &led_system_blue;
                led-upgrade = &led_system_yellow;
-               label-mac-device = &dp5;
+               label-mac-device = &wan;
        };
 
        chosen {
        };
 };
 
-&switch {
+&uniphy0 {
        status = "okay";
-
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT5>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_QSGMII>; /* mac mode for uniphy instance0*/
-       switch_mac_mode1 = <MAC_MODE_SGMII_PLUS>; /* mac mode for uniphy instance1*/
-
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
-               };
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
-               };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
-               };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
-               };
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <24>;
-                       port_mac_sel = "QGMAC_PORT";
-               };
-       };
 };
 
-&edma {
+&uniphy1 {
        status = "okay";
 };
 
-&dp1 {
+&switch {
        status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_0>;
-       label = "lan4";
-       nvmem-cells = <&macaddr_dp1>;
-       nvmem-cell-names = "mac-address";
-};
 
-&dp2 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_1>;
-       label = "lan3";
-       nvmem-cells = <&macaddr_dp2>;
-       nvmem-cell-names = "mac-address";
-};
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-&dp3 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_2>;
-       label = "lan2";
-       nvmem-cells = <&macaddr_dp3>;
-       nvmem-cell-names = "mac-address";
-};
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-&dp4 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_3>;
-       label = "lan1";
-       nvmem-cells = <&macaddr_dp4>;
-       nvmem-cell-names = "mac-address";
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+
+               lan4: port@1 {
+                       reg = <1>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 0>;
+                       nvmem-cells = <&macaddr_dp1>;
+                       nvmem-cell-names = "mac-address";
+               };
+
+               lan3: port@2 {
+                       reg = <2>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&macaddr_dp2>;
+                       nvmem-cell-names = "mac-address";
+               };
+
+               lan2: port@3 {
+                       reg = <3>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&macaddr_dp3>;
+                       nvmem-cell-names = "mac-address";
+               };
+
+               lan1: port@4 {
+                       reg = <4>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&macaddr_dp4>;
+                       nvmem-cell-names = "mac-address";
+               };
+
+               wan: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8081>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy1 0>;
+                       nvmem-cells = <&macaddr_dp5>;
+                       nvmem-cell-names = "mac-address";
+               };
+       };
 };
 
-&dp5 {
+&edma {
        status = "okay";
-       phy-mode = "sgmii";
-       phy-handle = <&qca8081>;
-       label = "wan";
-       nvmem-cells = <&macaddr_dp5>;
-       nvmem-cell-names = "mac-address";
 };
 
 &pcie_qmp0 {
index fa3c8ea0113ebb23173d3ba7f23d4b0b28fb8685..1d1e7fc1ee30d9ac461f5a51e9314ebe78fff7bf 100644 (file)
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_QSGMII>; /* mac mode for uniphy instance0*/
-       switch_mac_mode2 = <MAC_MODE_SGMII_PLUS>; /* mac mode for uniphy instance2*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
                port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+                       reg = <1>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 0>;
+                       nvmem-cells = <&macaddr_art_18>;
+                       nvmem-cell-names = "mac-address";
                };
+
                port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+                       reg = <2>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&macaddr_art_12>;
+                       nvmem-cell-names = "mac-address";
                };
+
                port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+                       reg = <3>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&macaddr_art_c>;
+                       nvmem-cell-names = "mac-address";
                };
+
                port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+                       reg = <4>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&macaddr_art_6>;
+                       nvmem-cell-names = "mac-address";
                };
+
                port@6 {
-                       port_id = <6>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+                       reg = <6>;
+                       label = "wan";
+                       phy-handle = <&qca8081>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy2 0>;
+                       nvmem-cells = <&macaddr_art_0>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
        status = "okay";
 };
 
-&dp1 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_0>;
-       label = "lan4";
-       nvmem-cells = <&macaddr_art_18>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp2 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_1>;
-       label = "lan3";
-       nvmem-cells = <&macaddr_art_12>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp3 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_2>;
-       label = "lan2";
-       nvmem-cells = <&macaddr_art_c>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp4 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_3>;
-       label = "lan1";
-       nvmem-cells = <&macaddr_art_6>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp6_syn {
-       status = "okay";
-       phy-handle = <&qca8081>;
-       label = "wan";
-       nvmem-cells = <&macaddr_art_0>;
-       nvmem-cell-names = "mac-address";
-};
-
 &wifi {
        status = "okay";
        qcom,ath11k-calibration-variant = "Dynalink-DL-WRX36";
index 18a3759e79d165551e29f146668a69e0edc12b0f..4932509ab9841a3273c6c88a39894e854b4dec79 100644 (file)
        };
 };
 
-&dp6 {
+&uniphy2 {
        status = "okay";
-       phy-handle = <&ar8031>;
-       label = "lan";
 };
 
 &switch {
        status = "okay";
-       switch_lan_bmp = <ESS_PORT6>;
-       switch_mac_mode2 = <MAC_MODE_SGMII_CHANNEL0>;
 
-       qcom,port_phyinfo {
-               port@6 {
-                       phy_address = <4>;
-                       port_id = <6>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "lan";
+                       phy-handle = <&ar8031>;
+                       phy-mode = "sgmii";
+                       pcs-handle = <&uniphy2 0>;
                };
        };
 };
index 62d40d7e1b0a85c3778bc6273577baad411a8a50..aea73fe82d45ff298a1462820c63c0923027bfcc 100644 (file)
        };
 };
 
-&dp5 {
+&uniphy1 {
        status = "okay";
-       phy-mode = "sgmii";
-       phy-handle = <&qca8081_28>;
-       label = "lan";
 };
 
 &switch {
        status = "okay";
-       switch_lan_bmp = <ESS_PORT5>;
-       switch_mac_mode1 = <MAC_MODE_SGMII_PLUS>;
-
-       qcom,port_phyinfo {
-               port@5 {
-                       phy_address = <28>;
-                       port_id = <5>;
-                       port_mac_sel = "QGMAC_PORT";
+
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "lan";
+                       phy-handle = <&qca8081_28>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy1 0>;
                };
        };
 };
index 0b390e9298fee78d145caeb2ffda9030bcfc6356..cb3de6a2593ae047d6d4947a8f5b1c7f0bb2778d 100644 (file)
        aliases {
                serial0 = &blsp1_uart5;
                /* Aliases are required by U-Boot to patch MAC addresses */
-               ethernet0 = &dp6_syn;
-               ethernet1 = &dp4;
-               ethernet2 = &dp3;
-               ethernet3 = &dp2;
-               label-mac-device = &dp6_syn;
+               ethernet0 = &swport6;
+               ethernet1 = &swport4;
+               ethernet2 = &swport3;
+               ethernet3 = &swport2;
+               label-mac-device = &swport6;
                led-boot = &led_system_blue;
                led-failsafe = &led_system_red;
                led-running = &led_system_green;
        vqmmc-supply = <&l11>;
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
-       switch_mac_mode1 = <MAC_MODE_10GBASE_R>; /* mac mode for uniphy instance1*/
-       switch_mac_mode2 = <MAC_MODE_USXGMII>; /* mac mode for uniphy instance2*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+
+               swport1: port@1 {
+                       reg = <1>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 0>;
+                       status = "disabled";
                };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
                };
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <8>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       ethernet-phy-ieee802.3-c45;
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+               };
+
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "wan";
+                       phy-handle = <&aqr113c>;
+                       phy-mode = "usxgmii";
+                       pcs-handle = <&uniphy2 0>;
                };
        };
 };
        status = "okay";
 };
 
-/* Dummy LAN port */
-&dp1 {
-       status = "disabled";
-       phy-handle = <&qca8075_0>;
-       label = "lan4";
-};
-
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "lan3";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan2";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan1";
-};
-
-&dp6_syn {
-       status = "okay";
-       qcom,mactype = <1>;
-       phy-mode = "usxgmii";
-       phy-handle = <&aqr113c>;
-       label = "wan";
-};
-
 &pcie_qmp0 {
        status = "okay";
 };
index 2a91807bdda17cb9194d2690f0ecb6a612b9c50f..3c40fc16ae4e4f5e17b110461e44db0075b721af 100644 (file)
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <ESS_PORT4>;
-       switch_wan_bmp = <ESS_PORT6>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
-       switch_mac_mode2 = <MAC_MODE_SGMII_PLUS>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-       qcom,port_phyinfo {
-                       port@4 {
-                               phy_address = <3>;
-                               port_id = <4>;
-                       };
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-                       port@6 {
-                               phy_address = <16>;
-                               port_id = <6>;
-                               port_mac_sel = "QGMAC_PORT";
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
                        };
                };
-};
 
-&edma {
-       status = "okay";
-};
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+               };
 
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan";
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "wan";
+                       phy-handle = <&qca8081>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy2 0>;
+               };
+       };
 };
 
-&dp6_syn {
+&edma {
        status = "okay";
-       phy-handle = <&qca8081>;
-       label = "wan";
 };
 
 &pcie_qmp0 {
index ea93cdcf4c7e8ce8af28926c9a729a30e826c6b9..f7defd66555a97aebb6af163c6a8790eed49d8ab 100644 (file)
@@ -19,7 +19,7 @@
                led-running = &led_system_blue;
                led-failsafe = &led_system_red;
                led-upgrade = &led_system_green;
-               label-mac-device = &dp2;
+               label-mac-device = &swport2;
        };
 
        chosen {
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT5>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+
+               swport1: port@1 {
+                       reg = <1>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 0>;
+                       nvmem-cells = <&hw_mac_addr 0>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&hw_mac_addr 0>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&hw_mac_addr 0>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&hw_mac_addr 0>;
+                       nvmem-cell-names = "mac-address";
+               };
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8075_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
+                       nvmem-cells = <&hw_mac_addr 0>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
        status = "okay";
 };
 
-&dp1 {
-       status = "okay";
-       phy-handle = <&qca8075_0>;
-       label = "lan1";
-       nvmem-cells = <&hw_mac_addr 0>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "lan2";
-       nvmem-cells = <&hw_mac_addr 0>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan3";
-       nvmem-cells = <&hw_mac_addr 0>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan4";
-       nvmem-cells = <&hw_mac_addr 0>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
-       label = "wan";
-       nvmem-cells = <&hw_mac_addr 0>;
-       nvmem-cell-names = "mac-address";
-};
-
 &ssphy_0 {
        status = "okay";
 };
index f7837debbccedf320a3a6d9966cd23a34d8df5ff..1025775d5151e09b1620124cbe966293d559e357 100644 (file)
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_QSGMII>; /* mac mode for uniphy instance0*/
-       switch_mac_mode2 = <MAC_MODE_USXGMII>; /* mac mode for uniphy instance2*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+               swport1: port@1 {
+                       reg = <1>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 0>;
+                       nvmem-cells = <&hw_mac_addr 1>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&hw_mac_addr 1>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&hw_mac_addr 1>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&hw_mac_addr 1>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <8>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       ethernet-phy-ieee802.3-c45;
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "wan";
+                       phy-handle = <&aqr114c>;
+                       phy-mode = "usxgmii";
+                       pcs-handle = <&uniphy2 0>;
+                       nvmem-cells = <&hw_mac_addr 0>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
        status = "okay";
 };
 
-&dp1 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_0>;
-       label = "lan1";
-       nvmem-cells = <&hw_mac_addr 1>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp2 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_1>;
-       label = "lan2";
-       nvmem-cells = <&hw_mac_addr 1>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp3 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_2>;
-       label = "lan3";
-       nvmem-cells = <&hw_mac_addr 1>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp4 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_3>;
-       label = "lan4";
-       nvmem-cells = <&hw_mac_addr 1>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp6_syn {
-       status = "okay";
-       phy-mode = "usxgmii";
-       phy-handle = <&aqr114c>;
-       label = "wan";
-       nvmem-cells = <&hw_mac_addr 0>;
-       nvmem-cell-names = "mac-address";
-};
-
 &ssphy_0 {
        status = "okay";
 };
index 91804b862fbeb28fc75fad34379f88094a9ad13a..e522a3efe18c264353c805dadf4d5ec267ef9528 100644 (file)
                led-upgrade = &led_system_red;
                serial0 = &blsp1_uart5;
                /* Aliases as required by u-boot to patch MAC addresses */
-               ethernet0 = &dp6_syn;
-               ethernet1 = &dp4;
-               ethernet2 = &dp3;
-               ethernet3 = &dp2;
-               label-mac-device = &dp6_syn;
+               ethernet0 = &swport6;
+               ethernet1 = &swport4;
+               ethernet2 = &swport3;
+               ethernet3 = &swport2;
+               label-mac-device = &swport6;
        };
 
        chosen {
        status = "okay";
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
-       switch_lan_bmp = <(ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_QSGMII>; /* mac mode for uniphy instance0*/
-       switch_mac_mode2 = <MAC_MODE_SGMII_PLUS>; /* mac mode for uniphy instance2*/
        status = "okay";
 
-       qcom,port_phyinfo {
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
 
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 1>;
                };
 
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 2>;
                };
 
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 3>;
+               };
+
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "wan";
+                       phy-handle = <&qca8081>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy2 0>;
                };
        };
 };
        status = "okay";
 };
 
-&dp2 {
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_1>;
-       label = "lan3";
-       status = "okay";
-};
-
-&dp3 {
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_2>;
-       label = "lan2";
-       status = "okay";
-};
-
-&dp4 {
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_3>;
-       label = "lan1";
-       status = "okay";
-};
-
-&dp6_syn {
-       phy-handle = <&qca8081>;
-       label = "wan";
-       status = "okay";
-};
-
 &wifi {
        qcom,ath11k-calibration-variant = "Spectrum-SAX1V1K";
        status = "okay";
index e9a9c12edfb138d634ce8b35569bbb7ca89bd76f..570ff0aca55d6e981ed4d891a344a8b6494ca9a1 100644 (file)
        status = "okay";
 };
 
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <ESS_PORT6>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
-       switch_mac_mode2 = <MAC_MODE_SGMII_CHANNEL0>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "lan";
+                       phy-handle = <&qca8081_28>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy2 0>;
+                       nvmem-cells = <&macaddr_ubootenv_ethaddr>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
        };
 };
 
-&dp6_syn {
-       status = "okay";
-       phy-handle = <&qca8081_28>;
-       label = "lan";
-       nvmem-cells = <&macaddr_ubootenv_ethaddr>;
-       nvmem-cell-names = "mac-address";
-};
-
 &qpic_bam {
        status = "okay";
 };
index f410f79495ef1800d2afd480d600a2897bead28b..286bb7c60b8a337b6199895947488ba805d44fbf 100644 (file)
@@ -14,8 +14,8 @@
 
        aliases {
                serial0 = &blsp1_uart5;
-               ethernet0 = &dp6;
-               label-mac-device = &dp6;
+               ethernet0 = &swport6;
+               label-mac-device = &swport6;
 
                led-boot = &led_system_blue;
                led-failsafe = &led_system_red;
        status = "okay";
 };
 
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <ESS_PORT6>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
-       switch_mac_mode2 = <MAC_MODE_SGMII_CHANNEL0>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "lan";
+                       phy-handle = <&qca8081_28>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy2 0>;
                };
        };
 };
        };
 };
 
-&dp6 {
-       status = "okay";
-       phy-handle = <&qca8081_28>;
-       label = "lan";
-};
-
 &qpic_bam {
        status = "okay";
 };
index f0fd1331e604234d6dc0cf1309b1c11595d240c0..7fe6c9b5bd3c6510e2952e8c177cdff34b926964 100644 (file)
                led-running = &led_system_green;
                led-upgrade = &led_system_blue;
                /* Aliases as required by u-boot to patch MAC addresses */
-               ethernet0 = &dp6;
-               ethernet1 = &dp2;
-               ethernet2 = &dp3;
-               ethernet3 = &dp4;
-               label-mac-device = &dp6;
+               ethernet0 = &swport6;
+               ethernet1 = &swport2;
+               ethernet2 = &swport3;
+               ethernet3 = &swport4;
+               label-mac-device = &swport6;
        };
 
        chosen {
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
-       switch_mac_mode1 = <MAC_MODE_SGMII_CHANNEL0>; /* mac mode for uniphy instance1*/
-       switch_mac_mode2 = <MAC_MODE_SGMII_CHANNEL0>; /* mac mode for uniphy instance2*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-       qcom,port_phyinfo {
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
                };
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+               };
+
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "wan";
+                       phy-handle = <&qca8081>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy2 0>;
                };
        };
 };
        status = "okay";
 };
 
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "lan1";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan2";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan3";
-};
-
-&dp6 {
-       status = "okay";
-       phy-handle = <&qca8081>;
-       label = "wan";
-};
-
 &pcie_qmp0 {
        status = "okay";
 };
index be7c77d3feb75904c8d31f6495ad76b50381d81b..6db9345e347d708582a6c1f9ec0955f198987f01 100644 (file)
                 * Aliases as required by u-boot
                 * to patch MAC addresses
                 */
-               ethernet0 = &dp1;
-               ethernet1 = &dp2;
-               ethernet2 = &dp3;
-               ethernet3 = &dp4;
-               ethernet4 = &dp5;
-               label-mac-device = &dp1;
+               ethernet0 = &swport1;
+               ethernet1 = &swport2;
+               ethernet2 = &swport3;
+               ethernet3 = &swport4;
+               ethernet4 = &swport5;
+               label-mac-device = &swport1;
        };
 
        chosen {
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>;
-       switch_wan_bmp = <ESS_PORT5>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+
+               swport1: port@1 {
+                       reg = <1>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 0>;
                };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
                };
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+               };
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8075_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
                };
        };
 };
        status = "okay";
 };
 
-&dp1 {
-       status = "okay";
-       phy-handle = <&qca8075_0>;
-       label = "lan1";
-};
-
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "lan2";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan3";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan4";
-};
-
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
-       label = "wan";
-};
-
 &wifi {
        status = "okay";
 
index 2f14b554ccb8ba47a683b85aa4fc25cd6f9e921e..b43f5b6bb5b002226d8bb52d41455e2a8d9c5479 100644 (file)
@@ -443,24 +443,46 @@ to suit the TP-Link Deco X80-5G target */
        };
 };
 
+&uniphy1 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
 
 &switch {
        status = "okay";
 
-       switch_wan_bmp = <ESS_PORT5>; /* wan port bitmap */
-       switch_lan_bmp = <ESS_PORT6>; /* lan port bitmap */
-       switch_mac_mode1 = <MAC_MODE_SGMII_PLUS>; /* mac mode for uniphy instance1*/
-       switch_mac_mode2 = <MAC_MODE_SGMII_CHANNEL0>; /* mac mode for uniphy instance2*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <4>;
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8081>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy1 0>;
+               };
+
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "lan";
+                       phy-handle = <&qca8033>;
+                       phy-mode = "sgmii";
+                       pcs-handle = <&uniphy2 0>;
                };
        };
 };
@@ -469,18 +491,6 @@ to suit the TP-Link Deco X80-5G target */
        status = "okay";
 };
 
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8081>;
-       label = "wan";
-};
-
-&dp6_syn {
-       status = "okay";
-       phy-handle = <&qca8033>;
-       label = "lan";
-};
-
 &wifi {
        status = "okay";
        qcom,ath11k-calibration-variant = "tplink_deco-x80-5g";
index 35dd01967f87ad3fcac702a60162ca08e6d733f7..ecf2a899ebd8e18c883c8c7196decb23dea435f0 100644 (file)
@@ -20,9 +20,7 @@
        aliases {
                serial0 = &blsp1_uart5;
                serial1 = &blsp1_uart3;
-               /* Alias as required by u-boot to patch MAC addresses */
-               ethernet0 = &dp1;
-               label-mac-device = &dp1;
+               label-mac-device = &swport1;
        };
 
        chosen {
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy1 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4 | ESS_PORT6)>;
-       switch_wan_bmp = <ESS_PORT5>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
-       switch_mac_mode1 = <MAC_MODE_SGMII_CHANNEL0>;
-       switch_mac_mode2 = <MAC_MODE_USXGMII>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
 
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+               swport1: port@1 {
+                       reg = <1>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 0>;
+                       nvmem-cells = <&macaddr_lan 0>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&macaddr_lan 0>;
+                       nvmem-cell-names = "mac-address";
+               };
+
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&macaddr_lan 0>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&macaddr_lan 0>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8081>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy1 0>;
+                       nvmem-cells = <&macaddr_lan 1>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@6 {
-                       port_id = <6>;
-                       ethernet-phy-ieee802.3-c45;
-                       phy_address = <8>;
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "10g";
+                       phy-handle = <&aqr113c>;
+                       phy-mode = "usxgmii";
+                       pcs-handle = <&uniphy2 0>;
+                       nvmem-cells = <&macaddr_lan 0>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
        status = "okay";
 };
 
-&dp1 {
-       status = "okay";
-       phy-handle = <&qca8075_0>;
-       label = "lan1";
-       nvmem-cells = <&macaddr_lan 0>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "lan2";
-       nvmem-cells = <&macaddr_lan 0>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan3";
-       nvmem-cells = <&macaddr_lan 0>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan4";
-       nvmem-cells = <&macaddr_lan 0>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp5 {
-       status = "okay";
-       phy-mode = "sgmii";
-       phy-handle = <&qca8081>;
-       label = "wan";
-       nvmem-cells = <&macaddr_lan 1>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp6_syn {
-       status = "okay";
-       phy-mode = "usxgmii";
-       phy-handle = <&aqr113c>;
-       label = "10g";
-       nvmem-cells = <&macaddr_lan 0>;
-       nvmem-cell-names = "mac-address";
-};
-
 &blsp1_i2c2 {
        pinctrl-0 = <&i2c_0_pins>;
        pinctrl-names = "default";
index 4822cbe9a69dd1163bd38a45f748eb9a217d3651..2cc4b5dd8b77a1087560acf3e1649dc1bdcfa8d2 100644 (file)
@@ -19,7 +19,7 @@
                led-running = &led_system_white;
                led-upgrade = &led_system_white;
                led-internet = &led_wan_white;
-               label-mac-device = &dp5;
+               label-mac-device = &swport5;
        };
 
        chosen {
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4 | ESS_PORT6)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT5>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
-       switch_mac_mode2 = <MAC_MODE_USXGMII>; /* mac mode for uniphy instance2*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+               swport1: port@1 {
+                       reg = <1>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 0>;
+                       nvmem-cells = <&macaddr_lan>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&macaddr_lan>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&macaddr_lan>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&macaddr_lan>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&qca8075_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
+                       nvmem-cells = <&macaddr_wan>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <7>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       ethernet-phy-ieee802.3-c45;
+
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "lan5";
+                       phy-handle = <&aqr111b0>;
+                       phy-mode = "usxgmii";
+                       pcs-handle = <&uniphy2 0>;
+                       nvmem-cells = <&macaddr_lan>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
        status = "okay";
 };
 
-&dp1 {
-       status = "okay";
-       phy-handle = <&qca8075_0>;
-       label = "lan4";
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "lan3";
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan2";
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan1";
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
-       label = "wan";
-       nvmem-cells = <&macaddr_wan>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp6_syn {
-       status = "okay";
-       phy-mode = "usxgmii";
-       phy-handle = <&aqr111b0>;
-       label = "lan5";
-       nvmem-cells = <&macaddr_lan>;
-       nvmem-cell-names = "mac-address";
-};
-
 &blsp1_uart5 {
        status = "okay";
 };
index 9982abd803739a41e64937307954d04000ec2af0..54588badf1de7d2afd15413695dc78245145bb94 100644 (file)
        compatible = "netgear,rbs750", "qcom,ipq8074";
 };
 
-&dp1 {
+&swport1 {
        status = "disabled";
 };
 
-&dp2 {
+&swport2 {
        status = "disabled";
 };
index 55474c82e3a4e5fe30b705c88d1f72ce68f9560c..097cb6ca7196bffb60b81b0421df1b6d2b4bd411 100644 (file)
@@ -18,7 +18,7 @@
                led-failsafe = &lp5562_red;
                led-upgrade = &lp5562_blue;
                serial0 = &blsp1_uart5;
-               label-mac-device = &dp5;
+               label-mac-device = &swport5;
        };
 
        chosen {
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT2 | ESS_PORT4 | ESS_PORT5)>;
-       switch_wan_bmp = <ESS_PORT1>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <0>;
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+
+               swport1: port@1 {
+                       reg = <1>;
+                       label = "wan";
+                       phy-handle = <&phy0>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 0>;
+                       nvmem-cells = <&macaddr_boarddata 1>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan3";
+                       phy-handle = <&phy1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&macaddr_boarddata 1>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan2";
+                       phy-handle = <&phy3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&macaddr_boarddata 1>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "lan1";
+                       phy-handle = <&phy4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
+                       nvmem-cells = <&macaddr_boarddata 0>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
        };
 };
 
-&dp1 {
-       status = "okay";
-       phy-handle = <&phy0>;
-       label = "wan";
-       nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_boarddata 1>;
-};
-
-&dp2 {
-       status = "okay";
-       phy-handle = <&phy1>;
-       label = "lan3";
-       nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_boarddata 2>;
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&phy3>;
-       label = "lan2";
-       nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_boarddata 1>;
-};
-
-&dp5 {
-       status = "okay";
-       phy-handle = <&phy4>;
-       label = "lan1";
-       nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_boarddata 0>;
-};
-
 &qpic_bam {
        status = "okay";
 };
index 1fdf394d3fab321c77d497a5cb8934bcc56c5bf7..467dec01d613cb2d03cece058cfefb46c75476a8 100644 (file)
        aliases {
                serial0 = &blsp1_uart5;
                mdio-gpio0 = &mdio1;
-               ethernet0 = &dp1;
-               ethernet1 = &dp2;
-               ethernet2 = &dp3;
-               ethernet3 = &dp4;
-               ethernet4 = &dp5_syn;
-               ethernet5 = &dp6_syn;
                led-boot = &led_pwr;
                led-failsafe = &led_pwr;
                led-running = &led_pwr;
                enable-active-high;
                regulator-boot-on;
        };
+
+       sfp: sfp {
+               compatible = "sff,sfp";
+
+               i2c-bus = <&blsp1_i2c2>;
+
+               mod-def0-gpios = <&tlmm 46 GPIO_ACTIVE_LOW>;
+               tx-disable-gpios = <&tlmm 48 GPIO_ACTIVE_HIGH>;
+               tx-fault-gpios = <&tlmm 62 GPIO_ACTIVE_HIGH>;
+       };
 };
 
 &cpu0_thermal {
                        partition@3e0000 {
                                label = "0:appsblenv";
                                reg = <0x003e0000 0x20000>;
+
+                               nvmem-layout {
+                                       compatible = "u-boot,env";
+
+                                       macaddr_ubootenv_ethaddr: ethaddr {};
+                               };
                        };
 
                        partition@400000 {
                #address-cells = <1>;
                #size-cells = <0>;
                reg = <0x10>;
+               dsa,member = <1 0>;
 
                ports {
                        #address-cells = <1>;
                        port@0 {
                                reg = <0>;
                                label = "cpu";
-                               ethernet = <&dp1>;
+                               ethernet = <&port_switch>;
                                phy-mode = "rgmii-rxid";
                                phy-handle = <&qca8035>;
                        };
                                reg = <1>;
                                label = "lan7";
                                phy-handle = <&qca8337_0>;
+                               nvmem-cells = <&macaddr_ubootenv_ethaddr>;
+                               nvmem-cell-names = "mac-address";
                        };
 
                        port@2 {
                                reg = <2>;
                                label = "lan6";
                                phy-handle = <&qca8337_1>;
+                               nvmem-cells = <&macaddr_ubootenv_ethaddr>;
+                               nvmem-cell-names = "mac-address";
                        };
 
                        port@3 {
                                reg = <3>;
                                label = "lan5";
                                phy-handle = <&qca8337_2>;
+                               nvmem-cells = <&macaddr_ubootenv_ethaddr>;
+                               nvmem-cell-names = "mac-address";
                        };
 
                        port@4 {
                                reg = <4>;
                                label = "lan4";
                                phy-handle = <&qca8337_3>;
+                               nvmem-cells = <&macaddr_ubootenv_ethaddr>;
+                               nvmem-cell-names = "mac-address";
                        };
 
                        port@5 {
                                reg = <5>;
                                label = "lan3";
                                phy-handle = <&qca8337_4>;
+                               nvmem-cells = <&macaddr_ubootenv_ethaddr>;
+                               nvmem-cell-names = "mac-address";
                        };
 
                        port@6 {
                                phy-handle = <&qca8033>;
                                managed = "in-band-status";
                                qca,sgmii-enable-pll;
+                               nvmem-cells = <&macaddr_ubootenv_ethaddr>;
+                               nvmem-cell-names = "mac-address";
                        };
                };
        };
 
 &switch {
        status = "okay";
+       dsa,member = <0 0>;
 
        pinctrl-0 = <&uniphy_pins>;
        pinctrl-names = "default";
 
-       switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT5 | ESS_PORT6)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT4>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_QSGMII>; /* mac mode for uniphy instance0*/
-       switch_mac_mode1 = <MAC_MODE_10GBASE_R>; /* mac mode for uniphy instance1*/
-       switch_mac_mode2 = <MAC_MODE_USXGMII>; /* mac mode for uniphy instance2*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-       qcom,port_phyinfo {
                port@0 {
-                       port_id = <1>;
-                       phy_address = <0x8>;
-               };
-               port@1 {
-                       port_id = <2>;
-                       phy_address = <0x9>;
-               };
-               port@2 {
-                       port_id = <3>;
-                       phy_address = <0xa>;
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@3 {
-                       port_id = <4>;
-                       phy_address = <0xb>;
+
+               port_switch: port@1 {
+                       reg = <1>;
+                       label = "switch";
+                       phy-handle = <&qca8075_8>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 0>;
+                       nvmem-cells = <&macaddr_ubootenv_ethaddr>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               sfp: port@4 {
-                       port_id = <5>;
-                       phy_address = <30>;
-                       phy_i2c_address = <30>;
-                       phy-i2c-mode; /*i2c access phy */
-                       media-type = "sfp"; /* fiber mode */
-                       sfp_tx_dis_pin = <&tlmm 48 GPIO_ACTIVE_HIGH>;
-                       sfp_mod_present_pin = <&tlmm 46 GPIO_ACTIVE_LOW>;
+               port@2 {
+                       reg = <2>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_9>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&macaddr_ubootenv_ethaddr>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               /* PCB R5.00, AQR113C */
-               port@5_113c {
-                       status = "disabled";
-                       port_id = <6>;
-                       phy_address = <8>;
-                       ethernet-phy-ieee802.3-c45;
-                       mdiobus = <&mdio1>;
+               port@3 {
+                       reg = <3>;
+                       label = "lan1";
+                       phy-handle = <&qca8075_a>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&macaddr_ubootenv_ethaddr>;
+                       nvmem-cell-names = "mac-address";
+               };
+
+               port@4 {
+                       reg = <4>;
+                       label = "wan";
+                       phy-handle = <&qca8075_b>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&macaddr_ubootenv_ethaddr>;
+                       nvmem-cell-names = "mac-address";
+               };
+
+               port@5 {
+                       reg = <5>;
+                       label = "10g-sfp";
+                       sfp = <&sfp>;
+                       phy-mode = "10gbase-r";
+                       managed = "in-band-status";
+                       pcs-handle = <&uniphy1 0>;
+                       nvmem-cells = <&macaddr_ubootenv_ethaddr>;
+                       nvmem-cell-names = "mac-address";
+               };
+
+               port@6 {
+                       reg = <6>;
+                       label = "10g-copper";
+                       phy-handle = <&aqr113c>;
+                       phy-mode = "usxgmii";
+                       pcs-handle = <&uniphy2 0>;
+                       nvmem-cells = <&macaddr_ubootenv_ethaddr>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
 
-&edma {
-       status = "okay";
-};
-
-&dp1 {
+&uniphy0 {
        status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_8>;
-       label = "switch";
 };
 
-&dp2 {
+&uniphy1 {
        status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_9>;
-       label = "lan2";
 };
 
-&dp3 {
+&uniphy2 {
        status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_a>;
-       label = "lan1";
 };
 
-&dp4 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_b>;
-       label = "wan";
-};
-
-&dp5_syn {
-       status = "okay";
-       phy-handle = <&sfp>;
-       label = "10g-sfp";
-};
-
-&dp6_syn {
+&edma {
        status = "okay";
-       phy-handle = <&aqr113c>;
-       label = "10g-copper";
 };
 
 &wifi {
index db0e4475c31b6fa7d38769692364c10ad0aa2777..9abdbdc0a59553cdb69c4d29c160a40c05def73c 100644 (file)
@@ -20,7 +20,7 @@
                led-failsafe = &led_front_red;
                led-running = &led_front_green;
                led-upgrade = &led_front_white;
-               label-mac-device = &dp2;
+               label-mac-device = &swport2;
        };
 
        chosen {
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT2 | ESS_PORT3 | ESS_PORT4 | ESS_PORT5)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
-       switch_mac_mode2 = <MAC_MODE_SGMII_PLUS>; /* mac mode for uniphy instance2*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
 
-       qcom,port_phyinfo {
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
                };
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&macaddr_boarddata1_0>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&macaddr_boarddata1_0>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&macaddr_boarddata1_0>;
+                       nvmem-cell-names = "mac-address";
                };
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "lan5";
+                       phy-handle = <&qca8075_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
+                       nvmem-cells = <&macaddr_boarddata1_0>;
+                       nvmem-cell-names = "mac-address";
+               };
+
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "wan";
+                       phy-handle = <&qca8081_28>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy2 0>;
+                       nvmem-cells = <&macaddr_boarddata1_6>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
        status = "okay";
 };
 
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
-       label = "lan2";
-       nvmem-cells = <&macaddr_boarddata1_0>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
-       label = "lan3";
-       nvmem-cells = <&macaddr_boarddata1_0>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan4";
-       nvmem-cells = <&macaddr_boarddata1_0>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
-       label = "lan5";
-       nvmem-cells = <&macaddr_boarddata1_0>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp6 {
-       status = "okay";
-       phy-handle = <&qca8081_28>;
-       label = "wan";
-       nvmem-cells = <&macaddr_boarddata1_6>;
-       nvmem-cell-names = "mac-address";
-};
-
 &wifi {
        status = "okay";
 
index 3393efd7b550f33ca709a28ede74e02da8eb9910..0764800bbc926413f10e83460ddfecbbd3f9a1e7 100644 (file)
@@ -16,9 +16,9 @@
        aliases {
                serial0 = &blsp1_uart5;
 
-               ethernet0 = &dp6_syn;
-               ethernet1 = &dp4;
-               label-mac-device = &dp6_syn;
+               ethernet0 = &swport6;
+               ethernet1 = &swport4;
+               label-mac-device = &swport6;
 
                led-boot = &led_system_blue;
                led-failsafe = &led_system_red;
        status = "okay";
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT4 | ESS_PORT6)>;
-       switch_mac_mode = <MAC_MODE_PSGMII>;
-       switch_mac_mode2 = <MAC_MODE_SGMII_PLUS>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
                };
 
-               port@6 {
-                       port_id = <6>;
-                       phy_address = <28>;
-                       port_mac_sel = "QGMAC_PORT";
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "lan1";
+                       phy-handle = <&qca8081>;
+                       phy-mode = "2500base-x";
+                       pcs-handle = <&uniphy2 0>;
                };
        };
 };
        };
 };
 
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
-       label = "lan2";
-};
-
-&dp6_syn {
-       status = "okay";
-       phy-handle = <&qca8081>;
-       label = "lan1";
-};
-
 &qpic_bam {
        status = "okay";
 };
index f6ba5731c89a7bf365b05c296b0cb7aee3eaabe8..60fb04d46c803a66c4ee09ec3d4c59da75caec40 100644 (file)
@@ -19,7 +19,7 @@
                led-failsafe = &led_power_red;
                led-running = &led_power_white;
                led-upgrade = &led_power_white;
-               label-mac-device = &dp5_syn;
+               label-mac-device = &swport5;
        };
 
        chosen {
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
+&uniphy1 {
+       status = "okay";
+};
+
+&uniphy2 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT2 | ESS_PORT3 | ESS_PORT4 | ESS_PORT6)>;
-       switch_wan_bmp = <ESS_PORT5>;
-       switch_mac_mode = <MAC_MODE_QSGMII>;
-       switch_mac_mode1 = <MAC_MODE_USXGMII>;
-       switch_mac_mode2 = <MAC_MODE_USXGMII>;
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <0x19>;
+               swport2: port@2 {
+                       reg = <2>;
+                       label = "lan4";
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 1>;
+                       nvmem-cells = <&macaddr_appsblenv_ethaddr>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <0x1a>;
+               swport3: port@3 {
+                       reg = <3>;
+                       label = "lan3";
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 2>;
+                       nvmem-cells = <&macaddr_appsblenv_ethaddr>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <0x1b>;
+               swport4: port@4 {
+                       reg = <4>;
+                       label = "lan2";
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "qsgmii";
+                       pcs-handle = <&uniphy0 3>;
+                       nvmem-cells = <&macaddr_appsblenv_ethaddr>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@5 {
-                       port_id = <5>;
-                       ethernet-phy-ieee802.3-c45;
-                       phy_address = <0x0>;
+               swport5: port@5 {
+                       reg = <5>;
+                       label = "wan";
+                       phy-handle = <&aqr113c_1>;
+                       phy-mode = "usxgmii";
+                       pcs-handle = <&uniphy1 0>;
+                       nvmem-cells = <&macaddr_appsblenv_ethaddr>;
+                       nvmem-cell-names = "mac-address";
                };
 
-               port@6 {
-                       port_id = <6>;
-                       ethernet-phy-ieee802.3-c45;
-                       phy_address = <0x8>;
+               swport6: port@6 {
+                       reg = <6>;
+                       label = "lan1";
+                       phy-handle = <&aqr113c_2>;
+                       phy-mode = "usxgmii";
+                       pcs-handle = <&uniphy2 0>;
+                       nvmem-cells = <&macaddr_appsblenv_ethaddr>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
        status = "okay";
 };
 
-&dp2 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_1>;
-       label = "lan4";
-       nvmem-cells = <&macaddr_appsblenv_ethaddr>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp3 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_2>;
-       label = "lan3";
-       nvmem-cells = <&macaddr_appsblenv_ethaddr>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp4 {
-       status = "okay";
-       phy-mode = "qsgmii";
-       phy-handle = <&qca8075_3>;
-       label = "lan2";
-       nvmem-cells = <&macaddr_appsblenv_ethaddr>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp5_syn {
-       status = "okay";
-       phy-mode = "usxgmii";
-       phy-handle = <&aqr113c_1>;
-       label = "wan";
-       nvmem-cells = <&macaddr_appsblenv_ethaddr>;
-       nvmem-cell-names = "mac-address";
-};
-
-&dp6_syn {
-       status = "okay";
-       phy-mode = "usxgmii";
-       phy-handle = <&aqr113c_2>;
-       label = "lan1";
-       nvmem-cells = <&macaddr_appsblenv_ethaddr>;
-       nvmem-cell-names = "mac-address";
-};
-
 &ssphy_0 {
        status = "okay";
 };
index 7c2bd698ea662a64b82aaf2f022afe65306c2e19..5f6e75410a9a257c8528589480a704075eb65735 100644 (file)
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       phyinfo: qcom,port_phyinfo {
-               port@1 {
-                       port_id = <1>;
-                       phy_address = <1>;
+       swports: ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+
+               swport1: port@1 {
+                       reg = <1>;
+                       phy-handle = <&ar8033>;
+                       phy-mode = "sgmii";
+                       pcs-handle = <&uniphy0 0>;
                };
        };
 };
        };
 };
 
-&dp1 {
-       status = "okay";
-       phy-handle = <&ar8033>;
-       phy-mode = "sgmii";
-};
-
 &blsp1_spi1 {
        pinctrl-0 = <&spi_0_pins>;
        pinctrl-names = "default";
index 3e028fc8c6b3d0275aef253f69eeadf82a0e82f4..3682114ad3ecfb16d3520981659f68fe039de2ef 100644 (file)
        };
 };
 
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
+&swport2 {
        label = "wan";
        nvmem-cells = <&mac_address 0>;
        nvmem-cell-names = "mac-address";
 };
 
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
+&swport3 {
        label = "lan3";
        nvmem-cells = <&mac_address 1>;
        nvmem-cell-names = "mac-address";
 };
 
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
+&swport4 {
        label = "lan2";
        nvmem-cells = <&mac_address 1>;
        nvmem-cell-names = "mac-address";
 };
 
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
+&swport5 {
        label = "lan1";
        nvmem-cells = <&mac_address 1>;
        nvmem-cell-names = "mac-address";
index c2f2ac563b5c714d0fe2e8980a50c697810d09ef..20f83c72f8cf23c4bfe19c33e122beba8ba39f2d 100644 (file)
@@ -5,7 +5,7 @@
 
 / {
        aliases {
-               label-mac-device = &dp2;
+               label-mac-device = &swport2;
        };
 };
 
        };
 };
 
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
+&swport2 {
        nvmem-cells = <&hw_mac_addr 0>;
        nvmem-cell-names = "mac-address";
        label = "wan";
 };
 
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
+&swport3 {
        nvmem-cells = <&hw_mac_addr 0>;
        nvmem-cell-names = "mac-address";
        label = "lan1";
 };
 
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
+&swport4 {
        nvmem-cells = <&hw_mac_addr 0>;
        nvmem-cell-names = "mac-address";
        label = "lan2";
 };
 
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
+&swport5 {
        nvmem-cells = <&hw_mac_addr 0>;
        nvmem-cell-names = "mac-address";
        label = "lan3";
index 5010d96c28b4d2f9eef8c40c2dfd4257dce58929..df0f1875e9a76c471ee1448642d5c44ebf468fd2 100644 (file)
@@ -22,7 +22,7 @@
        };
 
        aliases {
-               label-mac-device = &dp2;
+               label-mac-device = &swport2;
        };
 };
 
        };
 };
 
-&dp2 {
-       status = "okay";
-       phy-handle = <&qca8075_1>;
+&swport2 {
        label = "wan";
        nvmem-cells = <&hw_mac_addr 0>;
        nvmem-cell-names = "mac-address";
 };
 
-&dp3 {
-       status = "okay";
-       phy-handle = <&qca8075_2>;
+&swport3 {
        label = "lan3";
        nvmem-cells = <&hw_mac_addr 0>;
        nvmem-cell-names = "mac-address";
 };
 
-&dp4 {
-       status = "okay";
-       phy-handle = <&qca8075_3>;
+&swport4 {
        label = "lan2";
        nvmem-cells = <&hw_mac_addr 0>;
        nvmem-cell-names = "mac-address";
 };
 
-&dp5 {
-       status = "okay";
-       phy-handle = <&qca8075_4>;
+&swport5 {
        label = "lan1";
        nvmem-cells = <&hw_mac_addr 0>;
        nvmem-cell-names = "mac-address";
index 1bd150c160bedb6dc8948651d567e85a0ed0947b..297dbf8d163aed6d3a84717edcb7de6461acb766 100644 (file)
        };
 };
 
+&uniphy0 {
+       status = "okay";
+};
+
 &switch {
        status = "okay";
 
-       switch_lan_bmp = <(ESS_PORT3 | ESS_PORT4 | ESS_PORT5)>; /* lan port bitmap */
-       switch_wan_bmp = <ESS_PORT2>; /* wan port bitmap */
-       switch_mac_mode = <MAC_MODE_PSGMII>; /* mac mode for uniphy instance0*/
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       ethernet = <&edma>;
+                       phy-mode = "internal";
+
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-       qcom,port_phyinfo {
-               port@2 {
-                       port_id = <2>;
-                       phy_address = <1>;
+               swport2: port@2 {
+                       reg = <2>;
+                       phy-handle = <&qca8075_1>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 1>;
                };
 
-               port@3 {
-                       port_id = <3>;
-                       phy_address = <2>;
+               swport3: port@3 {
+                       reg = <3>;
+                       phy-handle = <&qca8075_2>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 2>;
                };
 
-               port@4 {
-                       port_id = <4>;
-                       phy_address = <3>;
+               swport4: port@4 {
+                       reg = <4>;
+                       phy-handle = <&qca8075_3>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 3>;
                };
 
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
+               swport5: port@5 {
+                       reg = <5>;
+                       phy-handle = <&qca8075_4>;
+                       phy-mode = "psgmii";
+                       pcs-handle = <&uniphy0 4>;
                };
        };
 };
index 2bd3dab6343f905f3567406d676c4a6771379c7a..dde9c381318de8454588f5f3b433c7c566ca5541 100644 (file)
@@ -86,7 +86,7 @@ define Device/asus_rt-ax89x
        PAGESIZE := 2048
        DEVICE_DTS_CONFIG := config@hk01
        SOC := ipq8074
-       DEVICE_PACKAGES := kmod-hwmon-gpiofan ipq-wifi-asus_rt-ax89x
+       DEVICE_PACKAGES := kmod-hwmon-gpiofan kmod-sfp ipq-wifi-asus_rt-ax89x
        KERNEL_NAME := vmlinux
        KERNEL := kernel-bin | libdeflate-gzip
        KERNEL_IN_UBI := 1
index 62b05a7fc30c0bbfb0c2a00ad96b06c7b2e1be13..6fc8a8e51c38c02148c7972b9eda848ccb38b1f3 100644 (file)
@@ -1,5 +1,6 @@
 SUBTARGET:=ipq50xx
 BOARDNAME:=Qualcomm Atheros IPQ50xx
+DEFAULT_PACKAGES += kmod-qca-nss-dp
 
 define Target/Description
        Build firmware images for Qualcomm Atheros IPQ50xx based boards.
index 262468a0b2ff2470ae5ad851fc00735fd1ef3d76..0b3a10efe0c27f46c13e27feaca865b7689a9215 100644 (file)
@@ -4,8 +4,10 @@ CONFIG_MTD_SPLIT_FIT_FW=y
 CONFIG_PINCTRL_IPQ6018=y
 CONFIG_PWM=y
 CONFIG_PWM_IPQ=y
+CONFIG_QCOM_80211AX_PPE=y
 CONFIG_QCOM_APM=y
 # CONFIG_QCOM_CLK_SMD_RPM is not set
+CONFIG_QCOM_EDMA=y
 # CONFIG_QCOM_RPMPD is not set
 CONFIG_QCOM_SMD_RPM=y
 CONFIG_REGULATOR_CPR3=y
index 7c4f73d543557fc3e801a96b84cbfc2db8169cb9..9837d8744a95748974c6d5a52ccf30f267913d29 100644 (file)
@@ -16,8 +16,10 @@ CONFIG_PM_GENERIC_DOMAINS=y
 CONFIG_PM_GENERIC_DOMAINS_OF=y
 # CONFIG_POWER_RESET_QCOM_PON is not set
 CONFIG_QCA83XX_PHY=y
+CONFIG_QCOM_80211AX_PPE=y
 CONFIG_QCOM_APM=y
 # CONFIG_QCOM_COINCELL is not set
+CONFIG_QCOM_EDMA=y
 CONFIG_QCOM_GDSC=y
 CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_QCOM_SPMI_RRADC is not set