[U-Boot] [PATCH v2 3/3] sunxi-mmc: use new mode on both controllers on A64

Jagan Teki
2018-11-22T07:53:18Z

On Sat, Nov 10, 2018 at 10:13 AM Vasily Khoruzhick <anarsoul@gmail.com> wrote:
>
> Using new mode improves stability of eMMC and SD cards. Without
> it SPL fails to load u-boot from SD on Pinebook.
>
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
> Reviewed-by: Chen-Yu Tsai <wens@csie.org>
> ---
> arch/arm/mach-sunxi/Kconfig | 1 +
> drivers/mmc/sunxi_mmc.c | 10 +++++++---
> 2 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> index 66fff6c6d3..3c54f5106d 100644
> --- a/arch/arm/mach-sunxi/Kconfig
> +++ b/arch/arm/mach-sunxi/Kconfig
> @@ -282,6 +282,7 @@ config MACH_SUN50I
> select SUN6I_PRCM
> select SUNXI_DE2
> select SUNXI_GEN_SUN6I
> + select MMC_SUNXI_HAS_NEW_MODE
> select SUPPORT_SPL
> select SUNXI_DRAM_DW
> select SUNXI_DRAM_DW_32BIT
> diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
> index e50b2c3343..2b6f3c2234 100644
> --- a/drivers/mmc/sunxi_mmc.c
> +++ b/drivers/mmc/sunxi_mmc.c
> @@ -98,12 +98,16 @@ static int mmc_resource_init(int sdc_no)
> static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz)
> {
> unsigned int pll, pll_hz, div, n, oclk_dly, sclk_dly;
> - bool new_mode = false;
> + bool new_mode = true;
> bool calibrate = false;
> u32 val = 0;
>
> - if (IS_ENABLED(CONFIG_MMC_SUNXI_HAS_NEW_MODE) && (priv->mmc_no == 2))
> - new_mode = true;
> + if (!IS_ENABLED(CONFIG_MMC_SUNXI_HAS_NEW_MODE))
> + new_mode = false;
> +
> + /* A83 support new mode only on eMMC */

s/A83/A83T

Tested-by: Jagan Teki <jagan@amarulasolutions.com> # Amarula A64-Relic

Applied to u-boot-sunxi/master