diff mbox series

[U-Boot] rockchip: dts: rk3288-tinker: Fix peripheral that need to be configured at boot

Message ID 20190915131012.11813-1-michael@amarulasolutions.com
State Superseded
Delegated to: Kever Yang
Headers show
Series [U-Boot] rockchip: dts: rk3288-tinker: Fix peripheral that need to be configured at boot | expand

Commit Message

Michael Nazzareno Trimarchi Sept. 15, 2019, 1:10 p.m. UTC 
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 an mark dm,spl
the part that need to run there

Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
---
 arch/arm/dts/rk3288-tinker-u-boot.dtsi | 26 +++++++++++++++++++-------
 configs/tinker-rk3288_defconfig        |  7 ++++++-
 2 files changed, 25 insertions(+), 8 deletions(-)
diff mbox series

Patch

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 443f4d88b9..73496901d5 100644
--- a/configs/tinker-rk3288_defconfig
+++ b/configs/tinker-rk3288_defconfig
@@ -1,6 +1,7 @@ 
 CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x01000000
+CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_ROCKCHIP_RK3288=y
 CONFIG_TARGET_TINKER_RK3288=y
 CONFIG_NR_DRAM_BANKS=1
@@ -8,6 +9,7 @@  CONFIG_SPL_SIZE_LIMIT=307200
 CONFIG_DEBUG_UART_BASE=0xff690000
 CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART=y
+CONFIG_SPL_TEXT_BASE=0
 # CONFIG_ANDROID_BOOT_IMAGE is not set
 CONFIG_USE_PREBOOT=y
 CONFIG_SILENT_CONSOLE=y
@@ -15,7 +17,8 @@  CONFIG_CONSOLE_MUX=y
 CONFIG_DEFAULT_FDT_FILE="rk3288-tinker.dtb"
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
-CONFIG_SPL_TEXT_BASE=0
+CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
@@ -61,7 +64,9 @@  CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_RK8XX=y
+CONFIG_SPL_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_SPL_DM_REGULATOR_FIXED=y
 CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y