Commit a0c938b5 authored by Paul Cercueil's avatar Paul Cercueil Committed by Ulf Hansson

mmc: jz4740: Add support for the JZ4725B

The JZ4725B is the first JZ SoC version that introduced a 32-bit IMASK
register, not the JZ4750.
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent f707079d
...@@ -7,6 +7,7 @@ described in mmc.txt. ...@@ -7,6 +7,7 @@ described in mmc.txt.
Required properties: Required properties:
- compatible: Should be one of the following: - compatible: Should be one of the following:
- "ingenic,jz4740-mmc" for the JZ4740 - "ingenic,jz4740-mmc" for the JZ4740
- "ingenic,jz4725b-mmc" for the JZ4725B
- "ingenic,jz4780-mmc" for the JZ4780 - "ingenic,jz4780-mmc" for the JZ4780
- reg: Should contain the MMC controller registers location and length. - reg: Should contain the MMC controller registers location and length.
- interrupts: Should contain the interrupt specifier of the MMC controller. - interrupts: Should contain the interrupt specifier of the MMC controller.
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
enum jz4740_mmc_version { enum jz4740_mmc_version {
JZ_MMC_JZ4740, JZ_MMC_JZ4740,
JZ_MMC_JZ4750, JZ_MMC_JZ4725B,
JZ_MMC_JZ4780, JZ_MMC_JZ4780,
}; };
...@@ -176,7 +176,7 @@ struct jz4740_mmc_host { ...@@ -176,7 +176,7 @@ struct jz4740_mmc_host {
static void jz4740_mmc_write_irq_mask(struct jz4740_mmc_host *host, static void jz4740_mmc_write_irq_mask(struct jz4740_mmc_host *host,
uint32_t val) uint32_t val)
{ {
if (host->version >= JZ_MMC_JZ4750) if (host->version >= JZ_MMC_JZ4725B)
return writel(val, host->base + JZ_REG_MMC_IMASK); return writel(val, host->base + JZ_REG_MMC_IMASK);
else else
return writew(val, host->base + JZ_REG_MMC_IMASK); return writew(val, host->base + JZ_REG_MMC_IMASK);
...@@ -1012,6 +1012,7 @@ static void jz4740_mmc_free_gpios(struct platform_device *pdev) ...@@ -1012,6 +1012,7 @@ static void jz4740_mmc_free_gpios(struct platform_device *pdev)
static const struct of_device_id jz4740_mmc_of_match[] = { static const struct of_device_id jz4740_mmc_of_match[] = {
{ .compatible = "ingenic,jz4740-mmc", .data = (void *) JZ_MMC_JZ4740 }, { .compatible = "ingenic,jz4740-mmc", .data = (void *) JZ_MMC_JZ4740 },
{ .compatible = "ingenic,jz4725b-mmc", .data = (void *)JZ_MMC_JZ4725B },
{ .compatible = "ingenic,jz4780-mmc", .data = (void *) JZ_MMC_JZ4780 }, { .compatible = "ingenic,jz4780-mmc", .data = (void *) JZ_MMC_JZ4780 },
{}, {},
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment