ipq40xx: correct 'disable default vlan tagging'

The essedma driver was disable default vlan tagging.
This commit is contained in:
AmadeusGhost 2020-02-27 08:51:12 +08:00
parent 67fa77866b
commit 4d6a354e86
6 changed files with 14 additions and 49 deletions

View File

@ -12,7 +12,7 @@ boardname="${board##*,}"
case "$board" in
alfa-network,ap120c-ac)
ucidef_set_led_netdev "wan" "WAN" "${boardname}:amber:wan" "eth1"
ucidef_set_led_switch "wan" "WAN" "${boardname}:amber:wan" "switch0" "0x20"
;;
asus,rt-ac58u)
ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:blue:wlan2G" "phy0tpt"
@ -32,7 +32,7 @@ asus,rt-acrh17)
;;
avm,fritzbox-4040)
ucidef_set_led_wlan "wlan" "WLAN" "fritz4040:green:wlan" "phy0tpt" "phy1tpt"
ucidef_set_led_netdev "wan" "WAN" "fritz4040:green:wan" "eth1"
ucidef_set_led_switch "wan" "WAN" "fritz4040:green:wan" "switch0" "0x20"
ucidef_set_led_switch "lan" "LAN" "fritz4040:green:lan" "switch0" "0x1e"
;;
avm,fritzbox-7530 |\
@ -40,7 +40,7 @@ glinet,gl-b1300)
ucidef_set_led_wlan "wlan" "WLAN" "${boardname}:green:wlan" "phy0tpt"
;;
engenius,eap1300)
ucidef_set_led_netdev "lan" "LAN" "${boardname}:blue:lan" "eth0"
ucidef_set_led_switch "lan" "LAN" "${boardname}:blue:lan" "switch0" "0x20"
ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:blue:wlan2g" "phy0tpt"
ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:yellow:wlan5g" "phy1tpt"
ucidef_set_led_default "mesh" "MESH" "${boardname}:blue:mesh" "0"
@ -48,8 +48,8 @@ engenius,eap1300)
engenius,ens620ext)
ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:green:wlan2G" "phy0tpt"
ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:green:wlan5G" "phy1tpt"
ucidef_set_led_netdev "lan1" "LAN1" "${boardname}:green:lan1" "eth0"
ucidef_set_led_netdev "lan2" "LAN2" "${boardname}:green:lan2" "eth1"
ucidef_set_led_switch "lan1" "LAN1" "${boardname}:green:lan1" "switch0" "0x10"
ucidef_set_led_switch "lan2" "LAN2" "${boardname}:green:lan2" "switch0" "0x20"
;;
hugo,ac1200)
ucidef_set_led_default "green" "GREEN" "${boardname}:green:ctrl1" "1"

View File

@ -144,6 +144,7 @@
drive-strength = <12>;
bias-disable;
};
pin_cs {
function = "gpio";
pins = "gpio54";
@ -185,19 +186,7 @@
};
&gmac0 {
qcom,phy_mdio_addr = <4>;
qcom,poll_required = <1>;
qcom,forced_speed = <1000>;
qcom,forced_duplex = <1>;
vlan_tag = <2 0x20>;
};
&gmac1 {
qcom,phy_mdio_addr = <3>;
qcom,poll_required = <1>;
qcom,forced_speed = <1000>;
qcom,forced_duplex = <1>;
vlan_tag = <1 0x10>;
vlan_tag = <1 0x31>;
};
&usb2_hs_phy {

View File

@ -261,19 +261,7 @@
};
&gmac0 {
qcom,forced_duplex = <1>;
qcom,forced_speed = <1000>;
qcom,phy_mdio_addr = <3>;
qcom,poll_required = <1>;
vlan_tag = <1 0x10>;
};
&gmac1 {
qcom,forced_duplex = <1>;
qcom,forced_speed = <1000>;
qcom,phy_mdio_addr = <4>;
qcom,poll_required = <1>;
vlan_tag = <2 0x20>;
vlan_tag = <1 0x31>;
};
&tlmm {

View File

@ -196,11 +196,7 @@
};
&gmac0 {
qcom,phy_mdio_addr = <3>;
qcom,poll_required = <1>;
qcom,forced_speed = <1000>;
qcom,forced_duplex = <1>;
vlan_tag = <1 0x10>;
vlan_tag = <1 0x31>;
};
&usb2_hs_phy {

View File

@ -241,19 +241,7 @@
};
&gmac0 {
qcom,phy_mdio_addr = <4>;
qcom,poll_required = <1>;
qcom,forced_speed = <1000>;
qcom,forced_duplex = <1>;
vlan_tag = <2 0x20>;
};
&gmac1 {
qcom,phy_mdio_addr = <3>;
qcom,poll_required = <1>;
qcom,forced_speed = <1000>;
qcom,forced_duplex = <1>;
vlan_tag = <1 0x10>;
vlan_tag = <1 0x31>;
};
&usb3_ss_phy {

View File

@ -258,6 +258,10 @@
};
};
&gmac0 {
vlan_tag = <1 0x39>;
};
&usb2_hs_phy {
status = "okay";
};