Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mmc: sdhci-of-esdhc: support ESDHC_CAPABILITIES_1 accessing

Browse source 
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: Yangbo Lu <yangbo.lu@nxp.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
yangbo lu 2017-08-15 10:17:03 +08:00 committed by Ulf Hansson
parent 501639bf21
commit 2f3110cc89
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/mmc/host/sdhci-esdhc.h
View file

@ -54,6 +54,9 @@
#define ESDHC_CLOCK_HCKEN 0x00000002 #define ESDHC_CLOCK_HCKEN 0x00000002
#define ESDHC_CLOCK_IPGEN 0x00000001 #define ESDHC_CLOCK_IPGEN 0x00000001
/* Host Controller Capabilities Register 2 */
#define ESDHC_CAPABILITIES_1 0x114
/* Tuning Block Control Register */ /* Tuning Block Control Register */
#define ESDHC_TBCTL 0x120 #define ESDHC_TBCTL 0x120
#define ESDHC_TB_EN 0x00000004 #define ESDHC_TB_EN 0x00000004

23
drivers/mmc/host/sdhci-of-esdhc.c
View file

@ -86,6 +86,17 @@ static u32 esdhc_readl_fixup(struct sdhci_host *host,
return ret; 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; ret = value;
return ret; return ret;
} }
@ -249,7 +260,11 @@ static u32 esdhc_be_readl(struct sdhci_host *host, int reg)
u32 ret; u32 ret;
u32 value; u32 value;
value = ioread32be(host->ioaddr + reg); 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); ret = esdhc_readl_fixup(host, reg, value);
return ret; return ret;
@ -260,7 +275,11 @@ static u32 esdhc_le_readl(struct sdhci_host *host, int reg)
u32 ret; u32 ret;
u32 value; u32 value;
value = ioread32(host->ioaddr + reg); 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); ret = esdhc_readl_fixup(host, reg, value);
return ret; return ret;