brain-hackers_pepepper-mirror
/
u-boot-brain
mirror of https://github.com/brain-hackers/u-boot-brain
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmc: dwmmc: Change designware MMC 'clksel' callback function to return status 

Change 'clksel' callback function to allow the code to return a
status.

This patch is a preparation for enabling Arm-Trusted-Firmware (ATF)
in Intel SoC FPGA. This patch does not change functionality.

When using Arm-Trusted-Firmware (ATF) in Intel SoC FPGA, the MMC clock
related register is secure register which is required to be written
via SMC/PCSI call. It is possible that U-Boot fail to write the
register if there is unexpected error between U-Boot and ATF.
As a result, there maybe signal integrity on MMC connection due to
clock. So, the code should reports error to user when 'clksel' fail.

Signed-off-by: Siew Chin Lim <elly.siew.chin.lim@intel.com>
This commit is contained in:
Siew Chin Lim 2020-12-24 18:21:03 +08:00 committed by Ley Foon Tan
parent 2e54a1d46c
commit d456dfbaa0
6 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/ca_dw_mmc.c
View File

@ -40,7 +40,7 @@ struct ca_dwmmc_priv_data {
u8 ds; u8 ds;
}; };
static void ca_dwmci_clksel(struct dwmci_host *host) static int ca_dwmci_clksel(struct dwmci_host *host)
{ {
struct ca_dwmmc_priv_data *priv = host->priv; struct ca_dwmmc_priv_data *priv = host->priv;
u32 val = readl(priv->sd_dll_reg); u32 val = readl(priv->sd_dll_reg);
@ -52,6 +52,8 @@ static void ca_dwmci_clksel(struct dwmci_host *host)
val |= SD_CLK_SEL_100MHZ; val |= SD_CLK_SEL_100MHZ;
writel(val, priv->sd_dll_reg); writel(val, priv->sd_dll_reg);
return 0;
} }
static void ca_dwmci_board_init(struct dwmci_host *host) static void ca_dwmci_board_init(struct dwmci_host *host)

9
drivers/mmc/dw_mmc.c
View File

@ -496,8 +496,13 @@ static int dwmci_set_ios(struct mmc *mmc)
dwmci_writel(host, DWMCI_UHS_REG, regs); dwmci_writel(host, DWMCI_UHS_REG, regs);
if (host->clksel) if (host->clksel) {
host->clksel(host); int ret;
ret = host->clksel(host);
if (ret)
return ret;
}
#if CONFIG_IS_ENABLED(DM_REGULATOR) #if CONFIG_IS_ENABLED(DM_REGULATOR)
if (mmc->vqmmc_supply) { if (mmc->vqmmc_supply) {

4
drivers/mmc/exynos_dw_mmc.c
View File

@ -44,7 +44,7 @@ struct dwmci_exynos_priv_data {
* Function used as callback function to initialise the * Function used as callback function to initialise the
* CLKSEL register for every mmc channel. * CLKSEL register for every mmc channel.
*/ */
static void exynos_dwmci_clksel(struct dwmci_host *host) static int exynos_dwmci_clksel(struct dwmci_host *host)
{ {
#ifdef CONFIG_DM_MMC #ifdef CONFIG_DM_MMC
struct dwmci_exynos_priv_data *priv = struct dwmci_exynos_priv_data *priv =
@ -53,6 +53,8 @@ static void exynos_dwmci_clksel(struct dwmci_host *host)
struct dwmci_exynos_priv_data *priv = host->priv; struct dwmci_exynos_priv_data *priv = host->priv;
#endif #endif
dwmci_writel(host, DWMCI_CLKSEL, priv->sdr_timing); dwmci_writel(host, DWMCI_CLKSEL, priv->sdr_timing);
return 0;
} }
unsigned int exynos_dwmci_get_clk(struct dwmci_host *host, uint freq) unsigned int exynos_dwmci_get_clk(struct dwmci_host *host, uint freq)

4
drivers/mmc/nexell_dw_mmc.c
View File

@ -51,7 +51,7 @@ struct nexell_dwmmc_priv {
struct clk *clk_get(const char *id); struct clk *clk_get(const char *id);
static void nx_dw_mmc_clksel(struct dwmci_host *host) static int nx_dw_mmc_clksel(struct dwmci_host *host)
{ {
/* host->priv is pointer to "struct udevice" */ /* host->priv is pointer to "struct udevice" */
struct nexell_dwmmc_priv *priv = dev_get_priv(host->priv); struct nexell_dwmmc_priv *priv = dev_get_priv(host->priv);
@ -65,6 +65,8 @@ static void nx_dw_mmc_clksel(struct dwmci_host *host)
DWMCI_SET_DRV_CLK(DWMCI_SHIFT_0) | DWMCI_SET_DIV_RATIO(3); DWMCI_SET_DRV_CLK(DWMCI_SHIFT_0) | DWMCI_SET_DIV_RATIO(3);
dwmci_writel(host, DWMCI_CLKSEL, val); dwmci_writel(host, DWMCI_CLKSEL, val);
return 0;
} }
static void nx_dw_mmc_reset(int ch) static void nx_dw_mmc_reset(int ch)

4
drivers/mmc/socfpga_dw_mmc.c
View File

@ -46,7 +46,7 @@ static void socfpga_dwmci_reset(struct udevice *dev)
reset_deassert_bulk(&reset_bulk); reset_deassert_bulk(&reset_bulk);
} }
static void socfpga_dwmci_clksel(struct dwmci_host *host) static int socfpga_dwmci_clksel(struct dwmci_host *host)
{ {
struct dwmci_socfpga_priv_data *priv = host->priv; struct dwmci_socfpga_priv_data *priv = host->priv;
u32 sdmmc_mask = ((priv->smplsel & 0x7) << SYSMGR_SDMMC_SMPLSEL_SHIFT) | u32 sdmmc_mask = ((priv->smplsel & 0x7) << SYSMGR_SDMMC_SMPLSEL_SHIFT) |
@ -66,6 +66,8 @@ static void socfpga_dwmci_clksel(struct dwmci_host *host)
/* Enable SDMMC clock */ /* Enable SDMMC clock */
setbits_le32(socfpga_get_clkmgr_addr() + CLKMGR_PERPLL_EN, setbits_le32(socfpga_get_clkmgr_addr() + CLKMGR_PERPLL_EN,
CLKMGR_PERPLLGRP_EN_SDMMCCLK_MASK); CLKMGR_PERPLLGRP_EN_SDMMCCLK_MASK);
return 0;
} }
static int socfpga_dwmmc_get_clk_rate(struct udevice *dev) static int socfpga_dwmmc_get_clk_rate(struct udevice *dev)

2
include/dwmmc.h
View File

@ -174,7 +174,7 @@ struct dwmci_host {
struct mmc *mmc; struct mmc *mmc;
void *priv; void *priv;
void (*clksel)(struct dwmci_host *host); int (*clksel)(struct dwmci_host *host);
void (*board_init)(struct dwmci_host *host); void (*board_init)(struct dwmci_host *host);
/** /**