[Feature][ZXW-88]merge P50 version

Only Configure: No
Affected branch: master
Affected module: unknown
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No

Change-Id: I34667719d9e0e7e29e8e4368848601cde0a48408
diff --git a/boot/common/src/uboot/drivers/peripheral/Makefile b/boot/common/src/uboot/drivers/peripheral/Makefile
index 8ecd566..103b373 100755
--- a/boot/common/src/uboot/drivers/peripheral/Makefile
+++ b/boot/common/src/uboot/drivers/peripheral/Makefile
@@ -41,6 +41,7 @@
 COBJS-$(CONFIG_ZX297520V3E_UFI_MINI)	+= peripheral.o
 COBJS-$(CONFIG_ZX297520V3E_MDL_AB)	+= peripheral.o
 COBJS-$(CONFIG_ZX297520V3E_VEHICLE_DC)	+= peripheral.o
+COBJS-$(CONFIG_ZX297520V3E_VEHICLE_DC_REF)	+= peripheral.o
 
 COBJS	:= $(sort $(COBJS-y))
 SRCS	:= $(COBJS:.o=.c)
diff --git a/boot/common/src/uboot/drivers/peripheral/peripheral.c b/boot/common/src/uboot/drivers/peripheral/peripheral.c
index 4394c7b..3646130 100755
--- a/boot/common/src/uboot/drivers/peripheral/peripheral.c
+++ b/boot/common/src/uboot/drivers/peripheral/peripheral.c
@@ -25,6 +25,7 @@
 #include <linux/types.h>

 #include <zx234290.h>

 #include <led.h>

+#include <drvs_gpio.h>

 #include "common.h"

 //#include <gpio.h>

 

@@ -68,34 +69,32 @@
 

 /*lcd*/

 

-	/* jtagµ÷ÊÔ */

+	/* jtag调试 */

 #if 0

 	jtag_init();

 #endif

 

 //#if 0//ref need ldo8 2.85V

-#ifdef CONFIG_ZX297520V3E_VEHICLE_DC

+#if defined(CONFIG_ZX297520V3E_VEHICLE_DC) || defined(CONFIG_ZX297520V3E_VEHICLE_DC_REF)

 /*set mmc io and vccQ*/	

 	zx234290_set_ldo8_voltage(VLDOD_1_800);

 	zx234290_set_ldo8_sleep_voltage(VLDOD_1_800);

 	zx234290_ldo8_enable(1);

 	

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

-#endif

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

-#if 1 //enable GNSS

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

 	zDrvGpio_SetFunc(GPIO15,GPIO15_CLK_OUT0);

-

-	zDrvGpio_SetFunc(GPIO86,GPIO86_GPIO86);

-	zDrvGpio_SetDirection(GPIO86,GPIO_OUT);

-	zDrvGpio_SetOutputValue(GPIO86,GPIO_HIGH);

+	/*关闭gps电源*/

+	zDrvGpio_SetFunc(GPIO86, GPIO86_GPIO86);

+	zDrvGpio_SetDirection(GPIO86, GPIO_OUT);

+	zDrvGpio_SetOutputValue(GPIO86, GPIO_LOW);

 

 	zDrvGpio_SetFunc(GPIO126,GPIO126_GPIO126);

 	zDrvGpio_SetDirection(GPIO126,GPIO_OUT);

 	zDrvGpio_SetOutputValue(GPIO126,GPIO_LOW);

-#endif

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

+#endif

 	zx234502_charger_enable();

 

 	return ret ;