On 2019/9/17 下午2:10, Jagan Teki wrote:
From: Michael Trimarchi michael@amarulasolutions.com
Reviewed-by: Kever Yangkever.yang@rock-chips.com
Thanks, - Kever
Tinker board needs to mux all the sdmmc gpio and activate the regulator connected to bank 7. Remove all the bank that are not in use and mark them as dm,spl so-that it would initialize at SPL.
Signed-off-by: Michael Trimarchi michael@amarulasolutions.com Signed-off-by: Jagan Teki jagan@amarulasolutions.com
arch/arm/dts/rk3288-tinker-u-boot.dtsi | 26 +++++++++++++++++++------- configs/tinker-rk3288_defconfig | 5 +++++ 2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi index 2efb309d6b..f7f9d6dc72 100644 --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi @@ -13,20 +13,20 @@ u-boot,dm-pre-reloc; };
-&sdmmc { +&uart2_xfer { u-boot,dm-pre-reloc; };
-&emmc {
- u-boot,dm-pre-reloc;
+&sdmmc {
- u-boot,dm-spl; };
-&gpio3 {
- u-boot,dm-pre-reloc;
+&gpio7 {
- u-boot,dm-spl; };
-&gpio8 {
- u-boot,dm-pre-reloc;
+&vcc_sd {
u-boot,dm-spl; };
&pcfg_pull_none_drv_8ma {
@@ -37,10 +37,22 @@ u-boot,dm-spl; };
+&pcfg_pull_none {
- u-boot,dm-spl;
+};
+&pcfg_pull_up {
- u-boot,dm-spl;
+};
- &sdmmc_bus4 { u-boot,dm-spl; };
+&sdmmc_cd {
- u-boot,dm-spl;
+};
- &sdmmc_clk { u-boot,dm-spl; };
diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig index 359be078ac..afee09819d 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -49,7 +49,10 @@ CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y +CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_MMC_DW=y @@ -64,7 +67,9 @@ CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=y +CONFIG_SPL_DM_REGULATOR=y CONFIG_REGULATOR_RK8XX=y +CONFIG_SPL_DM_REGULATOR_FIXED=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y