Merge "[API-886][wifi]support DFS,add IFL change for DFS" into MR3.0-merge
diff --git a/src/kernel/linux/v4.19/drivers/net/phy/marvell-88q.c b/src/kernel/linux/v4.19/drivers/net/phy/marvell-88q.c
index 9010740..ab00fb0 100755
--- a/src/kernel/linux/v4.19/drivers/net/phy/marvell-88q.c
+++ b/src/kernel/linux/v4.19/drivers/net/phy/marvell-88q.c
@@ -232,6 +232,7 @@
{
//xf.li 2022/11/9 modify for API-647
printk("phy sleep start\n");
+ gpio_direction_output(205 + 268, 0);
gpio_direction_output(NAD_WAKEUP_PHY1, 0);
mdelay(1);//ensure do not wake up
//phy_write(phydev, MII_ADDR_C45 | 0x038022, 0x1);
@@ -255,13 +256,15 @@
if(if_suspend == 1)
{
printk("phy awake start\n");
+ gpio_direction_output(205 + 268, 1);
gpio_direction_output(PHY_POWER_SUPPLY, 1);
mdelay(1);
gpio_direction_output(NAD_WAKEUP_PHY1, 1);
- udelay(1100);
+ mdelay(1000);
gpio_direction_output(NAD_WAKEUP_PHY1, 0);
mdelay(1);
gpio_direction_output(NAD_RESET_PHY1, 1);
+ gpio_direction_output(205 + 268, 0);
mdelay(10);//at lest 4ms for reset phy
q2110_config_init(phydev);
if_suspend = 0;
diff --git a/src/kernel/linux/v4.19/drivers/net/phy/mdio_bus.c b/src/kernel/linux/v4.19/drivers/net/phy/mdio_bus.c
index c5588d4..5b1d466 100644
--- a/src/kernel/linux/v4.19/drivers/net/phy/mdio_bus.c
+++ b/src/kernel/linux/v4.19/drivers/net/phy/mdio_bus.c
@@ -384,7 +384,10 @@
}
mutex_init(&bus->mdio_lock);
-
+#ifdef PHY_DRIVER_GSW
+ gpio_direction_output(205 + 268, 1);
+ printk("----------INIT GPIO 205 END----------");
+#endif
/* de-assert bus level PHY GPIO reset */
gpiod = devm_gpiod_get_optional(&bus->dev, "reset", GPIOD_OUT_LOW);
if (IS_ERR(gpiod)) {