Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c01d1219 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Ulf Hansson
Browse files

mmc: meson-gx: improve initial configuration 



Config values which are not changed during runtime we can set
in the probe function already.
The block size setting is overwritten later in
meson_mmc_start_cmd anyway if needed, so it doesn't harm if we
remove this setting in meson_mmc_set_ios.

In addition write config register only if configuration changed.

Don't change the location of clock initialization as in an
earlier version of the patch, this change causes a hang.
This issue was reported and fix suggested by:
Helmut Klein <hgkr.klein@gmail.com>

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Acked-by: default avatarKevin Hilman <khilman@baylibre.com>
Tested-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 7b9ebad3

drivers/mmc/host/meson-gx-mmc.c

+17 −12
Original line number Diff line number Diff line
@@ -394,15 +394,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	val &= ~(CFG_BUS_WIDTH_MASK << CFG_BUS_WIDTH_SHIFT);

	val |= bus_width << CFG_BUS_WIDTH_SHIFT;



	val &= ~(CFG_BLK_LEN_MASK << CFG_BLK_LEN_SHIFT);

	val |= ilog2(SD_EMMC_CFG_BLK_SIZE) << CFG_BLK_LEN_SHIFT;



	val &= ~(CFG_RESP_TIMEOUT_MASK << CFG_RESP_TIMEOUT_SHIFT);

	val |= ilog2(SD_EMMC_CFG_RESP_TIMEOUT) << CFG_RESP_TIMEOUT_SHIFT;



	val &= ~(CFG_RC_CC_MASK << CFG_RC_CC_SHIFT);

	val |= ilog2(SD_EMMC_CFG_CMD_GAP) << CFG_RC_CC_SHIFT;



	val &= ~CFG_DDR;

	if (ios->timing == MMC_TIMING_UHS_DDR50 ||

	    ios->timing == MMC_TIMING_MMC_DDR52 ||
@@ -413,12 +404,12 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	if (ios->timing == MMC_TIMING_MMC_HS400)

		val |= CFG_CHK_DS;



	if (val != orig) {

		writel(val, host->regs + SD_EMMC_CFG);



	if (val != orig)

		dev_dbg(host->dev, "%s: SD_EMMC_CFG: 0x%08x -> 0x%08x\n",

			__func__, orig, val);

	}

}



static void meson_mmc_request_done(struct mmc_host *mmc,

				   struct mmc_request *mrq)
@@ -695,6 +686,17 @@ static int meson_mmc_get_cd(struct mmc_host *mmc) 
	return status;

}



static void meson_mmc_cfg_init(struct meson_host *host)

{

	u32 cfg = 0;



	cfg |= ilog2(SD_EMMC_CFG_RESP_TIMEOUT) << CFG_RESP_TIMEOUT_SHIFT;

	cfg |= ilog2(SD_EMMC_CFG_CMD_GAP) << CFG_RC_CC_SHIFT;

	cfg |= ilog2(SD_EMMC_CFG_BLK_SIZE) << CFG_BLK_LEN_SHIFT;



	writel(cfg, host->regs + SD_EMMC_CFG);

}



static const struct mmc_host_ops meson_mmc_ops = {

	.request	= meson_mmc_request,

	.set_ios	= meson_mmc_set_ios,
@@ -767,6 +769,9 @@ static int meson_mmc_probe(struct platform_device *pdev) 
	writel(IRQ_EN_MASK, host->regs + SD_EMMC_STATUS);

	writel(IRQ_EN_MASK, host->regs + SD_EMMC_IRQ_EN);



	/* set config to sane default */

	meson_mmc_cfg_init(host);



	ret = devm_request_threaded_irq(&pdev->dev, irq, meson_mmc_irq,

					meson_mmc_irq_thread, IRQF_SHARED,

					DRIVER_NAME, host);