qualcommax: ipq60xx: unify eap6xx device trees

The EAP625 and EAP623 are extremely similar. The only difference in
the vendor's device tree is that EAP625 also enables USB and UART2.
Use the eap6xx dtsi instead of writing out a full devicetree.

The EAP623 uses the same RTL8211F as the 625 and 610. Since this is
a gigabit PHY, it is okay to change the ess mac mode from SGMII_PLUS
to SGMII. This is now consistent across all three devices.

Move the 'realtek,clkout-disable' and 'realtek,aldps-enable' PHY
properties to the common dtsi, as they work well on all three devices.

Reflect the remaining differences in the eap625 dts.

Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/18804
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/qualcommax/dts/ipq6018-tplink-eap6xx-outdoor.dtsi b/target/linux/qualcommax/dts/ipq6018-tplink-eap6xx-outdoor.dtsi
index cefdcde3114199c7e43a43f4098cad33ad4f66d6..9ab252ef378d8912c331ae780111315006f57009 100644 (file)
--- a/target/linux/qualcommax/dts/ipq6018-tplink-eap6xx-outdoor.dtsi
+++ b/target/linux/qualcommax/dts/ipq6018-tplink-eap6xx-outdoor.dtsi
@@ -115,6 +115,8 @@
 
        rtl8211f_4: ethernet-phy@4 {
                reg = <4>;
+               realtek,clkout-disable;
+               realtek,aldps-enable;
        };
 };
 

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-eap623-outdoor-hd-v1.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-eap623-outdoor-hd-v1.dts
index 3aaa32e827b784b965495cf35af51e9c3468a8d6..a474c2043fecc3ce71d26fd5c1a3ff2b9a746640 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-eap623-outdoor-hd-v1.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-eap623-outdoor-hd-v1.dts
@@ -3,145 +3,16 @@
 
 /dts-v1/;
 
-#include "ipq6018.dtsi"
-#include "ipq6018-cp-cpu.dtsi"
-#include "ipq6018-ess.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
+#include "ipq6018-tplink-eap6xx-outdoor.dtsi"
 
 / {
        model = "TP-Link EAP623-Outdoor HD V1.0";
        compatible = "tplink,eap623-outdoor-hd-v1", "qcom,ipq6018";
-
-       aliases {
-               serial0 = &blsp1_uart3;
-               led-boot = &led_sys_green;
-               led-failsafe = &led_sys_yellow;
-               led-running = &led_sys_green;
-               led-upgrade = &led_sys_yellow;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-               bootargs-append = " root=/dev/ubiblock0_1";
-       };
-
-       keys {
-               compatible = "gpio-keys";
-
-               reset {
-                       label = "reset";
-                       gpios = <&tlmm 9 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led_sys_green: led-0 {
-                       color = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_STATUS;
-                       gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
-               };
-
-               led_sys_yellow: led-1 {
-                       color = <LED_COLOR_ID_YELLOW>;
-                       function = LED_FUNCTION_STATUS;
-                       gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&blsp1_uart3 {
-       pinctrl-0 = <&serial_3_pins>;
-       pinctrl-names = "default";
-       status = "okay";
-};
-
-&tlmm {
-       mdio_pins: mdio-pins {
-               mdc {
-                       pins = "gpio64";
-                       function = "mdc";
-                       drive-strength = <8>;
-                       bias-pull-up;
-               };
-
-               mdio {
-                       pins = "gpio65";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-pull-up;
-               };
-       };
-
-       phy_pins: phy-reset-pin {
-               pins = "gpio77";
-               function = "gpio";
-               bias-pull-up;
-       };
 };
 
-&mdio {
-       status = "okay";
-       reset-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>;
-       reset-delay-us = <10000>;
-       reset-post-delay-us = <50000>;
-       pinctrl-0 = <&mdio_pins>, <&phy_pins>;
-       pinctrl-names = "default";
-
-       rtl8211f: ethernet-phy@4 {
-               reg = <4>;
-
-               realtek,clkout-disable;
-               realtek,aldps-enable;
-       };
-};
-
-&switch {
-       status = "okay";
-       switch_lan_bmp = <ESS_PORT5>; /* lan port bitmap */
-       switch_mac_mode1 = <MAC_MODE_SGMII_PLUS>; /* mac mode for uniphy instance0*/
-
-       qcom,port_phyinfo {
-               port@5 {
-                       port_id = <5>;
-                       phy_address = <4>;
-                       port_mac_sel = "QGMAC_PORT";
-               };
-       };
-};
-
-&edma {
-       status = "okay";
-};
-
-&dp5 {
-       status = "okay";
-       phy-handle = <&rtl8211f>;
-       phy-mode = "sgmii";
-       label = "lan";
-};
-
-&qpic_bam {
-       status = "okay";
-};
-
-&qpic_nand {
-       status = "okay";
-
-       nand@0 {
-               reg = <0>;
-               nand-ecc-strength = <4>;
-               nand-ecc-step-size = <512>;
-               nand-bus-width = <8>;
-
-               partitions {
-                       compatible = "qcom,smem-part";
-               };
-       };
+&led_sys_yellow {
+               function = LED_FUNCTION_STATUS;
+               gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
 };
 
 &wifi {