ipq40xx: WAC510: device-tree overhauling

removes usb-port remains as neither the WAC510 nor the WAC505
come with a USB port. Update the LED properties to phase out
labels and introduce generic node-names as well as adding
the color, function and function-enumerator properties.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
(cherry picked from commit 026fda10a5c45d56fd856628b6e9e69b95fd5e58)
This commit is contained in:
Christian Lamparter 2022-02-21 20:13:53 +01:00 committed by Daniel Golle
parent 3f16c329e2
commit f0c581f219
2 changed files with 33 additions and 40 deletions

View File

@ -10,6 +10,9 @@ engenius,ens620ext|\
zyxel,nbg6617) zyxel,nbg6617)
migrate_leds ":wlan2G=:wlan2g" ":wlan5G=:wlan5g" migrate_leds ":wlan2G=:wlan2g" ":wlan5G=:wlan5g"
;; ;;
netgear,wac510)
migrate_leds ":wlan2g=:wlan-0" ":wlan5g=:wlan-1" ":act=:activity"
;;
esac esac
remove_devicename_leds remove_devicename_leds

View File

@ -5,6 +5,7 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/soc/qcom,tcsr.h> #include <dt-bindings/soc/qcom,tcsr.h>
#include <dt-bindings/leds/common.h>
/ { / {
model = "Netgear WAC510"; model = "Netgear WAC510";
@ -42,14 +43,6 @@
qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>; qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
}; };
tcsr@194b000 {
status = "okay";
compatible = "qcom,tcsr";
reg = <0x194b000 0x100>;
qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
};
ess_tcsr@1953000 { ess_tcsr@1953000 {
compatible = "qcom,tcsr"; compatible = "qcom,tcsr";
reg = <0x1953000 0x1000>; reg = <0x1953000 0x1000>;
@ -62,14 +55,6 @@
qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>; qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
}; };
usb2: usb2@60f8800 {
status = "okay";
};
usb3: usb3@8af8800 {
status = "okay";
};
crypto@8e3a000 { crypto@8e3a000 {
status = "okay"; status = "okay";
}; };
@ -119,43 +104,60 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led_power_amber: power_amber { led_power_amber: led-0 {
label = "amber:power"; label = "amber:power";
color = <LED_COLOR_ID_AMBER>;
function = LED_FUNCTION_POWER;
gpios = <&ssr 6 GPIO_ACTIVE_LOW>; gpios = <&ssr 6 GPIO_ACTIVE_LOW>;
panic-indicator; panic-indicator;
}; };
led_power_green: power_green { led_power_green: led-1 {
label = "green:power"; label = "green:power";
color = <LED_COLOR_ID_AMBER>;
function = LED_FUNCTION_POWER;
gpios = <&ssr 5 GPIO_ACTIVE_LOW>; gpios = <&ssr 5 GPIO_ACTIVE_LOW>;
}; };
wlan2g_blue { led-2 {
label = "blue:wlan2g"; /* 2.4GHz blue - activity */
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_WLAN;
function-enumerator = <0>;
gpios = <&ssr 4 GPIO_ACTIVE_LOW>; gpios = <&ssr 4 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt"; linux,default-trigger = "phy0tpt";
}; };
wlan2g_green { led-3 {
label = "green:wlan2g"; /* 2.4GHz green - link */
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WLAN;
function-enumerator = <0>;
gpios = <&ssr 3 GPIO_ACTIVE_LOW>; gpios = <&ssr 3 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0radio"; linux,default-trigger = "phy0radio";
}; };
wlan5g_blue { led-4 {
label = "blue:wlan5g"; /* 5GHz blue - activity */
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_WLAN;
function-enumerator = <1>;
gpios = <&ssr 2 GPIO_ACTIVE_LOW>; gpios = <&ssr 2 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy1tpt"; linux,default-trigger = "phy1tpt";
}; };
wlan5g_green { led-5 {
label = "green:wlan5g"; /* 5GHz green - link */
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WLAN;
function-enumerator = <1>;
gpios = <&ssr 1 GPIO_ACTIVE_LOW>; gpios = <&ssr 1 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy1radio"; linux,default-trigger = "phy1radio";
}; };
act_green { led-6 {
label = "green:act"; color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_ACTIVITY;
gpios = <&ssr 0 GPIO_ACTIVE_LOW>; gpios = <&ssr 0 GPIO_ACTIVE_LOW>;
}; };
}; };
@ -378,15 +380,3 @@
mac-address-increment = <16>; mac-address-increment = <16>;
qcom,ath10k-calibration-variant = "Netgear-WAC510"; qcom,ath10k-calibration-variant = "Netgear-WAC510";
}; };
&usb3_ss_phy {
status = "okay";
};
&usb3_hs_phy {
status = "okay";
};
&usb2_hs_phy {
status = "okay";
};