Merge branch 'master' of git://git.denx.de/u-boot-sh

- Gen2/Gen3 fixes for warnings and sdhi

17 files changed, 32 insertions, 37 deletions

diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32
index 076a019135b..67f669a6fc6 100644
--- a/arch/arm/mach-rmobile/Kconfig.32
+++ b/arch/arm/mach-rmobile/Kconfig.32
@@ -16,25 +16,35 @@ config R8A7790
 	bool "Renesas SoC R8A7790"
 	select RCAR_GEN2
 	select ARM_CORTEX_A15_CVE_2017_5715
+	imply CLK_R8A7790
+	imply PINCTRL_PFC_R8A7790
 
 config R8A7791
 	bool "Renesas SoC R8A7791"
 	select RCAR_GEN2
 	select ARM_CORTEX_A15_CVE_2017_5715
+	imply CLK_R8A7791
+	imply PINCTRL_PFC_R8A7791
 
 config R8A7792
 	bool "Renesas SoC R8A7792"
 	select RCAR_GEN2
 	select ARM_CORTEX_A15_CVE_2017_5715
+	imply CLK_R8A7792
+	imply PINCTRL_PFC_R8A7792
 
 config R8A7793
 	bool "Renesas SoC R8A7793"
 	select RCAR_GEN2
 	select ARM_CORTEX_A15_CVE_2017_5715
+	imply CLK_R8A7793
+	imply PINCTRL_PFC_R8A7793
 
 config R8A7794
 	bool "Renesas SoC R8A7794"
 	select RCAR_GEN2
+	imply CLK_R8A7794
+	imply PINCTRL_PFC_R8A7794
 
 choice
 	prompt "Renesas ARM SoCs board select"
diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64
index cb9f569e5fb..b2ac1cdad71 100644
--- a/arch/arm/mach-rmobile/Kconfig.64
+++ b/arch/arm/mach-rmobile/Kconfig.64
@@ -1,51 +1,67 @@
 if RCAR_GEN3
 
-choice
-	prompt "Select Target SoC"
+menu "Select Target SoC"
 
 config R8A7795
 	bool "Renesas SoC R8A7795"
+	imply CLK_R8A7795
+	imply PINCTRL_PFC_R8A7795
 
 config R8A7796
 	bool "Renesas SoC R8A7796"
+	imply CLK_R8A7796
+	imply PINCTRL_PFC_R8A7796
 
 config R8A77970
 	bool "Renesas SoC R8A77970"
+	imply CLK_R8A77970
+	imply PINCTRL_PFC_R8A77970
 
 config R8A77990
 	bool "Renesas SoC R8A77990"
+	imply CLK_R8A77990
+	imply PINCTRL_PFC_R8A77990
 
 config R8A77995
 	bool "Renesas SoC R8A77995"
+	imply CLK_R8A77995
+	imply PINCTRL_PFC_R8A77995
 
-endchoice
+endmenu
 
 choice
-	prompt "Renesus ARM64 SoCs board select"
+	prompt "Renesas ARM64 SoCs board select"
 	optional
 
 config TARGET_DRAAK
 	bool "Draak board"
+	imply R8A77995
 	help
           Support for Renesas R-Car Gen3 Draak platform
 
 config TARGET_EAGLE
 	bool "Eagle board"
+	imply R8A77970
 	help
           Support for Renesas R-Car Gen3 Eagle platform
 
 config TARGET_EBISU
 	bool "Ebisu board"
+	imply R8A77990
 	help
           Support for Renesas R-Car Gen3 Ebisu platform
 
 config TARGET_SALVATOR_X
 	bool "Salvator-X board"
+	imply R8A7795
+	imply R8A7796
 	help
           Support for Renesas R-Car Gen3 platform
 
 config TARGET_ULCB
 	bool "ULCB board"
+	imply R8A7795
+	imply R8A7796
 	help
           Support for Renesas R-Car Gen3 ULCB platform
 
diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 44f1e1c51a4..c4ece795073 100644
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
 CONFIG_OF_CONTROL=y
