From e5bbf8b65ca43b859690582d58bc47845f90bd15 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 14 Jun 2021 17:42:18 +0200 Subject: [PATCH] ucentral: development update * eth and wifi leds were not working as expected on eap101 Signed-off-by: John Crispin --- ...x-add-the-Qualcomm-AX-target-support.patch | 66 +++++++++++++------ 1 file changed, 45 insertions(+), 21 deletions(-) diff --git a/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch b/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch index 2973a0080..7466e7890 100644 --- a/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch +++ b/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch @@ -1,4 +1,4 @@ -From 532b362a4914e495fd76ca4e6049a7954a36673b Mon Sep 17 00:00:00 2001 +From 7890393e2bb05b5d9e9cf351642b99585b068a13 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 18 Jul 2020 08:53:44 +0200 Subject: [PATCH 01/14] ipq807x: add the Qualcomm AX target support @@ -12,7 +12,7 @@ Signed-off-by: John Crispin .../etc/hotplug.d/firmware/11-ath10k-caldata | 5 + target/linux/ipq807x/109-logspam.patch | 24 + target/linux/ipq807x/Makefile | 22 + - .../ipq807x/base-files/etc/board.d/01_leds | 29 + + .../ipq807x/base-files/etc/board.d/01_leds | 35 + .../ipq807x/base-files/etc/board.d/02_network | 77 + .../etc/hotplug.d/firmware/10-ath11k-caldata | 97 ++ .../ipq807x/base-files/etc/init.d/aq_phy | 15 + @@ -48,12 +48,12 @@ Signed-off-by: John Crispin .../ipq807x/patches/103-sercomm-wallaby.patch | 816 +++++++++ target/linux/ipq807x/patches/104-wf194c.patch | 816 +++++++++ .../patches/105-fix-dtc-gcc10-build.patch | 11 + - target/linux/ipq807x/patches/106-eap101.patch | 975 +++++++++++ + target/linux/ipq807x/patches/106-eap101.patch | 993 +++++++++++ .../ipq807x/patches/107-ed2-compile.patch | 12 + .../linux/ipq807x/patches/108-log-spam.patch | 37 + target/linux/ipq807x/patches/109-tplink.patch | 1518 +++++++++++++++++ .../ipq807x/patches/110-add-esmt-nand.patch | 37 + - 48 files changed, 9314 insertions(+), 3 deletions(-) + 48 files changed, 9338 insertions(+), 3 deletions(-) create mode 100644 package/boot/uboot-envtools/files/ipq807x create mode 100644 target/linux/ipq807x/109-logspam.patch create mode 100644 target/linux/ipq807x/Makefile @@ -187,10 +187,10 @@ index 0000000000..6c429f1852 + +exit 0 diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh -index 9993bc9047..fa3070a7e3 100644 +index 399352aa89..03f073d223 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh -@@ -356,8 +356,8 @@ hostapd_set_vlan_file() { +@@ -364,8 +364,8 @@ hostapd_set_vlan_file() { local ifname="$1" local vlan="$2" json_get_vars name vid @@ -277,10 +277,10 @@ index 0000000000..66031ace35 +$(eval $(call BuildTarget)) diff --git a/target/linux/ipq807x/base-files/etc/board.d/01_leds b/target/linux/ipq807x/base-files/etc/board.d/01_leds new file mode 100755 -index 0000000000..39f4c941c0 +index 0000000000..60a3ccdc52 --- /dev/null +++ b/target/linux/ipq807x/base-files/etc/board.d/01_leds -@@ -0,0 +1,29 @@ +@@ -0,0 +1,35 @@ +#!/bin/sh + +. /lib/functions/uci-defaults.sh @@ -300,7 +300,13 @@ index 0000000000..39f4c941c0 + +case "$board" in +cig,wf188n|\ -+edgecore,eap101|\ ++edgecore,eap101) ++ ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wifi5" "phy0tx" ++ ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wifi2" "phy1tx" ++ ucidef_set_led_netdev "lan1" "lan1" "green:lan1" "eth1" ++ ucidef_set_led_netdev "lan2" "lan2" "green:lan2" "eth2" ++ ucidef_set_led_netdev "poe" "poe" "green:wan" "eth0" ++ ;; +edgecore,eap102) + ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wifi5" "phy0tx" + ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wifi2" "phy1tx" @@ -11297,14 +11303,14 @@ index 0000000000..f91601ec59 + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ diff --git a/target/linux/ipq807x/patches/106-eap101.patch b/target/linux/ipq807x/patches/106-eap101.patch new file mode 100644 -index 0000000000..6b0eb2f831 +index 0000000000..228dadb611 --- /dev/null +++ b/target/linux/ipq807x/patches/106-eap101.patch -@@ -0,0 +1,975 @@ -+Index: linux-4.4.60-qsdk-ad8f8efb2edcd35cdb130466cfc1923c37ef7ec1/arch/arm64/boot/dts/qcom/qcom-ipq6018-cp01-edgecore.dtsi +@@ -0,0 +1,993 @@ ++Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq6018-cp01-edgecore.dtsi +=================================================================== +--- /dev/null -++++ linux-4.4.60-qsdk-ad8f8efb2edcd35cdb130466cfc1923c37ef7ec1/arch/arm64/boot/dts/qcom/qcom-ipq6018-cp01-edgecore.dtsi +++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq6018-cp01-edgecore.dtsi +@@ -0,0 +1,542 @@ ++/* ++ * Copyright (c) 2019, The Linux Foundation. All rights reserved. @@ -11848,11 +11854,11 @@ index 0000000000..6b0eb2f831 ++&qpic_lcd_panel { ++ status = "ok"; ++}; -+Index: linux-4.4.60-qsdk-ad8f8efb2edcd35cdb130466cfc1923c37ef7ec1/arch/arm64/boot/dts/qcom/qcom-ipq6018-edgecore-eap101.dts ++Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq6018-edgecore-eap101.dts +=================================================================== +--- /dev/null -++++ linux-4.4.60-qsdk-ad8f8efb2edcd35cdb130466cfc1923c37ef7ec1/arch/arm64/boot/dts/qcom/qcom-ipq6018-edgecore-eap101.dts -+@@ -0,0 +1,423 @@ +++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq6018-edgecore-eap101.dts ++@@ -0,0 +1,441 @@ ++/dts-v1/; ++/* ++ * Copyright (c) 2019, The Linux Foundation. All rights reserved. @@ -12192,23 +12198,41 @@ index 0000000000..6b0eb2f831 ++ pinctrl-names = "default"; ++ ++ led@25 { -++ label = "wifi5g"; -++ gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>; +++ label = "green:wifi5"; +++ gpios = <&tlmm 35 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "wf188:green:5g"; ++ default-state = "off"; ++ }; ++ led@24 { -++ label = "wifi2g"; -++ gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>; +++ label = "green:wifi2"; +++ gpios = <&tlmm 37 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "wf188:green:2g"; ++ default-state = "off"; ++ }; ++ led_power: led@16 { -++ label = "led_pwr"; +++ label = "green:led_pwr"; ++ gpios = <&tlmm 74 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "green:power"; ++ default-state = "off"; ++ }; +++ led@61 { +++ label = "green:lan1"; +++ gpios = <&tlmm 61 GPIO_ACTIVE_HIGH>; +++ linux,default-trigger = "green:power"; +++ default-state = "off"; +++ }; +++ led@62 { +++ label = "green:wan"; +++ gpios = <&tlmm 62 GPIO_ACTIVE_HIGH>; +++ linux,default-trigger = "green:power"; +++ default-state = "off"; +++ }; +++ led@63 { +++ label = "green:lan2"; +++ gpios = <&tlmm 63 GPIO_ACTIVE_HIGH>; +++ linux,default-trigger = "green:power"; +++ default-state = "off"; +++ }; ++ }; ++}; ++