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

Commit 2f3110cc authored by yangbo lu's avatar yangbo lu Committed by Ulf Hansson
Browse files

mmc: sdhci-of-esdhc: support ESDHC_CAPABILITIES_1 accessing 



eSDHC is not a standard SD host controller. SDHCI_CAPABILITIES_1
register address is 0x44 while it's 0x114 (ESDHC_CAPABILITIES_1)
for eSDHC.

Signed-off-by: default avatarYangbo Lu <yangbo.lu@nxp.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 501639bf

drivers/mmc/host/sdhci-esdhc.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ 
#define ESDHC_CLOCK_HCKEN		0x00000002

#define ESDHC_CLOCK_IPGEN		0x00000001



/* Host Controller Capabilities Register 2 */

#define ESDHC_CAPABILITIES_1		0x114



/* Tuning Block Control Register */

#define ESDHC_TBCTL			0x120

#define ESDHC_TB_EN			0x00000004

drivers/mmc/host/sdhci-of-esdhc.c

+21 −2
Original line number Diff line number Diff line
@@ -86,6 +86,17 @@ static u32 esdhc_readl_fixup(struct sdhci_host *host, 
		return ret;

	}



	/*

	 * DTS properties of mmc host are used to enable each speed mode

	 * according to soc and board capability. So clean up

	 * SDR50/SDR104/DDR50 support bits here.

	 */

	if (spec_reg == SDHCI_CAPABILITIES_1) {

		ret = value & ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_SDR104 |

				SDHCI_SUPPORT_DDR50);

		return ret;

	}



	ret = value;

	return ret;

}
@@ -249,7 +260,11 @@ static u32 esdhc_be_readl(struct sdhci_host *host, int reg) 
	u32 ret;

	u32 value;



	if (reg == SDHCI_CAPABILITIES_1)

		value = ioread32be(host->ioaddr + ESDHC_CAPABILITIES_1);

	else

		value = ioread32be(host->ioaddr + reg);



	ret = esdhc_readl_fixup(host, reg, value);



	return ret;
@@ -260,7 +275,11 @@ static u32 esdhc_le_readl(struct sdhci_host *host, int reg) 
	u32 ret;

	u32 value;



	if (reg == SDHCI_CAPABILITIES_1)

		value = ioread32(host->ioaddr + ESDHC_CAPABILITIES_1);

	else

		value = ioread32(host->ioaddr + reg);



	ret = esdhc_readl_fixup(host, reg, value);



	return ret;