-CONFIG_OF_EMBED=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7794-alt-u-boot"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_CLK=y
diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig
index c5042d885f4..c2d53a3d114 100644
--- a/configs/blanche_defconfig
+++ b/configs/blanche_defconfig
@@ -32,7 +32,6 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
-CONFIG_OF_EMBED=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7792-blanche-u-boot"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/gose_defconfig b/configs/gose_defconfig
index a5afb3c5699..39e4cfdfc28 100644
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
 CONFIG_OF_CONTROL=y
-CONFIG_OF_EMBED=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7793-gose-u-boot"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_CLK=y
diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index 1ff14ac4abd..75beab4ccef 100644
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
 CONFIG_OF_CONTROL=y
-CONFIG_OF_EMBED=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7791-koelsch-u-boot"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_CLK=y
diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index d924d76911d..686aa2c171b 100644
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
 CONFIG_OF_CONTROL=y
-CONFIG_OF_EMBED=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7790-lager-u-boot"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_CLK=y
diff --git a/configs/porter_defconfig b/configs/porter_defconfig
index 7c54a546386..ce309b6d86e 100644
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
 CONFIG_OF_CONTROL=y
-CONFIG_OF_EMBED=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7791-porter-u-boot"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_CLK=y
diff --git a/configs/r8a77965_salvator-x_defconfig b/configs/r8a77965_salvator-x_defconfig
index 3580a44d5ed..b34fddda1cb 100644
--- a/configs/r8a77965_salvator-x_defconfig
+++ b/configs/r8a77965_salvator-x_defconfig
@@ -3,7 +3,6 @@ CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_TEXT_BASE=0x50000000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_RCAR_GEN3=y
-CONFIG_R8A7796=y
 CONFIG_TARGET_SALVATOR_X=y
 CONFIG_SMBIOS_PRODUCT_NAME=""
 CONFIG_FIT=y
diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig
index 9006b9fc3c9..6a9c1bdc0c0 100644
--- a/configs/r8a7796_salvator-x_defconfig
+++ b/configs/r8a7796_salvator-x_defconfig
@@ -3,7 +3,6 @@ CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_TEXT_BASE=0x50000000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_RCAR_GEN3=y
-CONFIG_R8A7796=y
 CONFIG_TARGET_SALVATOR_X=y
 CONFIG_SMBIOS_PRODUCT_NAME=""
 CONFIG_FIT=y
diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
index 37b70b993be..aff4c9cb615 100644
--- a/configs/r8a7796_ulcb_defconfig
+++ b/configs/r8a7796_ulcb_defconfig
@@ -3,7 +3,6 @@ CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_TEXT_BASE=0x50000000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_RCAR_GEN3=y
-CONFIG_R8A7796=y
 CONFIG_TARGET_ULCB=y
 CONFIG_SMBIOS_PRODUCT_NAME=""
 CONFIG_FIT=y
diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index 3cb4f6e005a..0291a7c9815 100644
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
 CONFIG_OF_CONTROL=y
-CONFIG_OF_EMBED=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7794-silk-u-boot"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_CLK=y
diff --git a/configs/stout_defconfig b/configs/stout_defconfig
index 1b1ed8d3acc..1c92cb6117a 100644
--- a/configs/stout_defconfig
+++ b/configs/stout_defconfig
@@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
 CONFIG_OF_CONTROL=y
-CONFIG_OF_EMBED=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7790-stout-u-boot"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_CLK=y
diff --git a/drivers/clk/renesas/Kconfig b/drivers/clk/renesas/Kconfig
index 578e6a8049d..e062eccdae1 100644
--- a/drivers/clk/renesas/Kconfig
+++ b/drivers/clk/renesas/Kconfig
@@ -13,35 +13,30 @@ config CLK_RCAR_GEN2
 
 config CLK_R8A7790
 	bool "Renesas R8A7790 clock driver"
-	def_bool y if R8A7790
 	depends on CLK_RCAR_GEN2
 	help
 	  Enable this to support the clocks on Renesas R8A7790 SoC.
 
 config CLK_R8A7791
 	bool "Renesas R8A7791 clock driver"
