ipq40xx: convert Aruba AP-303 AP-365 to DSA

diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index df5ef207a9a1f3e0cf473e174af1d8c2d718f1f0..4220fbcfc69a98fe6bd42cb58b43b6ce687decb4 100755 (executable)
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -19,8 +19,6 @@ ipq40xx_setup_interfaces()
        engenius,ens620ext)
                ucidef_set_interfaces_lan_wan "eth0" "eth1"
                ;;
-       aruba,ap-303|\
-       aruba,ap-365|\
        avm,fritzrepeater-1200|\
        dlink,dap-2610 |\
        engenius,eap1300|\
@@ -86,6 +84,8 @@ ipq40xx_setup_interfaces()
                        "0u@eth0" "3:lan:2" "4:lan:1"
                ucidef_set_interface_wan "eth1"
                ;;
+       aruba,ap-303|\
+       aruba,ap-365|\
        meraki,mr33)
                ucidef_set_interface_lan "lan"
                ;;

diff --git a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts
index 126d944ebb8de3973cb62248b4483634b18814f2..6000a8d71fa85337c62dfd9748f759ac0f8c0b47 100644 (file)
--- a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts
+++ b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts
@@ -12,6 +12,7 @@
                led-failsafe = &led_system_red;
                led-running = &led_system_green;
                led-upgrade = &led_system_red;
+               ethernet0 = &gmac;
        };
 
        leds {

diff --git a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts
index 07bb674520f667a6c871d6ba82fbb0a0dfe31e10..f0682b5b7c1b11c10c8b31d8e1019f12cdf66ae2 100644 (file)
--- a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts
+++ b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts
@@ -12,6 +12,7 @@
                led-failsafe = &led_system_red;
                led-running = &led_system_green;
                led-upgrade = &led_system_red;
+               ethernet0 = &gmac;
        };
 
        leds {

diff --git a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi
index 4d1d82a2726df643f7d65b99df15d9b7aa1e2fee..dbc896fb46b7c2d3cd17eec9ce54f3a0ad385336 100644 (file)
--- a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi
+++ b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi
@@ -16,32 +16,11 @@
                        status = "okay";
                };
 
-               mdio@90000 {
-                       status = "okay";
-                       pinctrl-0 = <&mdio_pins>;
-                       pinctrl-names = "default";
-
-                       /delete-node/ ethernet-phy@0;
-                       /delete-node/ ethernet-phy@2;
-                       /delete-node/ ethernet-phy@3;
-                       /delete-node/ ethernet-phy@4;
-
-                       ethernet-phy@5 {
-                               reg = <0x5>;
-                       };
-               };
-
                counter@4a1000 {
                        compatible = "qcom,qca-gcnt";
                        reg = <0x4a1000 0x4>;
                };
 
-               ess_tcsr@1953000 {
-                       compatible = "qcom,tcsr";
-                       reg = <0x1953000 0x1000>;
-                       qcom,ess-interface-select = <TCSR_ESS_PSGMII_RGMII5>;
-               };
-
                tcsr@1949000 {
                        compatible = "qcom,tcsr";
                        reg = <0x1949000 0x100>;
@@ -62,19 +41,6 @@
                        status = "okay";
                };
 
-               ess-switch@c000000 {
-                       switch_mac_mode = <0x3>; /* mac mode for RGMII RMII */
-                       switch_lan_bmp = <0x0>; /* lan port bitmap */
-                       switch_wan_bmp = <0x10>; /* wan port bitmap */
-               };
-
-               edma@c080000 {
-                       qcom,single-phy;
-                       qcom,num_gmac = <1>;
-                       phy-mode = "rgmii-id";
-                       status = "okay";
-               };
-
                i2c_0: i2c@78b7000 {
                        pinctrl-0 = <&i2c_0_pins>;
                        pinctrl-names = "default";
@@ -121,10 +87,34 @@
        status = "okay";
 };
 
-&gmac0 {
-       qcom,phy_mdio_addr = <5>;
-       qcom,poll_required = <1>;
-       vlan_tag = <0 0x20>;
+&mdio {
+       status = "okay";
+       pinctrl-0 = <&mdio_pins>;
+       pinctrl-names = "default";
+};
+
+&ess {
+       mac-mode = <0x3>; /* mac mode for RGMII RMII */
+       status = "okay";
+
+       ports {
+               /delete-node/ port@0;
+               /delete-node/ port@1;
+               /delete-node/ port@2;
+               /delete-node/ port@3;
+               /delete-node/ port@4;
+
+               port@5 {
+                       reg = <5>;
+                       phy-mode = "rgmii-id";
+                       phy-handle = <&ethphy1>;
+                       label = "lan";
+               };
+       };
+};
+
+&gmac {
+       status = "okay";
 };
 
 &qpic_bam {