From 90f9cecea9d58346dff00ca02667b464df5a8ba6 Mon Sep 17 00:00:00 2001 From: Ken Date: Wed, 9 Apr 2025 13:19:42 +0800 Subject: [PATCH] WIFI-14456 CIG WiFi7 WF-189W/H bring up Signed-off-by: Ken --- .../ipq53xx/base-files/etc/board.d/01_leds | 3 + .../ipq53xx/base-files/etc/board.d/02_network | 5 +- .../ipq53xx/dts/ipq5332-cig-wf189w.dts | 97 ++++++++++--------- ...8385-Maximum-support-for-4096-VLAN-s.patch | 25 +++++ feeds/ucentral/ucentral-schema/Makefile | 3 +- 5 files changed, 79 insertions(+), 54 deletions(-) create mode 100644 feeds/qca-wifi-7/qca-ssdk-qca/patches/0005-qca-ssdk-Fix-QCA8385-Maximum-support-for-4096-VLAN-s.patch diff --git a/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/01_leds b/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/01_leds index 7434964c0..e877479cf 100755 --- a/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/01_leds +++ b/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/01_leds @@ -14,6 +14,9 @@ sercomm,ap72tip) sonicfi,rap7110c-341x) ucidef_set_led_default "power" "POWER" "pwm:blue" "on" ;; +cig,wf189w) + ucidef_set_led_default "power" "POWER" "pwm:blue" "on" + ;; esac board_config_flush diff --git a/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network b/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network index 9b4f56156..1a922e7ad 100755 --- a/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network +++ b/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network @@ -22,10 +22,7 @@ ipq53xx_setup_interfaces() ucidef_set_interfaces_lan_wan "" "eth0" ;; cig,wf189w) - ucidef_add_switch "switch1" - ucidef_add_switch_attr "switch1" "enable" "false" - ucidef_add_switch_attr "switch1" "reset" "false" - ucidef_add_switch "switch1" "5u@eth0" "1:lan" "2:lan" "3:lan" "4:wan" "0u@eth1" + ucidef_add_switch "switch1" "5u@eth0" "3:lan" "2:lan" "1:lan" "4:wan" "0u@eth1" ;; esac } diff --git a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189w.dts b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189w.dts index 6db6a7c6b..33bf479df 100644 --- a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189w.dts +++ b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189w.dts @@ -166,6 +166,10 @@ serial1 = &blsp1_uart1; ethernet0 = "/soc/dp1"; ethernet1 = "/soc/dp2"; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; chosen { @@ -254,28 +258,28 @@ }; }; - leds { - compatible = "gpio-leds"; - pinctrl-0 = <&gpio_leds_default>; - pinctrl-names = "default"; + pwmleds { + compatible = "pwm-leds"; - led@29 { - label = "led_r"; - gpios = <&tlmm 29 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "led_r"; - default-state = "off"; + red { + label = "pwm:red"; + pwms = <&pwm 3 1250000>; + max-brightness = <160>; + linux,default-trigger = "none"; }; - led@30 { - label = "led_g"; - gpios = <&tlmm 30 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "led_g"; - default-state = "off"; + + green { + label = "pwm:green"; + pwms = <&pwm 2 1250000>; + max-brightness = <160>; + linux,default-trigger = "none"; }; - led@31 { - label = "led_b"; - gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "led_b"; - default-state = "off"; + + led_power: blue { + label = "pwm:blue"; + pwms = <&pwm 1 1250000>; + max-brightness = <160>; + linux,default-trigger = "none"; }; }; @@ -644,6 +648,27 @@ }; }; + pwm_pins: pwm_pinmux { + /* PWM LED GREEN */ + mux_1 { + pins = "gpio30"; + function = "pwm1"; + drive-strength = <8>; + }; + /* PWM LED BLUE */ + mux_2 { + pins = "gpio31"; + function = "pwm1"; + drive-strength = <8>; + }; + /* PWM LED RED */ + mux_3 { + pins = "gpio29"; + function = "pwm1"; + drive-strength = <8>; + }; + }; + serial_1_pins: serial1-pinmux { pins = "gpio33", "gpio34", "gpio35", "gpio36"; function = "blsp1_uart2"; @@ -651,26 +676,6 @@ bias-pull-up; }; - gpio_leds_default: gpio-leds-default-state { - led_r { - pins = "gpio29"; - function = "gpio"; - drive-strength = <8>; - bias-pull-down; - }; - led_g { - pins = "gpio30"; - function = "gpio"; - drive-strength = <8>; - bias-pull-down; - }; - led_b { - pins = "gpio31"; - function = "gpio"; - drive-strength = <8>; - bias-pull-down; - }; - }; button_pins: button-state { pins = "gpio21"; @@ -713,15 +718,11 @@ status = "okay"; }; -&usb3 { - qcom,select-utmi-as-pipe-clk; - status = "okay"; - - dwc3@8a00000 { - /delete-property/ #phy-cells; - /delete-property/ phys; - /delete-property/ phy-names; - }; +&pwm { + pinctrl-0 = <&pwm_pins>; + used-pwm-indices = <1>, <1>, <0>, <1>; + pinctrl-names = "default"; + status = "okay"; }; &hs_m31phy_0 { diff --git a/feeds/qca-wifi-7/qca-ssdk-qca/patches/0005-qca-ssdk-Fix-QCA8385-Maximum-support-for-4096-VLAN-s.patch b/feeds/qca-wifi-7/qca-ssdk-qca/patches/0005-qca-ssdk-Fix-QCA8385-Maximum-support-for-4096-VLAN-s.patch new file mode 100644 index 000000000..15daa54df --- /dev/null +++ b/feeds/qca-wifi-7/qca-ssdk-qca/patches/0005-qca-ssdk-Fix-QCA8385-Maximum-support-for-4096-VLAN-s.patch @@ -0,0 +1,25 @@ +From 41861d8524e61b1c350f00c67e0ca8534b73d033 Mon Sep 17 00:00:00 2001 +From: huangyunxiang +Date: Wed, 9 Apr 2025 10:03:52 +0800 +Subject: [PATCH] qca-ssdk:Fix QCA8385 Maximum support for 4096 VLAN settings + +--- + include/init/ssdk_plat.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/init/ssdk_plat.h b/init/ssdk_plat.h +index 414918a5bd..92596477af 100644 +--- a/include/init/ssdk_plat.h ++++ b/include/init/ssdk_plat.h +@@ -174,7 +174,7 @@ + #define AR8327_NUM_PHYS 5 + #define AR8327_PORT_CPU 0 + #define AR8327_NUM_PORTS 7 +-#define AR8327_MAX_VLANS 128 ++#define AR8327_MAX_VLANS 4096 + + #define MII_PHYADDR_C45 (1<<30) + +-- +2.34.1 + diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile index 9fb5993b2..3947a3cac 100644 --- a/feeds/ucentral/ucentral-schema/Makefile +++ b/feeds/ucentral/ucentral-schema/Makefile @@ -4,10 +4,9 @@ PKG_NAME:=ucentral-schema PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git -PKG_MIRROR_HASH:=2d824a49bcb7e62f99061d201e8745124ee733f2473bd2c569fb69dfcdf6ab47 PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2025-01-27 -PKG_SOURCE_VERSION:=0683d041e48c0057f4b2d4fbeeebb6f475b6ecad +PKG_SOURCE_VERSION:=e88d964280e03d543eb7d16e4762d43794da7637 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=BSD-3-Clause