Commit 4d92506e authored by Kamal Dasu's avatar Kamal Dasu Committed by Ulf Hansson
Browse files

mmc: sdhci-brcmstb: clear CFG_OP_DLY when using HS200 



Clear SDIO_1_CFG_OP_DLY register when using HS200 mode to be
compliant with timing spec.  We only need this for on BCM72116
SoCs.

Signed-off-by: default avatarKamal Dasu <kamal.dasu@broadcom.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 5ef91010

drivers/mmc/host/sdhci-brcmstb.c

+30 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#define SDIO_CFG_CTRL				0x0

#define SDIO_CFG_CTRL_SDCD_N_TEST_EN		BIT(31)

#define SDIO_CFG_CTRL_SDCD_N_TEST_LEV		BIT(30)

#define SDIO_CFG_OP_DLY				0x34

#define SDIO_CFG_OP_DLY_DEFAULT			0x80000003

#define SDIO_CFG_CQ_CAPABILITY			0x4c

#define SDIO_CFG_CQ_CAPABILITY_FMUL		GENMASK(13, 12)

#define SDIO_CFG_MAX_50MHZ_MODE			0x1ac
@@ -210,6 +212,21 @@ static void sdhci_brcmstb_cfginit_2712(struct sdhci_host *host) 
	}

}



static void sdhci_brcmstb_set_72116_uhs_signaling(struct sdhci_host *host, unsigned int timing)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_brcmstb_priv *priv = sdhci_pltfm_priv(pltfm_host);

	u32 reg;



	/* no change to SDIO_CFG_OP_DLY_DEFAULT when using preset clk rate */

	if (!(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN))

		return;



	reg = (timing == MMC_TIMING_MMC_HS200) ? 0 : SDIO_CFG_OP_DLY_DEFAULT;

	writel(reg, priv->cfg_regs + SDIO_CFG_OP_DLY);

	sdhci_set_uhs_signaling(host, timing);

}



static void sdhci_brcmstb_dumpregs(struct mmc_host *mmc)

{

	sdhci_dumpregs(mmc_priv(mmc));
@@ -250,6 +267,13 @@ static struct sdhci_ops sdhci_brcmstb_ops_2712 = { 
	.set_uhs_signaling = sdhci_set_uhs_signaling,

};



static struct sdhci_ops sdhci_brcmstb_ops_72116 = {

	.set_clock = sdhci_set_clock,

	.set_bus_width = sdhci_set_bus_width,

	.reset = sdhci_reset,

	.set_uhs_signaling = sdhci_brcmstb_set_72116_uhs_signaling,

};



static struct sdhci_ops sdhci_brcmstb_ops_7216 = {

	.set_clock = sdhci_brcmstb_set_clock,

	.set_bus_width = sdhci_set_bus_width,
@@ -280,6 +304,11 @@ static struct brcmstb_match_priv match_priv_7445 = { 
	.ops = &sdhci_brcmstb_ops,

};



static struct brcmstb_match_priv match_priv_72116 = {

	.flags = BRCMSTB_MATCH_FLAGS_BROKEN_TIMEOUT,

	.ops = &sdhci_brcmstb_ops_72116,

};



static const struct brcmstb_match_priv match_priv_7216 = {

	.flags = BRCMSTB_MATCH_FLAGS_HAS_CLOCK_GATE,

	.hs400es = sdhci_brcmstb_hs400es,
@@ -296,6 +325,7 @@ static const struct of_device_id __maybe_unused sdhci_brcm_of_match[] = { 
	{ .compatible = "brcm,bcm2712-sdhci", .data = &match_priv_2712 },

	{ .compatible = "brcm,bcm7425-sdhci", .data = &match_priv_7425 },

	{ .compatible = "brcm,bcm7445-sdhci", .data = &match_priv_7445 },

	{ .compatible = "brcm,bcm72116-sdhci", .data = &match_priv_72116 },

	{ .compatible = "brcm,bcm7216-sdhci", .data = &match_priv_7216 },

	{ .compatible = "brcm,bcm74165b0-sdhci", .data = &match_priv_74165b0 },

	{},