| Message ID | 20200226084014.5242-5-ludovic.barre@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: mmci_sdmmc: fixes and improvements | expand |
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 647567def612..f378ae18d5dc 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -2085,6 +2085,10 @@ static int mmci_probe(struct amba_device *dev, else if (plat->ocr_mask) dev_warn(mmc_dev(mmc), "Platform OCR mask is ignored\n"); + host->pwr_reg = readl_relaxed(host->base + MMCIPOWER); + host->clk_reg = readl_relaxed(host->base + MMCICLOCK); + host->datactrl_reg = readl_relaxed(host->base + MMCIDATACTRL); + /* We support these capabilities. */ mmc->caps |= MMC_CAP_CMD23;
In mmci_write_pwr|clk|datactrlreg functions, if the desired value is equal to corresponding variable (pwr_reg|clk_reg|datactrl_reg), the value is not written in the register. At probe pwr|clk|datactrl_reg of mmci_host structure are initialized to 0 (kzalloc of mmc_alloc_host). But they does not necessarily reflect hardware value of these registers, if they are used while boot level. This is problematic, if we want to write 0 in these registers. This patch initializes pwr|clk|datactrl_reg variables with their hardware values while probing. Signed-off-by: Ludovic Barre <ludovic.barre@st.com> --- drivers/mmc/host/mmci.c | 4 ++++ 1 file changed, 4 insertions(+)