From 8f29e36963e799c7aa5362bb5ad4c303890dc1c3 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Fri, 18 Sep 2020 22:31:59 +0900 Subject: [PATCH] ipq40xx: improve support for Edgecore ECW5211 This adds several stylistic and functional improvements of the recently added Edgecore ECW5211, especially: * Drop the local BDFs as those are already in the upstream under different names * Add SPDX tag to DTS * Add label MAC address * Move LED trigger to DTS * Remove unnecessary status="okay" * Disable unused SS USB phy as the USB port only supports USB 2.0 * Make uboot-env partition writable * Remove qcom,poll_required_dynamic property as the driver does not use it * Tidy up the device recipe Fixes: 4488b260a02e ("ipq40xx: add Edgecore ECW5211 support") Signed-off-by: Sungbo Eo Acked-by: Robert Marko --- package/firmware/ipq-wifi/Makefile | 2 - .../ipq-wifi/board-edgecore_ecw5211.qca4019 | Bin 24324 -> 0 bytes .../ipq40xx/base-files/etc/board.d/01_leds | 11 ++-- .../arm/boot/dts/qcom-ipq4018-ecw5211.dts | 52 +++++++++--------- target/linux/ipq40xx/image/Makefile | 8 +-- 5 files changed, 34 insertions(+), 39 deletions(-) delete mode 100644 package/firmware/ipq-wifi/board-edgecore_ecw5211.qca4019 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index 39e22b50d3..9aa6852046 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -31,7 +31,6 @@ ALLWIFIBOARDS:= \ buffalo_wtr-m2133hp \ cellc_rtl30vw \ dlink_dap2610 \ - edgecore_ecw5211 \ edgecore_ecw5410 \ edgecore_oap100 \ engenius_eap2200 \ @@ -110,7 +109,6 @@ $(eval $(call generate-ipq-wifi-package,avm_fritzrepeater-1200,AVM FRITZRepeater $(eval $(call generate-ipq-wifi-package,buffalo_wtr-m2133hp,Buffalo WTR-M2133HP)) $(eval $(call generate-ipq-wifi-package,cellc_rtl30vw, Cell C RTL30VW)) $(eval $(call generate-ipq-wifi-package,dlink_dap2610,D-Link DAP-2610)) -$(eval $(call generate-ipq-wifi-package,edgecore_ecw5211,Edgecore ECW5211)) $(eval $(call generate-ipq-wifi-package,edgecore_ecw5410,Edgecore ECW5410)) $(eval $(call generate-ipq-wifi-package,edgecore_oap100,Edgecore OAP100)) $(eval $(call generate-ipq-wifi-package,engenius_eap2200,EnGenius EAP2200)) diff --git a/package/firmware/ipq-wifi/board-edgecore_ecw5211.qca4019 b/package/firmware/ipq-wifi/board-edgecore_ecw5211.qca4019 deleted file mode 100644 index 340cfcc7a20cb88ed6fca7369b380a3d341f76ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24324 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 H5%T{5!-kmb diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds index 8a87b68532..3e0f3ab258 100755 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds @@ -26,12 +26,6 @@ avm,fritzbox-7530 |\ glinet,gl-b1300) ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt" ;; -edgecore,ecw5211 |\ -zyxel,nbg6617 |\ -zyxel,wre6606) - ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy1tpt" - ;; edgecore,oap100) ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt" ucidef_set_led_wlan "wlan5g" "WLAN5G" "blue:wlan5g" "phy1tpt" @@ -67,6 +61,11 @@ qxwlan,e2600ac-c2) ucidef_set_led_wlan "wlan2g" "WLAN0" "green:wlan0" "phy0tpt" ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt" ;; +zyxel,nbg6617 |\ +zyxel,wre6606) + ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt" + ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy1tpt" + ;; esac board_config_flush diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts index 244dfac750..0ee8d1a52e 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + #include "qcom-ipq4019.dtsi" #include #include @@ -12,6 +14,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; + label-mac-device = &gmac0; }; chosen { @@ -39,11 +42,13 @@ wlan2g { label = "green:wlan2g"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy0tpt"; }; wlan5g { label = "green:wlan5g"; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy1tpt"; }; }; @@ -52,13 +57,6 @@ status = "okay"; }; - mdio@90000 { - status = "okay"; - - pinctrl-0 = <&mdio_pins>; - pinctrl-names = "default"; - }; - ess-psgmii@98000 { status = "okay"; }; @@ -75,8 +73,6 @@ }; tcsr@194b000 { - status = "okay"; - compatible = "qcom,tcsr"; reg = <0x194b000 0x100>; qcom,usb-hsphy-mode-select = ; @@ -94,12 +90,17 @@ qcom,wifi_noc_memtype_m0_m2 = ; }; - usb2: usb2@60f8800 { + usb2@60f8800 { status = "okay"; }; - usb3: usb3@8af8800 { + usb3@8af8800 { status = "okay"; + + dwc3@8a00000 { + phys = <&usb3_hs_phy>; + phy-names = "usb2-phy"; + }; }; crypto@8e3a000 { @@ -112,6 +113,9 @@ ess-switch@c000000 { status = "okay"; + + switch_lan_bmp = <0x10>; + switch_wan_bmp = <0x20>; }; edma@c080000 { @@ -182,8 +186,6 @@ cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>, <&tlmm 4 GPIO_ACTIVE_HIGH>; flash@0 { - status = "okay"; - compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <24000000>; @@ -224,9 +226,8 @@ }; partition@e0000 { - label = "0:APPSBLENV"; /* uboot env*/ + label = "0:APPSBLENV"; /* uboot env */ reg = <0x000e0000 0x00010000>; - read-only; }; partition@f0000 { @@ -243,9 +244,7 @@ }; }; - spi-nand@1 { - status = "okay"; - + flash@1 { compatible = "spi-nand"; reg = <1>; spi-max-frequency = <24000000>; @@ -286,34 +285,33 @@ status = "okay"; }; +&mdio { + status = "okay"; + + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; +}; + &gmac0 { qcom,poll_required = <1>; - qcom,poll_required_dynamic = <1>; qcom,phy_mdio_addr = <4>; vlan_tag = <2 0x20>; }; &gmac1 { qcom,poll_required = <1>; - qcom,poll_required_dynamic = <1>; qcom,phy_mdio_addr = <3>; vlan_tag = <1 0x10>; }; &wifi0 { status = "okay"; - - qcom,ath10k-calibration-variant = "Edgecore-ECW5211"; }; &wifi1 { status = "okay"; - qcom,ath10k-calibration-variant = "Edgecore-ECW5211"; -}; - -&usb3_ss_phy { - status = "okay"; + qcom,ath10k-calibration-variant = "ALFA-Network-AP120C-AC"; }; &usb3_hs_phy { diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index 6e5620a140..142896bde8 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -347,12 +347,12 @@ TARGET_DEVICES += dlink_dap-2610 define Device/edgecore_ecw5211 $(call Device/FitImage) $(call Device/UbiFit) - DEVICE_TITLE := Edgecore ECW5211 + DEVICE_VENDOR := Edgecore + DEVICE_MODEL := ECW5211 + SOC := qcom-ipq4018 BLOCKSIZE := 128k PAGESIZE := 2048 - DEVICE_DTS_CONFIG := config@ap.dk01.1-c2 - DEVICE_DTS := qcom-ipq4018-ecw5211 - DEVICE_PACKAGES := ipq-wifi-edgecore_ecw5211 kmod-tpm-i2c-atmel kmod-usb-acm uboot-envtools + DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-usb-acm uboot-envtools endef TARGET_DEVICES += edgecore_ecw5211 -- 2.30.2