Merge "drivers: net: ipq: Use 16bit for phy_chip_id1 and phy_chip_id2"

This commit is contained in:
Linux Build Service Account 2023-07-14 23:10:20 -07:00 committed by Gerrit - the friendly Code Review server
commit 60f90b3b77
2 changed files with 4 additions and 2 deletions

View file

@ -1834,7 +1834,8 @@ int ipq5332_edma_init(void *edma_board_cfg)
ipq5332_edma_board_cfg_t ledma_cfg, *edma_cfg;
phy_info_t *phy_info;
int phy_id;
uint32_t phy_chip_id, phy_chip_id1, phy_chip_id2;
uint16_t phy_chip_id1 = 0, phy_chip_id2 = 0;
uint32_t phy_chip_id = 0;
int clk[4] = {0};
int qca8084_swt_enb = 0;
int qca8084_chip_detect = 0;

View file

@ -1950,7 +1950,8 @@ int ipq9574_edma_init(void *edma_board_cfg)
int ret = -1;
ipq9574_edma_board_cfg_t ledma_cfg, *edma_cfg;
int phy_id;
uint32_t phy_chip_id, phy_chip_id1, phy_chip_id2;
uint16_t phy_chip_id1 = 0, phy_chip_id2 = 0;
uint32_t phy_chip_id = 0;
#ifdef CONFIG_IPQ9574_QCA8075_PHY
static int sw_init_done = 0;
#endif