leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- Gen2/Gen3 fixes for warnings and sdhi
This commit is contained in:
Tom Rini
2019-02-28 18:57:17 -05:00
parent da206916a1 ba41c45ec3
commit 35b05146f6
17 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/clk/renesas/Kconfig
View File

@@ -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.

2
drivers/mmc/renesas-sdhi.c
View File

@@ -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);

2
drivers/mmc/tmio-common.c
View File

@@ -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 {

10
drivers/pinctrl/renesas/Kconfig
View File

@@ -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.