-	def_bool y if R8A7791
 	depends on CLK_RCAR_GEN2
 	help
 	  Enable this to support the clocks on Renesas R8A7791 SoC.
 
 config CLK_R8A7792
 	bool "Renesas R8A7792 clock driver"
-	def_bool y if R8A7792
 	depends on CLK_RCAR_GEN2
 	help
 	  Enable this to support the clocks on Renesas R8A7792 SoC.
 
 config CLK_R8A7793
 	bool "Renesas R8A7793 clock driver"
-	def_bool y if R8A7793
 	depends on CLK_RCAR_GEN2
 	help
 	  Enable this to support the clocks on Renesas R8A7793 SoC.
 
 config CLK_R8A7794
 	bool "Renesas R8A7794 clock driver"
-	def_bool y if R8A7794
 	depends on CLK_RCAR_GEN2
 	help
 	  Enable this to support the clocks on Renesas R8A7794 SoC.
@@ -55,35 +50,30 @@ config CLK_RCAR_GEN3
 
 config CLK_R8A7795
 	bool "Renesas R8A7795 clock driver"
-	def_bool y if R8A7795
 	depends on CLK_RCAR_GEN3
 	help
 	  Enable this to support the clocks on Renesas R8A7795 SoC.
 
 config CLK_R8A7796
 	bool "Renesas R8A7796 clock driver"
-	def_bool y if R8A7796
 	depends on CLK_RCAR_GEN3
 	help
 	  Enable this to support the clocks on Renesas R8A7796 SoC.
 
 config CLK_R8A77970
 	bool "Renesas R8A77970 clock driver"
-	def_bool y if R8A77970
 	depends on CLK_RCAR_GEN3
 	help
 	  Enable this to support the clocks on Renesas R8A77970 SoC.
 
 config CLK_R8A77990
 	bool "Renesas R8A77990 clock driver"
-	def_bool y if R8A77990
 	depends on CLK_RCAR_GEN3
 	help
 	  Enable this to support the clocks on Renesas R8A77990 SoC.
 
 config CLK_R8A77995
 	bool "Renesas R8A77995 clock driver"
-	def_bool y if R8A77995
 	depends on CLK_RCAR_GEN3
 	help
 	  Enable this to support the clocks on Renesas R8A77995 SoC.
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 923f846370f..6c51ccc294b 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -137,7 +137,7 @@ static int renesas_sdhi_hs400(struct udevice *dev)
 
 	tmio_sd_writel(priv, reg, RENESAS_SDHI_SCC_TMPPORT2);
 
