From 18a37a5a8ba4802bbd2fcfc680f6027f24711d52 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Mon, 18 Feb 2019 13:22:47 +0100 Subject: clk: rmobile: Drop def_bool per SoC Drop per SoC def_bool on each driver, since this is now implied by SoC Kconfig option instead. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- drivers/clk/renesas/Kconfig | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'drivers') 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. -- cgit v1.2.3 From 7fef459c3cfce69f76d36d196ec9c50eb07a7614 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Mon, 18 Feb 2019 13:23:14 +0100 Subject: pinctrl: renesas: Drop def_bool per SoC Drop per SoC def_bool on each driver, since this is now implied by SoC Kconfig option instead. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- drivers/pinctrl/renesas/Kconfig | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'drivers') 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. -- cgit v1.2.3 From 5d6888418c1185a00eda01349b03b56b03cefda5 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Tue, 19 Feb 2019 19:20:14 +0100 Subject: mmc: tmio: Clear BUSWIDTH bit when WMODE bit is set According to latest specification rev.0026, when HOST_MODE bit 0 (WMODE) is not set, HOST_MODE bit 8 (BUSWIDTH) is ignored. Clear HOST_MODE bit 8 in such case and align the code with Linux and avoid possible unforeseen issues. Signed-off-by: Marek Vasut Cc: Masahiro Yamada --- drivers/mmc/tmio-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') 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 { -- cgit v1.2.3 From ba41c45ec3402178520ca59d5d847c1c94ae25c4 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Tue, 19 Feb 2019 19:32:28 +0100 Subject: mmc: renesas: Unconditionally set DTCNTL TAPNUM to 8 According to latest specification rev.0026 and after confirmation with HW engineer, the DTCNTL register TAPNUM field must be set to 8 even on H3 ES2.0 SoC. Make it so. Signed-off-by: Marek Vasut Cc: Masahiro Yamada --- drivers/mmc/renesas-sdhi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') 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); -- cgit v1.2.3