aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2014-02-14 07:27:07 -0500
committerChris Ball <chris@printf.net>2014-02-22 13:50:54 -0500
commitb66bd0e4d00c89102851c1bc9a0f738a4ad9ca2d (patch)
tree13ea6c76f540b7050efb6ea9eb2746c7d30debc4
parentc42deffd5b53c9e583d83c7964854ede2f12410d (diff)
mmc: core: Add DT bindings for SD card's UHS bus speed modes
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.txt5
-rw-r--r--drivers/mmc/core/host.c10
2 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 458b57f199af..bd2ce67dbb9e 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -26,6 +26,11 @@ Optional properties:
26 this system, even if the controller claims it is. 26 this system, even if the controller claims it is.
27- cap-sd-highspeed: SD high-speed timing is supported 27- cap-sd-highspeed: SD high-speed timing is supported
28- cap-mmc-highspeed: MMC high-speed timing is supported 28- cap-mmc-highspeed: MMC high-speed timing is supported
29- sd-uhs-sdr12: SD UHS SDR12 speed is supported
30- sd-uhs-sdr25: SD UHS SDR25 speed is supported
31- sd-uhs-sdr50: SD UHS SDR50 speed is supported
32- sd-uhs-sdr104: SD UHS SDR104 speed is supported
33- sd-uhs-ddr50: SD UHS DDR50 speed is supported
29- cap-power-off-card: powering off the card is safe 34- cap-power-off-card: powering off the card is safe
30- cap-sdio-irq: enable SDIO IRQ signalling on this interface 35- cap-sdio-irq: enable SDIO IRQ signalling on this interface
31- full-pwr-cycle: full power cycle of the card is supported 36- full-pwr-cycle: full power cycle of the card is supported
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 49bc403e31f0..2644d91fd336 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -419,6 +419,16 @@ int mmc_of_parse(struct mmc_host *host)
419 host->caps |= MMC_CAP_SD_HIGHSPEED; 419 host->caps |= MMC_CAP_SD_HIGHSPEED;
420 if (of_find_property(np, "cap-mmc-highspeed", &len)) 420 if (of_find_property(np, "cap-mmc-highspeed", &len))
421 host->caps |= MMC_CAP_MMC_HIGHSPEED; 421 host->caps |= MMC_CAP_MMC_HIGHSPEED;
422 if (of_find_property(np, "sd-uhs-sdr12", &len))
423 host->caps |= MMC_CAP_UHS_SDR12;
424 if (of_find_property(np, "sd-uhs-sdr25", &len))
425 host->caps |= MMC_CAP_UHS_SDR25;
426 if (of_find_property(np, "sd-uhs-sdr50", &len))
427 host->caps |= MMC_CAP_UHS_SDR50;
428 if (of_find_property(np, "sd-uhs-sdr104", &len))
429 host->caps |= MMC_CAP_UHS_SDR104;
430 if (of_find_property(np, "sd-uhs-ddr50", &len))
431 host->caps |= MMC_CAP_UHS_DDR50;
422 if (of_find_property(np, "cap-power-off-card", &len)) 432 if (of_find_property(np, "cap-power-off-card", &len))
423 host->caps |= MMC_CAP_POWER_OFF_CARD; 433 host->caps |= MMC_CAP_POWER_OFF_CARD;
424 if (of_find_property(np, "cap-sdio-irq", &len)) 434 if (of_find_property(np, "cap-sdio-irq", &len))