aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2014-02-14 07:27:08 -0500
committerChris Ball <chris@printf.net>2014-02-22 13:51:10 -0500
commitc0baf8485928b2db8a9530672d522d758746a2b6 (patch)
treec0bf4982b52ffca8ae77f9a3590f666590438873
parentb66bd0e4d00c89102851c1bc9a0f738a4ad9ca2d (diff)
mmc: core: Add DT bindings for eMMC high-speed DDR 1.8/1.2V
Provide the option to configure these speed modes per host, for those host driver's that can't distinguish this in runtime. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Chris Ball <chris@printf.net>
-rw-r--r--Documentation/devicetree/bindings/mmc/mmc.txt2
-rw-r--r--drivers/mmc/core/host.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index bd2ce67dbb9e..519d9523a413 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -34,6 +34,8 @@ Optional properties:
34- cap-power-off-card: powering off the card is safe 34- cap-power-off-card: powering off the card is safe
35- cap-sdio-irq: enable SDIO IRQ signalling on this interface 35- cap-sdio-irq: enable SDIO IRQ signalling on this interface
36- full-pwr-cycle: full power cycle of the card is supported 36- full-pwr-cycle: full power cycle of the card is supported
37- mmc-highspeed-ddr-1_8v: eMMC high-speed DDR mode(1.8V I/O) is supported
38- mmc-highspeed-ddr-1_2v: eMMC high-speed DDR mode(1.2V I/O) is supported
37 39
38*NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line 40*NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line
39polarity properties, we have to fix the meaning of the "normal" and "inverted" 41polarity properties, we have to fix the meaning of the "normal" and "inverted"
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 2644d91fd336..d014127f1043 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -439,6 +439,10 @@ int mmc_of_parse(struct mmc_host *host)
439 host->pm_caps |= MMC_PM_KEEP_POWER; 439 host->pm_caps |= MMC_PM_KEEP_POWER;
440 if (of_find_property(np, "enable-sdio-wakeup", &len)) 440 if (of_find_property(np, "enable-sdio-wakeup", &len))
441 host->pm_caps |= MMC_PM_WAKE_SDIO_IRQ; 441 host->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
442 if (of_find_property(np, "mmc-ddr-1_8v", &len))
443 host->caps |= MMC_CAP_1_8V_DDR;
444 if (of_find_property(np, "mmc-ddr-1_2v", &len))
445 host->caps |= MMC_CAP_1_2V_DDR;
442 446
443 return 0; 447 return 0;
444 448