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

- Gen2/Gen3 fixes for warnings and sdhi

diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32
index 076a019135ba9da11f8de5591ae76304b25befe8..67f669a6fc62ab8d9d8d52c78b8f8d6ef4e38749 100644 (file)
--- 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 cb9f569e5fb6d36eaa6c0587e410e3f7535e7ec8..b2ac1cdad717cc0f61a58352081407a050694620 100644 (file)
--- 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 44f1e1c51a4ca6da4a0c853a634e20ab5e6921b4..c4ece795073a352f3838de37eb2801918d6992ae 100644 (file)
--- 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 c5042d885f4ef5ac732c0f28cc8f0fa6110e5f60..c2d53a3d1149ae5e68605c0c4d2e5bf6b0dca296 100644 (file)
--- 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 a5afb3c5699b23519e322f2aa39e649a673fd7df..39e4cfdfc28d5f335163102e6620fb89bc03b2e6 100644 (file)
--- 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 1ff14ac4abd02d764308ec0586802c0caa32b4f6..75beab4ccef6664a024535799b6d7eb9240a77ad 100644 (file)
--- 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 d924d76911dedaca186fed873ed2fb4cf5c15131..686aa2c171b633156b0509ccf60ac06121ae0653 100644 (file)
--- 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 7c54a54638693868872391e4206a0c8a09fb4b4d..ce309b6d86e02b8e040e180ec8c9b61ac0f63d1b 100644 (file)
--- 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 3580a44d5ed98e901d555f2c3802e062f6451daf..b34fddda1cb8a790a3d775a939b6b0bda2b0bd29 100644 (file)
--- 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 9006b9fc3c97a93551e90757ccc565bf039c8cd5..6a9c1bdc0c04112066b43e10392faa501fc82465 100644 (file)
--- 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 37b70b993be1e089b3480361a5250b2bcf68c6c5..aff4c9cb6153ca6076e555c373dd3ff8641764d4 100644 (file)
--- 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 3cb4f6e005aee659c87f2e0de3a80d0ea285e5bc..0291a7c98151c887637879fc4aadeae73a30ecc2 100644 (file)
--- 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 1b1ed8d3acc4939bc1cdff7c2e0ca12622440cae..1c92cb6117a2424d663895cfab5b201f35683eec 100644 (file)
--- 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 578e6a8049d305410224e91e928bdde58c22469a..e062eccdae1e8a1ac3e1cc7e0e6742e8d702e295 100644 (file)
--- 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 923f846370f4f299c1e4011d5933441a0215349b..6c51ccc294bec740e5a4f6dff18ed59c62116eac 100644 (file)
--- 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 6e656e5a9b81d5660fa3f9af44a0e052c4eced78..01d8c2b92544edfcbf64d592918d1c719a0bbed4 100644 (file)
--- 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 1baab9088a749795d39a63d9dfcd599b38923147..0cb577037c3b36eb2d47e79e977828af6f17cde0 100644 (file)
--- 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.