From 57e535649cba0900d49c3a06ddb7b3c15b900255 Mon Sep 17 00:00:00 2001 From: Eric Lee Date: Wed, 21 Jul 2021 15:57:46 +0800 Subject: [PATCH] Turn on level shift in PMIC --- board/embedian/smarcimx8mp/lpddr4_timing.c | 2 +- board/embedian/smarcimx8mp/smarcimx8mp.c | 4 ++-- configs/smarcimx8mp_4g_ser0_android_defconfig | 2 +- configs/smarcimx8mp_4g_ser0_defconfig | 2 +- configs/smarcimx8mp_4g_ser1_android_defconfig | 2 +- configs/smarcimx8mp_4g_ser1_defconfig | 2 +- configs/smarcimx8mp_4g_ser2_android_defconfig | 2 +- configs/smarcimx8mp_4g_ser2_defconfig | 2 +- configs/smarcimx8mp_4g_ser3_android_defconfig | 2 +- configs/smarcimx8mp_4g_ser3_defconfig | 2 +- configs/smarcimx8mp_6g_ser0_android_defconfig | 2 +- configs/smarcimx8mp_6g_ser0_defconfig | 2 +- configs/smarcimx8mp_6g_ser1_android_defconfig | 2 +- configs/smarcimx8mp_6g_ser1_defconfig | 2 +- configs/smarcimx8mp_6g_ser2_android_defconfig | 2 +- configs/smarcimx8mp_6g_ser2_defconfig | 2 +- configs/smarcimx8mp_6g_ser3_android_defconfig | 2 +- configs/smarcimx8mp_6g_ser3_defconfig | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/board/embedian/smarcimx8mp/lpddr4_timing.c b/board/embedian/smarcimx8mp/lpddr4_timing.c index 1457be8..75665ad 100755 --- a/board/embedian/smarcimx8mp/lpddr4_timing.c +++ b/board/embedian/smarcimx8mp/lpddr4_timing.c @@ -2174,7 +2174,7 @@ struct dram_cfg_param ddr_ddrphy_cfg[] = { { 0x1304a, 0x500 }, { 0x2002c, 0x0 }, }; -^M + /* ddr phy trained csr */ struct dram_cfg_param ddr_ddrphy_trained_csr[] = { { 0x200b2, 0x0 }, diff --git a/board/embedian/smarcimx8mp/smarcimx8mp.c b/board/embedian/smarcimx8mp/smarcimx8mp.c index 17f3277..9e46077 100644 --- a/board/embedian/smarcimx8mp/smarcimx8mp.c +++ b/board/embedian/smarcimx8mp/smarcimx8mp.c @@ -807,11 +807,11 @@ int board_late_init(void) } else if ((gpio_get_value(IMX_GPIO_NR(1, 5)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 7)) == 0)) { puts("BOOT_SEL Detected: ON OFF OFF, Load Image from Carrier SD Card...\n"); env_set_ulong("mmcdev", 1); - env_set("bootcmd", "mmc rescan; run loadbootenv; run importbootenv; run uenvcmd; run loadimage; run mmcboot;"); + env_set("bootcmd", "i2c dev 0; i2c mw 0x25 0x0a 0x3; mmc rescan; run loadbootenv; run importbootenv; run uenvcmd; run loadimage; run mmcboot;"); } else if ((gpio_get_value(IMX_GPIO_NR(1, 5)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 7)) == 1)) { puts("BOOT_SEL Detected: OFF ON ON, Load Image from Module eMMC Flash...\n"); env_set_ulong("mmcdev", 2); - env_set("bootcmd", "mmc rescan; run loadbootenv; run importbootenv; run uenvcmd; run loadimage; run mmcboot;"); + env_set("bootcmd", "i2c dev 0; i2c mw 0x25 0x0a 0x3; mmc rescan; run loadbootenv; run importbootenv; run uenvcmd; run loadimage; run mmcboot;"); } else if ((gpio_get_value(IMX_GPIO_NR(1, 5)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 7)) == 1)) { puts("BOOT_SEL Detected: ON OFF ON, Load zImage from GBE...\n"); env_set("bootcmd", "run netboot;"); diff --git a/configs/smarcimx8mp_4g_ser0_android_defconfig b/configs/smarcimx8mp_4g_ser0_android_defconfig index 7a9c307..a2563a4 100644 --- a/configs/smarcimx8mp_4g_ser0_android_defconfig +++ b/configs/smarcimx8mp_4g_ser0_android_defconfig @@ -91,7 +91,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_4g_ser0_defconfig b/configs/smarcimx8mp_4g_ser0_defconfig index c801c0e..b57285b 100644 --- a/configs/smarcimx8mp_4g_ser0_defconfig +++ b/configs/smarcimx8mp_4g_ser0_defconfig @@ -92,7 +92,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_4g_ser1_android_defconfig b/configs/smarcimx8mp_4g_ser1_android_defconfig index 140b5a7..460ef4b 100644 --- a/configs/smarcimx8mp_4g_ser1_android_defconfig +++ b/configs/smarcimx8mp_4g_ser1_android_defconfig @@ -91,7 +91,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_4g_ser1_defconfig b/configs/smarcimx8mp_4g_ser1_defconfig index 6ac1b0a..3676998 100644 --- a/configs/smarcimx8mp_4g_ser1_defconfig +++ b/configs/smarcimx8mp_4g_ser1_defconfig @@ -92,7 +92,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_4g_ser2_android_defconfig b/configs/smarcimx8mp_4g_ser2_android_defconfig index 6608a50..9c321aa 100644 --- a/configs/smarcimx8mp_4g_ser2_android_defconfig +++ b/configs/smarcimx8mp_4g_ser2_android_defconfig @@ -91,7 +91,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_4g_ser2_defconfig b/configs/smarcimx8mp_4g_ser2_defconfig index 49561fa..64c0dc2 100644 --- a/configs/smarcimx8mp_4g_ser2_defconfig +++ b/configs/smarcimx8mp_4g_ser2_defconfig @@ -92,7 +92,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_4g_ser3_android_defconfig b/configs/smarcimx8mp_4g_ser3_android_defconfig index 6acbd91..6c86a30 100644 --- a/configs/smarcimx8mp_4g_ser3_android_defconfig +++ b/configs/smarcimx8mp_4g_ser3_android_defconfig @@ -91,7 +91,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_4g_ser3_defconfig b/configs/smarcimx8mp_4g_ser3_defconfig index df2d229..6b50e58 100644 --- a/configs/smarcimx8mp_4g_ser3_defconfig +++ b/configs/smarcimx8mp_4g_ser3_defconfig @@ -92,7 +92,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_6g_ser0_android_defconfig b/configs/smarcimx8mp_6g_ser0_android_defconfig index 0331f07..305ee79 100644 --- a/configs/smarcimx8mp_6g_ser0_android_defconfig +++ b/configs/smarcimx8mp_6g_ser0_android_defconfig @@ -91,7 +91,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_6g_ser0_defconfig b/configs/smarcimx8mp_6g_ser0_defconfig index ace502b..ed7887d 100644 --- a/configs/smarcimx8mp_6g_ser0_defconfig +++ b/configs/smarcimx8mp_6g_ser0_defconfig @@ -92,7 +92,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_6g_ser1_android_defconfig b/configs/smarcimx8mp_6g_ser1_android_defconfig index 5b3d255..fd13f43 100644 --- a/configs/smarcimx8mp_6g_ser1_android_defconfig +++ b/configs/smarcimx8mp_6g_ser1_android_defconfig @@ -91,7 +91,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_6g_ser1_defconfig b/configs/smarcimx8mp_6g_ser1_defconfig index cba5490..cc225f7 100644 --- a/configs/smarcimx8mp_6g_ser1_defconfig +++ b/configs/smarcimx8mp_6g_ser1_defconfig @@ -92,7 +92,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_6g_ser2_android_defconfig b/configs/smarcimx8mp_6g_ser2_android_defconfig index f13a3c8..a421e8c 100644 --- a/configs/smarcimx8mp_6g_ser2_android_defconfig +++ b/configs/smarcimx8mp_6g_ser2_android_defconfig @@ -91,7 +91,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_6g_ser2_defconfig b/configs/smarcimx8mp_6g_ser2_defconfig index d002cba..2880a70 100644 --- a/configs/smarcimx8mp_6g_ser2_defconfig +++ b/configs/smarcimx8mp_6g_ser2_defconfig @@ -92,7 +92,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_6g_ser3_android_defconfig b/configs/smarcimx8mp_6g_ser3_android_defconfig index d00e30f..e1f91ee 100644 --- a/configs/smarcimx8mp_6g_ser3_android_defconfig +++ b/configs/smarcimx8mp_6g_ser3_android_defconfig @@ -91,7 +91,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y diff --git a/configs/smarcimx8mp_6g_ser3_defconfig b/configs/smarcimx8mp_6g_ser3_defconfig index fdb83bf..14fda66 100644 --- a/configs/smarcimx8mp_6g_ser3_defconfig +++ b/configs/smarcimx8mp_6g_ser3_defconfig @@ -92,7 +92,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MMC_IO_VOLTAGE=y +# CONFIG_MMC_IO_VOLTAGE is not set CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y -- 1.9.1