-	tmio_sd_writel(priv, (taps << RENESAS_SDHI_SCC_DTCNTL_TAPNUM_SHIFT) |
+	tmio_sd_writel(priv, (0x8 << RENESAS_SDHI_SCC_DTCNTL_TAPNUM_SHIFT) |
 			     RENESAS_SDHI_SCC_DTCNTL_TAPEN,
 			     RENESAS_SDHI_SCC_DTCNTL);
 
diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c
index 6e656e5a9b8..01d8c2b9254 100644
--- a/drivers/mmc/tmio-common.c
+++ b/drivers/mmc/tmio-common.c
@@ -707,7 +707,7 @@ static void tmio_sd_host_init(struct tmio_sd_priv *priv)
 	 */
 	if (priv->version >= 0x10) {
 		if (priv->caps & TMIO_SD_CAP_64BIT)
-			tmio_sd_writel(priv, 0x100, TMIO_SD_HOST_MODE);
+			tmio_sd_writel(priv, 0x000, TMIO_SD_HOST_MODE);
 		else
 			tmio_sd_writel(priv, 0x101, TMIO_SD_HOST_MODE);
 	} else {
diff --git a/drivers/pinctrl/renesas/Kconfig b/drivers/pinctrl/renesas/Kconfig
index 1baab9088a7..0cb577037c3 100644
--- a/drivers/pinctrl/renesas/Kconfig
+++ b/drivers/pinctrl/renesas/Kconfig
@@ -8,7 +8,6 @@ config PINCTRL_PFC
 
 config PINCTRL_PFC_R8A7790
 	bool "Renesas RCar Gen2 R8A7790 pin control driver"
-	def_bool y if R8A7790
 	depends on PINCTRL_PFC
 	help
 	  Support pin multiplexing control on Renesas RCar Gen3 R8A7790 SoCs.
@@ -19,7 +18,6 @@ config PINCTRL_PFC_R8A7790
 
 config PINCTRL_PFC_R8A7791
 	bool "Renesas RCar Gen2 R8A7791 pin control driver"
-	def_bool y if R8A7791
 	depends on PINCTRL_PFC
 	help
 	  Support pin multiplexing control on Renesas RCar Gen3 R8A7791 SoCs.
@@ -30,7 +28,6 @@ config PINCTRL_PFC_R8A7791
 
 config PINCTRL_PFC_R8A7792
 	bool "Renesas RCar Gen2 R8A7792 pin control driver"
-	def_bool y if R8A7792
 	depends on PINCTRL_PFC
 	help
 	  Support pin multiplexing control on Renesas RCar Gen3 R8A7792 SoCs.
@@ -41,7 +38,6 @@ config PINCTRL_PFC_R8A7792
 
 config PINCTRL_PFC_R8A7793
 	bool "Renesas RCar Gen2 R8A7793 pin control driver"
-	def_bool y if R8A7793
 	depends on PINCTRL_PFC
 	help
 	  Support pin multiplexing control on Renesas RCar Gen3 R8A7793 SoCs.
@@ -52,7 +48,6 @@ config PINCTRL_PFC_R8A7793
 
 config PINCTRL_PFC_R8A7794
 	bool "Renesas RCar Gen2 R8A7794 pin control driver"
-	def_bool y if R8A7794
 	depends on PINCTRL_PFC
 	help
 	  Support pin multiplexing control on Renesas RCar Gen3 R8A7794 SoCs.
@@ -63,7 +58,6 @@ config PINCTRL_PFC_R8A7794
 
 config PINCTRL_PFC_R8A7795
 	bool "Renesas RCar Gen3 R8A7795 pin control driver"
-	def_bool y if R8A7795
 	depends on PINCTRL_PFC
 	help
 	  Support pin multiplexing control on Renesas RCar Gen3 R8A7795 SoCs.
@@ -74,7 +68,6 @@ config PINCTRL_PFC_R8A7795
 
 config PINCTRL_PFC_R8A7796
 	bool "Renesas RCar Gen3 R8A7796 pin control driver"
-	def_bool y if R8A7796
 	depends on PINCTRL_PFC
 	help
 	  Support pin multiplexing control on Renesas RCar Gen3 R8A7796 SoCs.
@@ -85,7 +78,6 @@ config PINCTRL_PFC_R8A7796
 
 config PINCTRL_PFC_R8A77970
 	bool "Renesas RCar Gen3 R8A77970 pin control driver"
-	def_bool y if R8A77970
 	depends on PINCTRL_PFC
 	help
 	  Support pin multiplexing control on Renesas RCar Gen3 R8A77970 SoCs.
@@ -96,7 +88,6 @@ config PINCTRL_PFC_R8A77970
 
 config PINCTRL_PFC_R8A77990
 	bool "Renesas RCar Gen3 R8A77990 pin control driver"
-	def_bool y if R8A77990
 	depends on PINCTRL_PFC
 	help
 	  Support pin multiplexing control on Renesas RCar Gen3 R8A77990 SoCs.
@@ -107,7 +98,6 @@ config PINCTRL_PFC_R8A77990
 
 config PINCTRL_PFC_R8A77995
 	bool "Renesas RCar Gen3 R8A77995 pin control driver"
-	def_bool y if R8A77995
 	depends on PINCTRL_PFC
 	help
 	  Support pin multiplexing control on Renesas RCar Gen3 R8A77995 SoCs.