mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-07 17:57:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "ipq5332: net: qca8337: skip vlan configuration"

Browse source
This commit is contained in:
Linux Build Service Account 2023-01-06 08:47:33 -08:00 • committed by Gerrit - the friendly Code Review server
commit 5df9330702
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/dts/ipq5332-mi03.1.dts
View file

@ -115,6 +115,7 @@
mac_pwr = <0xaa545>;
port_count = <3>;
update = <1>;
skip_vlan = <1>;
pad0_mode = <0x80>;
pad5_mode = <0>;
pad6_mode = <0>;

2
drivers/net/ipq5332/ipq5332_edma.c
View file

@ -1778,6 +1778,8 @@ int ipq5332_edma_init(void *edma_board_cfg)
"/ess-switch/qca8337_swt_info");
s17c_swt_cfg.update = fdtdec_get_uint(gd->fdt_blob,
phy_node, "update", 0);
s17c_swt_cfg.skip_vlan = fdtdec_get_uint(gd->fdt_blob,
phy_node, "skip_vlan", 0);
s17c_swt_cfg.pad0_mode = fdtdec_get_uint(gd->fdt_blob,
phy_node, "pad0_mode", 0);
s17c_swt_cfg.pad5_mode = fdtdec_get_uint(gd->fdt_blob,

3
drivers/net/ipq_common/athrs17_phy.c
View file

@ -332,7 +332,8 @@ int ipq_athrs17_init(ipq_s17c_swt_cfg_t *swt_cfg)
if (ret != -1) {
athrs17_reg_init(swt_cfg);
athrs17_reg_init_lan(swt_cfg);
athrs17_vlan_config();
if (!(swt_cfg->skip_vlan))
athrs17_vlan_config();
printf ("S17c init done\n");
}

1
drivers/net/ipq_common/athrs17_phy.h
View file

@ -616,6 +616,7 @@ typedef struct {
int chip_detect;
u32 port_phy_address[S17C_MAX_PORT];
bool update;
bool skip_vlan;
u32 pad0_mode;
u32 pad5_mode;
u32 pad6_mode;