Merge "[Feature][ZXW-220][POWER]add gmac power off to sleep AT"
diff --git a/boot/common/src/uboot/drivers/peripheral/peripheral.c b/boot/common/src/uboot/drivers/peripheral/peripheral.c
index 3646130..be5825f 100755
--- a/boot/common/src/uboot/drivers/peripheral/peripheral.c
+++ b/boot/common/src/uboot/drivers/peripheral/peripheral.c
@@ -34,9 +34,6 @@
 ****************************************************************************/

 #define SD1_IO_1V8_EN	0x13c830

 #define REG32(x)			    (*(volatile u32*)(x))

-//xf.li@20230412 add for enable GNSS start

-#define ZX_TOP_CRM_BASE	0x0013B000

-//xf.li@20230412 add for enable GNSS end

 /****************************************************************************

 *											   Local Types

 ****************************************************************************/

@@ -83,8 +80,6 @@
 	

 	REG32(SD1_IO_1V8_EN) |=(1<<1);

 //xf.li@20230412 add for enable GNSS start

-	REG32(ZX_TOP_CRM_BASE + 0x34) |= (0x1<<5);

-	zDrvGpio_SetFunc(GPIO15,GPIO15_CLK_OUT0);

 	/*关闭gps电源*/

 	zDrvGpio_SetFunc(GPIO86, GPIO86_GPIO86);

 	zDrvGpio_SetDirection(GPIO86, GPIO_OUT);

diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/net/ethernet/zte/zx29_gmac.c b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/net/ethernet/zte/zx29_gmac.c
index 650be94..7bc3ed0 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/net/ethernet/zte/zx29_gmac.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/net/ethernet/zte/zx29_gmac.c
@@ -1447,7 +1447,7 @@
     

     prv->gpio_power[0] = of_get_gpio_flags(pdev->dev.of_node, 0, &flags);

 	ret = gpio_request(prv->gpio_power[0], "gmac_power"); /* gpio 83/124 */

-	//gpio_direction_output(prv->gpio_power[0], 1);jb.qi add for gmac power off defaultly

+	gpio_direction_output(prv->gpio_power[0], 1);

 	mdelay(15);

 #ifdef _USE_VEHICLE_DC_REF

 	prv->gpio_power[1] = of_get_gpio_flags(pdev->dev.of_node, 1, &flags);