* [PATCH] mmc: core: add runtime-resume caps to support resume at runtime_resume
@ 2015-02-05 11:06 ` Addy Ke
0 siblings, 0 replies; 10+ messages in thread
From: Addy Ke @ 2015-02-05 11:06 UTC (permalink / raw)
To: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
rdunlap, tgih.jun, jh80.chung, chris, ulf.hansson, dinguyen,
heiko, olof, dianders, sonnyrao, amstan
Cc: devicetree, linux-doc, linux-kernel, linux-mmc, linux-arm-kernel,
linux-rockchip, zhenfu.fang, cf, lintao, chenfen, zyf, xjq,
huangtao, zyw, yzq, hj, kever.yang, zhangqing, hl, Addy Ke
Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
---
Documentation/devicetree/bindings/mmc/mmc.txt | 11 +++++++++++
drivers/mmc/core/host.c | 2 ++
2 files changed, 13 insertions(+)
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 438899e..303b448 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -40,9 +40,20 @@ Optional properties:
- mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported
- mmc-hs400-1_8v: eMMC HS400 mode(1.8V I/O) is supported
- mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported
+- runtime-resume: resume at runtime_resume is supported
- dsr: Value the card's (optional) Driver Stage Register (DSR) should be
programmed with. Valid range: [0 .. 0xffff].
+Card power and reset control:
+The following properties can be specified for cases where the MMC
+peripheral needs additional reset, regulator and clock lines. It is for
+example common for WiFi/BT adapters to have these separate from the main
+MMC bus:
+ - card-reset-gpios: Specify GPIOs for card reset (reset active low)
+ - card-external-vcc-supply: Regulator to drive (independent) card VCC
+ - clock with name "card_ext_clock": External clock provided to the card
+>>>>>>> 0064e63... FROMLIST: mmc: core: add runtime-resume caps to support resume at runtime_resume
+
*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"
line levels. We choose to follow the SDHCI standard, which specifies both those
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 8be0df7..cb44c85 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -422,6 +422,8 @@ int mmc_of_parse(struct mmc_host *host)
host->caps |= MMC_CAP_POWER_OFF_CARD;
if (of_find_property(np, "cap-sdio-irq", &len))
host->caps |= MMC_CAP_SDIO_IRQ;
+ if (of_find_property(np, "runtime-resume", &len))
+ host->caps |= MMC_CAP_RUNTIME_RESUME;
if (of_find_property(np, "full-pwr-cycle", &len))
host->caps2 |= MMC_CAP2_FULL_PWR_CYCLE;
if (of_find_property(np, "keep-power-in-suspend", &len))
--
1.8.3.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH] mmc: core: add runtime-resume caps to support resume at runtime_resume
@ 2015-02-05 11:06 ` Addy Ke
0 siblings, 0 replies; 10+ messages in thread
From: Addy Ke @ 2015-02-05 11:06 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
---
Documentation/devicetree/bindings/mmc/mmc.txt | 11 +++++++++++
drivers/mmc/core/host.c | 2 ++
2 files changed, 13 insertions(+)
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 438899e..303b448 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -40,9 +40,20 @@ Optional properties:
- mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported
- mmc-hs400-1_8v: eMMC HS400 mode(1.8V I/O) is supported
- mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported
+- runtime-resume: resume at runtime_resume is supported
- dsr: Value the card's (optional) Driver Stage Register (DSR) should be
programmed with. Valid range: [0 .. 0xffff].
+Card power and reset control:
+The following properties can be specified for cases where the MMC
+peripheral needs additional reset, regulator and clock lines. It is for
+example common for WiFi/BT adapters to have these separate from the main
+MMC bus:
+ - card-reset-gpios: Specify GPIOs for card reset (reset active low)
+ - card-external-vcc-supply: Regulator to drive (independent) card VCC
+ - clock with name "card_ext_clock": External clock provided to the card
+>>>>>>> 0064e63... FROMLIST: mmc: core: add runtime-resume caps to support resume at runtime_resume
+
*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"
line levels. We choose to follow the SDHCI standard, which specifies both those
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 8be0df7..cb44c85 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -422,6 +422,8 @@ int mmc_of_parse(struct mmc_host *host)
host->caps |= MMC_CAP_POWER_OFF_CARD;
if (of_find_property(np, "cap-sdio-irq", &len))
host->caps |= MMC_CAP_SDIO_IRQ;
+ if (of_find_property(np, "runtime-resume", &len))
+ host->caps |= MMC_CAP_RUNTIME_RESUME;
if (of_find_property(np, "full-pwr-cycle", &len))
host->caps2 |= MMC_CAP2_FULL_PWR_CYCLE;
if (of_find_property(np, "keep-power-in-suspend", &len))
--
1.8.3.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] mmc: core: add runtime-resume caps to support resume at runtime_resume
2015-02-05 11:06 ` Addy Ke
@ 2015-02-05 11:20 ` Heiko Stübner
-1 siblings, 0 replies; 10+ messages in thread
From: Heiko Stübner @ 2015-02-05 11:20 UTC (permalink / raw)
To: Addy Ke
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
rdunlap, tgih.jun, jh80.chung, chris, ulf.hansson, dinguyen,
olof, dianders, sonnyrao, amstan, devicetree, linux-doc,
linux-kernel, linux-mmc, linux-arm-kernel, linux-rockchip,
zhenfu.fang, cf, lintao, chenfen, zyf, xjq, huangtao, zyw, yzq,
hj, kever.yang, zhangqing, hl
Hi Addy,
Am Donnerstag, 5. Februar 2015, 19:06:59 schrieb Addy Ke:
> Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
> ---
> Documentation/devicetree/bindings/mmc/mmc.txt | 11 +++++++++++
> drivers/mmc/core/host.c | 2 ++
> 2 files changed, 13 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt
> b/Documentation/devicetree/bindings/mmc/mmc.txt index 438899e..303b448
> 100644
> --- a/Documentation/devicetree/bindings/mmc/mmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/mmc.txt
> @@ -40,9 +40,20 @@ Optional properties:
> - mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported
> - mmc-hs400-1_8v: eMMC HS400 mode(1.8V I/O) is supported
> - mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported
> +- runtime-resume: resume at runtime_resume is supported
> - dsr: Value the card's (optional) Driver Stage Register (DSR) should be
> programmed with. Valid range: [0 .. 0xffff].
>
> +Card power and reset control:
> +The following properties can be specified for cases where the MMC
> +peripheral needs additional reset, regulator and clock lines. It is for
> +example common for WiFi/BT adapters to have these separate from the main
> +MMC bus:
> + - card-reset-gpios: Specify GPIOs for card reset (reset active low)
> + - card-external-vcc-supply: Regulator to drive (independent) card VCC
> + - clock with name "card_ext_clock": External clock provided to the card
> +>>>>>>> 0064e63... FROMLIST: mmc: core: add runtime-resume caps to support
you seem to have missed some merge artifacts here because your patch should
probably only insert the one runtime-resume line above.
Heiko
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] mmc: core: add runtime-resume caps to support resume at runtime_resume
@ 2015-02-05 11:20 ` Heiko Stübner
0 siblings, 0 replies; 10+ messages in thread
From: Heiko Stübner @ 2015-02-05 11:20 UTC (permalink / raw)
To: linux-arm-kernel
Hi Addy,
Am Donnerstag, 5. Februar 2015, 19:06:59 schrieb Addy Ke:
> Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
> ---
> Documentation/devicetree/bindings/mmc/mmc.txt | 11 +++++++++++
> drivers/mmc/core/host.c | 2 ++
> 2 files changed, 13 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt
> b/Documentation/devicetree/bindings/mmc/mmc.txt index 438899e..303b448
> 100644
> --- a/Documentation/devicetree/bindings/mmc/mmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/mmc.txt
> @@ -40,9 +40,20 @@ Optional properties:
> - mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported
> - mmc-hs400-1_8v: eMMC HS400 mode(1.8V I/O) is supported
> - mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported
> +- runtime-resume: resume at runtime_resume is supported
> - dsr: Value the card's (optional) Driver Stage Register (DSR) should be
> programmed with. Valid range: [0 .. 0xffff].
>
> +Card power and reset control:
> +The following properties can be specified for cases where the MMC
> +peripheral needs additional reset, regulator and clock lines. It is for
> +example common for WiFi/BT adapters to have these separate from the main
> +MMC bus:
> + - card-reset-gpios: Specify GPIOs for card reset (reset active low)
> + - card-external-vcc-supply: Regulator to drive (independent) card VCC
> + - clock with name "card_ext_clock": External clock provided to the card
> +>>>>>>> 0064e63... FROMLIST: mmc: core: add runtime-resume caps to support
you seem to have missed some merge artifacts here because your patch should
probably only insert the one runtime-resume line above.
Heiko
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mmc: core: add runtime-resume caps to support resume at runtime_resume
2015-02-05 11:06 ` Addy Ke
(?)
@ 2015-02-05 11:27 ` Mark Rutland
-1 siblings, 0 replies; 10+ messages in thread
From: Mark Rutland @ 2015-02-05 11:27 UTC (permalink / raw)
To: Addy Ke
Cc: robh+dt, Pawel Moll, ijc+devicetree, galak, rdunlap, tgih.jun,
jh80.chung, chris, ulf.hansson, dinguyen, heiko, olof, dianders,
sonnyrao, amstan, devicetree, linux-doc, linux-kernel, linux-mmc,
linux-arm-kernel, linux-rockchip, zhenfu.fang, cf, lintao,
chenfen, zyf, xjq, huangtao, zyw, yzq, hj, kever.yang, zhangqing,
hl
On Thu, Feb 05, 2015 at 11:06:59AM +0000, Addy Ke wrote:
> Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
> ---
> Documentation/devicetree/bindings/mmc/mmc.txt | 11 +++++++++++
> drivers/mmc/core/host.c | 2 ++
> 2 files changed, 13 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
> index 438899e..303b448 100644
> --- a/Documentation/devicetree/bindings/mmc/mmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/mmc.txt
> @@ -40,9 +40,20 @@ Optional properties:
> - mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported
> - mmc-hs400-1_8v: eMMC HS400 mode(1.8V I/O) is supported
> - mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported
> +- runtime-resume: resume at runtime_resume is supported
This reads like description of Linux internals (runtime_resume), which
shouldn't be in the DT.
What does this mean at the HW level? I'm sure we can find a better name
for this, or another way of describing this.
> - dsr: Value the card's (optional) Driver Stage Register (DSR) should be
> programmed with. Valid range: [0 .. 0xffff].
>
> +Card power and reset control:
> +The following properties can be specified for cases where the MMC
> +peripheral needs additional reset, regulator and clock lines. It is for
> +example common for WiFi/BT adapters to have these separate from the main
> +MMC bus:
> + - card-reset-gpios: Specify GPIOs for card reset (reset active low)
> + - card-external-vcc-supply: Regulator to drive (independent) card VCC
> + - clock with name "card_ext_clock": External clock provided to the card
Are these proeprties placed on the MMC controller node, or a sub-node
representing the card/slot?
Thanks,
Mark.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mmc: core: add runtime-resume caps to support resume at runtime_resume
@ 2015-02-05 11:27 ` Mark Rutland
0 siblings, 0 replies; 10+ messages in thread
From: Mark Rutland @ 2015-02-05 11:27 UTC (permalink / raw)
To: Addy Ke
Cc: robh+dt, Pawel Moll, ijc+devicetree, galak, rdunlap, tgih.jun,
jh80.chung, chris, ulf.hansson, dinguyen, heiko, olof, dianders,
sonnyrao, amstan, devicetree, linux-doc, linux-kernel, linux-mmc
On Thu, Feb 05, 2015 at 11:06:59AM +0000, Addy Ke wrote:
> Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
> ---
> Documentation/devicetree/bindings/mmc/mmc.txt | 11 +++++++++++
> drivers/mmc/core/host.c | 2 ++
> 2 files changed, 13 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
> index 438899e..303b448 100644
> --- a/Documentation/devicetree/bindings/mmc/mmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/mmc.txt
> @@ -40,9 +40,20 @@ Optional properties:
> - mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported
> - mmc-hs400-1_8v: eMMC HS400 mode(1.8V I/O) is supported
> - mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported
> +- runtime-resume: resume at runtime_resume is supported
This reads like description of Linux internals (runtime_resume), which
shouldn't be in the DT.
What does this mean at the HW level? I'm sure we can find a better name
for this, or another way of describing this.
> - dsr: Value the card's (optional) Driver Stage Register (DSR) should be
> programmed with. Valid range: [0 .. 0xffff].
>
> +Card power and reset control:
> +The following properties can be specified for cases where the MMC
> +peripheral needs additional reset, regulator and clock lines. It is for
> +example common for WiFi/BT adapters to have these separate from the main
> +MMC bus:
> + - card-reset-gpios: Specify GPIOs for card reset (reset active low)
> + - card-external-vcc-supply: Regulator to drive (independent) card VCC
> + - clock with name "card_ext_clock": External clock provided to the card
Are these proeprties placed on the MMC controller node, or a sub-node
representing the card/slot?
Thanks,
Mark.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] mmc: core: add runtime-resume caps to support resume at runtime_resume
@ 2015-02-05 11:27 ` Mark Rutland
0 siblings, 0 replies; 10+ messages in thread
From: Mark Rutland @ 2015-02-05 11:27 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Feb 05, 2015 at 11:06:59AM +0000, Addy Ke wrote:
> Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
> ---
> Documentation/devicetree/bindings/mmc/mmc.txt | 11 +++++++++++
> drivers/mmc/core/host.c | 2 ++
> 2 files changed, 13 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
> index 438899e..303b448 100644
> --- a/Documentation/devicetree/bindings/mmc/mmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/mmc.txt
> @@ -40,9 +40,20 @@ Optional properties:
> - mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported
> - mmc-hs400-1_8v: eMMC HS400 mode(1.8V I/O) is supported
> - mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported
> +- runtime-resume: resume at runtime_resume is supported
This reads like description of Linux internals (runtime_resume), which
shouldn't be in the DT.
What does this mean at the HW level? I'm sure we can find a better name
for this, or another way of describing this.
> - dsr: Value the card's (optional) Driver Stage Register (DSR) should be
> programmed with. Valid range: [0 .. 0xffff].
>
> +Card power and reset control:
> +The following properties can be specified for cases where the MMC
> +peripheral needs additional reset, regulator and clock lines. It is for
> +example common for WiFi/BT adapters to have these separate from the main
> +MMC bus:
> + - card-reset-gpios: Specify GPIOs for card reset (reset active low)
> + - card-external-vcc-supply: Regulator to drive (independent) card VCC
> + - clock with name "card_ext_clock": External clock provided to the card
Are these proeprties placed on the MMC controller node, or a sub-node
representing the card/slot?
Thanks,
Mark.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Re: [PATCH] mmc: core: add runtime-resume caps to support resume at runtime_resume
2015-02-05 11:27 ` Mark Rutland
(?)
(?)
@ 2015-02-05 11:44 ` addy.ke
-1 siblings, 0 replies; 10+ messages in thread
From: addy.ke @ 2015-02-05 11:44 UTC (permalink / raw)
To: Mark Rutland
Cc: robh+dt, Pawel Moll, ijc+devicetree, galak, rdunlap, tgih.jun,
jh80.chung, chris, ulf.hansson, dinguyen, Heiko Stübner,
olof, dianders, sonnyrao, amstan, devicetree, linux-doc,
linux-kernel, linux-mmc, linux-arm-kernel, linux-rockchip,
方镇福, "eddie(蔡枫)",
lintao, 陈奋, 赵仪峰,
许剑群, 黄涛,
钟勇汪, 姚智情,
hj@Rock-chips.com, 杨凯, '张晴',
hl
[-- Attachment #1: Type: text/plain, Size: 2788 bytes --]
Sorry, I will resend patch right now
From: Mark Rutland
Date: 2015-02-05 19:27
To: Addy Ke
CC: robh+dt@kernel.org; Pawel Moll; ijc+devicetree@hellion.org.uk; galak@codeaurora.org; rdunlap@infradead.org; tgih.jun@samsung.com; jh80.chung@samsung.com; chris@printf.net; ulf.hansson@linaro.org; dinguyen@altera.com; heiko@sntech.de; olof@lixom.net; dianders@chromium.org; sonnyrao@chromium.org; amstan@chromium.org; devicetree@vger.kernel.org; linux-doc@vger.kernel.org; linux-kernel@vger.kernel.org; linux-mmc@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-rockchip@lists.infradead.org; zhenfu.fang@rock-chips.com; cf@rock-chips.com; lintao@rock-chips.com; chenfen@rock-chips.com; zyf@rock-chips.com; xjq@rock-chips.com; huangtao@rock-chips.com; zyw@rock-chips.com; yzq@rock-chips.com; hj@rock-chips.com; kever.yang@rock-chips.com; zhangqing@rock-chips.com; hl@rock-chips.com
Subject: Re: [PATCH] mmc: core: add runtime-resume caps to support resume at runtime_resume
On Thu, Feb 05, 2015 at 11:06:59AM +0000, Addy Ke wrote:
> Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
> ---
> Documentation/devicetree/bindings/mmc/mmc.txt | 11 +++++++++++
> drivers/mmc/core/host.c | 2 ++
> 2 files changed, 13 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
> index 438899e..303b448 100644
> --- a/Documentation/devicetree/bindings/mmc/mmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/mmc.txt
> @@ -40,9 +40,20 @@ Optional properties:
> - mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported
> - mmc-hs400-1_8v: eMMC HS400 mode(1.8V I/O) is supported
> - mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported
> +- runtime-resume: resume at runtime_resume is supported
This reads like description of Linux internals (runtime_resume), which
shouldn't be in the DT.
What does this mean at the HW level? I'm sure we can find a better name
for this, or another way of describing this.
> - dsr: Value the card's (optional) Driver Stage Register (DSR) should be
> programmed with. Valid range: [0 .. 0xffff].
>
> +Card power and reset control:
> +The following properties can be specified for cases where the MMC
> +peripheral needs additional reset, regulator and clock lines. It is for
> +example common for WiFi/BT adapters to have these separate from the main
> +MMC bus:
> + - card-reset-gpios: Specify GPIOs for card reset (reset active low)
> + - card-external-vcc-supply: Regulator to drive (independent) card VCC
> + - clock with name "card_ext_clock": External clock provided to the card
Are these proeprties placed on the MMC controller node, or a sub-node
representing the card/slot?
Thanks,
Mark.
[-- Attachment #2: Type: text/html, Size: 6476 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2] mmc: core: add runtime-resume caps to support resume at runtime_resume
2015-02-05 11:06 ` Addy Ke
@ 2015-02-05 11:50 ` Addy Ke
-1 siblings, 0 replies; 10+ messages in thread
From: Addy Ke @ 2015-02-05 11:50 UTC (permalink / raw)
To: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
rdunlap, tgih.jun, jh80.chung, chris, ulf.hansson, dinguyen,
heiko, olof, dianders, sonnyrao, amstan
Cc: devicetree, linux-doc, linux-kernel, linux-mmc, linux-arm-kernel,
linux-rockchip, zhenfu.fang, cf, lintao, chenfen, zyf, xjq,
huangtao, zyw, yzq, hj, kever.yang, zhangqing, hl, Addy Ke
Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
---
Changes in v2:
- fix some typo
Documentation/devicetree/bindings/mmc/mmc.txt | 1 +
drivers/mmc/core/host.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 438899e..a7b800e 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -40,6 +40,7 @@ Optional properties:
- mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported
- mmc-hs400-1_8v: eMMC HS400 mode(1.8V I/O) is supported
- mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported
+- runtime-resume: resume at runtime_resume is supported
- dsr: Value the card's (optional) Driver Stage Register (DSR) should be
programmed with. Valid range: [0 .. 0xffff].
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 8be0df7..cb44c85 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -422,6 +422,8 @@ int mmc_of_parse(struct mmc_host *host)
host->caps |= MMC_CAP_POWER_OFF_CARD;
if (of_find_property(np, "cap-sdio-irq", &len))
host->caps |= MMC_CAP_SDIO_IRQ;
+ if (of_find_property(np, "runtime-resume", &len))
+ host->caps |= MMC_CAP_RUNTIME_RESUME;
if (of_find_property(np, "full-pwr-cycle", &len))
host->caps2 |= MMC_CAP2_FULL_PWR_CYCLE;
if (of_find_property(np, "keep-power-in-suspend", &len))
--
1.8.3.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2] mmc: core: add runtime-resume caps to support resume at runtime_resume
@ 2015-02-05 11:50 ` Addy Ke
0 siblings, 0 replies; 10+ messages in thread
From: Addy Ke @ 2015-02-05 11:50 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
---
Changes in v2:
- fix some typo
Documentation/devicetree/bindings/mmc/mmc.txt | 1 +
drivers/mmc/core/host.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 438899e..a7b800e 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -40,6 +40,7 @@ Optional properties:
- mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported
- mmc-hs400-1_8v: eMMC HS400 mode(1.8V I/O) is supported
- mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported
+- runtime-resume: resume at runtime_resume is supported
- dsr: Value the card's (optional) Driver Stage Register (DSR) should be
programmed with. Valid range: [0 .. 0xffff].
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 8be0df7..cb44c85 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -422,6 +422,8 @@ int mmc_of_parse(struct mmc_host *host)
host->caps |= MMC_CAP_POWER_OFF_CARD;
if (of_find_property(np, "cap-sdio-irq", &len))
host->caps |= MMC_CAP_SDIO_IRQ;
+ if (of_find_property(np, "runtime-resume", &len))
+ host->caps |= MMC_CAP_RUNTIME_RESUME;
if (of_find_property(np, "full-pwr-cycle", &len))
host->caps2 |= MMC_CAP2_FULL_PWR_CYCLE;
if (of_find_property(np, "keep-power-in-suspend", &len))
--
1.8.3.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-02-05 11:51 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-05 11:06 [PATCH] mmc: core: add runtime-resume caps to support resume at runtime_resume Addy Ke
2015-02-05 11:06 ` Addy Ke
2015-02-05 11:20 ` Heiko Stübner
2015-02-05 11:20 ` Heiko Stübner
2015-02-05 11:27 ` Mark Rutland
2015-02-05 11:27 ` Mark Rutland
2015-02-05 11:27 ` Mark Rutland
2015-02-05 11:44 ` addy.ke
2015-02-05 11:50 ` [PATCH v2] " Addy Ke
2015-02-05 11:50 ` Addy Ke
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.