* [PATCH 1/3] mmc: core: Add DT bindings for SD card's UHS bus speed modes
@ 2014-02-14 12:27 Ulf Hansson
2014-02-14 12:27 ` [PATCH 2/3] mmc: core: Add DT bindings for eMMC high-speed DDR 1.8/1.2V Ulf Hansson
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Ulf Hansson @ 2014-02-14 12:27 UTC (permalink / raw)
To: linux-mmc, Chris Ball; +Cc: Jaehoon Chung, devicetree, Ulf Hansson
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>
---
Documentation/devicetree/bindings/mmc/mmc.txt | 5 +++++
drivers/mmc/core/host.c | 10 ++++++++++
2 files changed, 15 insertions(+)
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 458b57f..bd2ce67 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -26,6 +26,11 @@ Optional properties:
this system, even if the controller claims it is.
- cap-sd-highspeed: SD high-speed timing is supported
- cap-mmc-highspeed: MMC high-speed timing is supported
+- sd-uhs-sdr12: SD UHS SDR12 speed is supported
+- sd-uhs-sdr25: SD UHS SDR25 speed is supported
+- sd-uhs-sdr50: SD UHS SDR50 speed is supported
+- sd-uhs-sdr104: SD UHS SDR104 speed is supported
+- sd-uhs-ddr50: SD UHS DDR50 speed is supported
- cap-power-off-card: powering off the card is safe
- cap-sdio-irq: enable SDIO IRQ signalling on this interface
- 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 49bc403..2644d91 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)
host->caps |= MMC_CAP_SD_HIGHSPEED;
if (of_find_property(np, "cap-mmc-highspeed", &len))
host->caps |= MMC_CAP_MMC_HIGHSPEED;
+ if (of_find_property(np, "sd-uhs-sdr12", &len))
+ host->caps |= MMC_CAP_UHS_SDR12;
+ if (of_find_property(np, "sd-uhs-sdr25", &len))
+ host->caps |= MMC_CAP_UHS_SDR25;
+ if (of_find_property(np, "sd-uhs-sdr50", &len))
+ host->caps |= MMC_CAP_UHS_SDR50;
+ if (of_find_property(np, "sd-uhs-sdr104", &len))
+ host->caps |= MMC_CAP_UHS_SDR104;
+ if (of_find_property(np, "sd-uhs-ddr50", &len))
+ host->caps |= MMC_CAP_UHS_DDR50;
if (of_find_property(np, "cap-power-off-card", &len))
host->caps |= MMC_CAP_POWER_OFF_CARD;
if (of_find_property(np, "cap-sdio-irq", &len))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] mmc: core: Add DT bindings for eMMC high-speed DDR 1.8/1.2V
2014-02-14 12:27 [PATCH 1/3] mmc: core: Add DT bindings for SD card's UHS bus speed modes Ulf Hansson
@ 2014-02-14 12:27 ` Ulf Hansson
2014-02-17 6:56 ` Jaehoon Chung
2014-02-14 12:27 ` [PATCH 3/3] mmc: core: Add DT bindings for eMMC HS200 1.8/1.2V Ulf Hansson
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Ulf Hansson @ 2014-02-14 12:27 UTC (permalink / raw)
To: linux-mmc, Chris Ball; +Cc: Jaehoon Chung, devicetree, Ulf Hansson
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>
---
Documentation/devicetree/bindings/mmc/mmc.txt | 2 ++
drivers/mmc/core/host.c | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index bd2ce67..519d952 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -34,6 +34,8 @@ Optional properties:
- cap-power-off-card: powering off the card is safe
- cap-sdio-irq: enable SDIO IRQ signalling on this interface
- full-pwr-cycle: full power cycle of the card is supported
+- mmc-highspeed-ddr-1_8v: eMMC high-speed DDR mode(1.8V I/O) is supported
+- mmc-highspeed-ddr-1_2v: eMMC high-speed DDR mode(1.2V I/O) is supported
*NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line
polarity 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 2644d91..d014127 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)
host->pm_caps |= MMC_PM_KEEP_POWER;
if (of_find_property(np, "enable-sdio-wakeup", &len))
host->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
+ if (of_find_property(np, "mmc-ddr-1_8v", &len))
+ host->caps |= MMC_CAP_1_8V_DDR;
+ if (of_find_property(np, "mmc-ddr-1_2v", &len))
+ host->caps |= MMC_CAP_1_2V_DDR;
return 0;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/3] mmc: core: Add DT bindings for eMMC high-speed DDR 1.8/1.2V
2014-02-14 12:27 ` [PATCH 2/3] mmc: core: Add DT bindings for eMMC high-speed DDR 1.8/1.2V Ulf Hansson
@ 2014-02-17 6:56 ` Jaehoon Chung
0 siblings, 0 replies; 6+ messages in thread
From: Jaehoon Chung @ 2014-02-17 6:56 UTC (permalink / raw)
To: Ulf Hansson, linux-mmc, Chris Ball; +Cc: Jaehoon Chung, devicetree
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Best Regards,
Jaehoon Chung
On 02/14/2014 09:27 PM, Ulf Hansson wrote:
> 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>
> ---
> Documentation/devicetree/bindings/mmc/mmc.txt | 2 ++
> drivers/mmc/core/host.c | 4 ++++
> 2 files changed, 6 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
> index bd2ce67..519d952 100644
> --- a/Documentation/devicetree/bindings/mmc/mmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/mmc.txt
> @@ -34,6 +34,8 @@ Optional properties:
> - cap-power-off-card: powering off the card is safe
> - cap-sdio-irq: enable SDIO IRQ signalling on this interface
> - full-pwr-cycle: full power cycle of the card is supported
> +- mmc-highspeed-ddr-1_8v: eMMC high-speed DDR mode(1.8V I/O) is supported
> +- mmc-highspeed-ddr-1_2v: eMMC high-speed DDR mode(1.2V I/O) is supported
>
> *NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line
> polarity 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 2644d91..d014127 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)
> host->pm_caps |= MMC_PM_KEEP_POWER;
> if (of_find_property(np, "enable-sdio-wakeup", &len))
> host->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
> + if (of_find_property(np, "mmc-ddr-1_8v", &len))
> + host->caps |= MMC_CAP_1_8V_DDR;
> + if (of_find_property(np, "mmc-ddr-1_2v", &len))
> + host->caps |= MMC_CAP_1_2V_DDR;
>
> return 0;
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] mmc: core: Add DT bindings for eMMC HS200 1.8/1.2V
2014-02-14 12:27 [PATCH 1/3] mmc: core: Add DT bindings for SD card's UHS bus speed modes Ulf Hansson
2014-02-14 12:27 ` [PATCH 2/3] mmc: core: Add DT bindings for eMMC high-speed DDR 1.8/1.2V Ulf Hansson
@ 2014-02-14 12:27 ` Ulf Hansson
2014-02-17 6:55 ` [PATCH 1/3] mmc: core: Add DT bindings for SD card's UHS bus speed modes Jaehoon Chung
2014-02-22 18:52 ` Chris Ball
3 siblings, 0 replies; 6+ messages in thread
From: Ulf Hansson @ 2014-02-14 12:27 UTC (permalink / raw)
To: linux-mmc, Chris Ball; +Cc: Jaehoon Chung, devicetree
From: Jaehoon Chung <jh80.chung@samsung.com>
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: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
---
Documentation/devicetree/bindings/mmc/mmc.txt | 2 ++
drivers/mmc/core/host.c | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 519d952..9dce540 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -36,6 +36,8 @@ Optional properties:
- full-pwr-cycle: full power cycle of the card is supported
- mmc-highspeed-ddr-1_8v: eMMC high-speed DDR mode(1.8V I/O) is supported
- mmc-highspeed-ddr-1_2v: eMMC high-speed DDR mode(1.2V I/O) is supported
+- mmc-hs200-1_8v: eMMC HS200 mode(1.8V I/O) is supported
+- mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported
*NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line
polarity 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 d014127..453573d 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -443,6 +443,10 @@ int mmc_of_parse(struct mmc_host *host)
host->caps |= MMC_CAP_1_8V_DDR;
if (of_find_property(np, "mmc-ddr-1_2v", &len))
host->caps |= MMC_CAP_1_2V_DDR;
+ if (of_find_property(np, "mmc-hs200-1_8v", &len))
+ host->caps2 |= MMC_CAP2_HS200_1_8V_SDR;
+ if (of_find_property(np, "mmc-hs200-1_2v", &len))
+ host->caps2 |= MMC_CAP2_HS200_1_2V_SDR;
return 0;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] mmc: core: Add DT bindings for SD card's UHS bus speed modes
2014-02-14 12:27 [PATCH 1/3] mmc: core: Add DT bindings for SD card's UHS bus speed modes Ulf Hansson
2014-02-14 12:27 ` [PATCH 2/3] mmc: core: Add DT bindings for eMMC high-speed DDR 1.8/1.2V Ulf Hansson
2014-02-14 12:27 ` [PATCH 3/3] mmc: core: Add DT bindings for eMMC HS200 1.8/1.2V Ulf Hansson
@ 2014-02-17 6:55 ` Jaehoon Chung
2014-02-22 18:52 ` Chris Ball
3 siblings, 0 replies; 6+ messages in thread
From: Jaehoon Chung @ 2014-02-17 6:55 UTC (permalink / raw)
To: Ulf Hansson, linux-mmc, Chris Ball; +Cc: Jaehoon Chung, devicetree
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Best Regards,
Jaehoon Chung
On 02/14/2014 09:27 PM, Ulf Hansson wrote:
> 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>
> ---
> Documentation/devicetree/bindings/mmc/mmc.txt | 5 +++++
> drivers/mmc/core/host.c | 10 ++++++++++
> 2 files changed, 15 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
> index 458b57f..bd2ce67 100644
> --- a/Documentation/devicetree/bindings/mmc/mmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/mmc.txt
> @@ -26,6 +26,11 @@ Optional properties:
> this system, even if the controller claims it is.
> - cap-sd-highspeed: SD high-speed timing is supported
> - cap-mmc-highspeed: MMC high-speed timing is supported
> +- sd-uhs-sdr12: SD UHS SDR12 speed is supported
> +- sd-uhs-sdr25: SD UHS SDR25 speed is supported
> +- sd-uhs-sdr50: SD UHS SDR50 speed is supported
> +- sd-uhs-sdr104: SD UHS SDR104 speed is supported
> +- sd-uhs-ddr50: SD UHS DDR50 speed is supported
> - cap-power-off-card: powering off the card is safe
> - cap-sdio-irq: enable SDIO IRQ signalling on this interface
> - 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 49bc403..2644d91 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)
> host->caps |= MMC_CAP_SD_HIGHSPEED;
> if (of_find_property(np, "cap-mmc-highspeed", &len))
> host->caps |= MMC_CAP_MMC_HIGHSPEED;
> + if (of_find_property(np, "sd-uhs-sdr12", &len))
> + host->caps |= MMC_CAP_UHS_SDR12;
> + if (of_find_property(np, "sd-uhs-sdr25", &len))
> + host->caps |= MMC_CAP_UHS_SDR25;
> + if (of_find_property(np, "sd-uhs-sdr50", &len))
> + host->caps |= MMC_CAP_UHS_SDR50;
> + if (of_find_property(np, "sd-uhs-sdr104", &len))
> + host->caps |= MMC_CAP_UHS_SDR104;
> + if (of_find_property(np, "sd-uhs-ddr50", &len))
> + host->caps |= MMC_CAP_UHS_DDR50;
> if (of_find_property(np, "cap-power-off-card", &len))
> host->caps |= MMC_CAP_POWER_OFF_CARD;
> if (of_find_property(np, "cap-sdio-irq", &len))
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] mmc: core: Add DT bindings for SD card's UHS bus speed modes
2014-02-14 12:27 [PATCH 1/3] mmc: core: Add DT bindings for SD card's UHS bus speed modes Ulf Hansson
` (2 preceding siblings ...)
2014-02-17 6:55 ` [PATCH 1/3] mmc: core: Add DT bindings for SD card's UHS bus speed modes Jaehoon Chung
@ 2014-02-22 18:52 ` Chris Ball
3 siblings, 0 replies; 6+ messages in thread
From: Chris Ball @ 2014-02-22 18:52 UTC (permalink / raw)
To: Ulf Hansson; +Cc: linux-mmc, Jaehoon Chung, devicetree
Hi Ulf,
On Fri, Feb 14 2014, Ulf Hansson wrote:
> 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>
Thanks, pushed all 3/3 to mmc-next for 3.15.
- Chris.
--
Chris Ball <chris@printf.net> <http://printf.net/>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-02-22 18:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-14 12:27 [PATCH 1/3] mmc: core: Add DT bindings for SD card's UHS bus speed modes Ulf Hansson
2014-02-14 12:27 ` [PATCH 2/3] mmc: core: Add DT bindings for eMMC high-speed DDR 1.8/1.2V Ulf Hansson
2014-02-17 6:56 ` Jaehoon Chung
2014-02-14 12:27 ` [PATCH 3/3] mmc: core: Add DT bindings for eMMC HS200 1.8/1.2V Ulf Hansson
2014-02-17 6:55 ` [PATCH 1/3] mmc: core: Add DT bindings for SD card's UHS bus speed modes Jaehoon Chung
2014-02-22 18:52 ` Chris Ball
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).