Merge "ipq5332: Update reset seq & MDIO clk for MHT"

This commit is contained in:
Linux Build Service Account 2022-11-26 07:01:38 -08:00 committed by Gerrit - the friendly Code Review server
commit 6c139c94d7
5 changed files with 14 additions and 2 deletions

View file

@ -180,7 +180,7 @@
ess-switch {
switch_mac_mode0 = <PORT_WRAPPER_SGMII_PLUS>;
switch_mac_mode1 = <PORT_WRAPPER_10GBASE_R>;
qca808x_gpio = <16>;
qca808x_gpio = <51>;
qca808x_gpio_cnt = <1>;
mdc_mdio_gpio = <27 28>;
qca8084_switch_enable = <1>;

View file

@ -165,7 +165,7 @@
ess-switch {
switch_mac_mode0 = <PORT_WRAPPER_SGMII_PLUS>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
qca808x_gpio = <16>;
qca808x_gpio = <51>;
qca808x_gpio_cnt = <1>;
mdc_mdio_gpio = <27 28>;
napa_gpio = <22>;

View file

@ -173,6 +173,7 @@
#define NSS_CC_PORT1_RX_CBCR 0x39B00480
#define NSS_CC_UNIPHY_PORT1_RX_CBCR 0x39B004B4
#define MDIO_50MHZ_CLK_BASE 0x7a00610
#define GCC_USB_BCR 0x182C000
#define GCC_USB0_MASTER_CMD_RCGR 0x182C004

View file

@ -489,6 +489,16 @@ void mdio_clock_init(void)
/* MDIO Master Clock init */
reg_val = readl(GCC_MDIO_MASTER_AHB_CBCR);
writel(reg_val | GCC_CBCR_CLK_ENABLE, GCC_MDIO_MASTER_AHB_CBCR);
/* Enable 50MHZ */
reg_val = readl(MDIO_50MHZ_CLK_BASE);
reg_val |= BIT(0);
writel(reg_val, MDIO_50MHZ_CLK_BASE);
reg_val = readl(MDIO_50MHZ_CLK_BASE + 0x10000);
reg_val |= BIT(0);
writel(reg_val, MDIO_50MHZ_CLK_BASE + 0x10000);
}

View file

@ -911,6 +911,7 @@ void qca808x_phy_reset_init(void)
qca808x_gpio_base = (unsigned int *)GPIO_CONFIG_ADDR(qca808x_gpio[i]);
cfg = GPIO_OE | GPIO_DRV_8_MA | GPIO_PULL_UP;
writel(cfg, qca808x_gpio_base);
gpio_set_value(qca808x_gpio[i], 0x0);
}
}
}