From: Addy Ke <addy.ke@rock-chips.com> To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, 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 Cc: 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, Addy Ke <addy.ke@rock-chips.com> Subject: [PATCH] mmc: core: add runtime-resume caps to support resume at runtime_resume Date: Thu, 5 Feb 2015 19:06:59 +0800 [thread overview] Message-ID: <1423134419-23109-1-git-send-email-addy.ke@rock-chips.com> (raw) 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
WARNING: multiple messages have this Message-ID (diff)
From: addy.ke@rock-chips.com (Addy Ke) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] mmc: core: add runtime-resume caps to support resume at runtime_resume Date: Thu, 5 Feb 2015 19:06:59 +0800 [thread overview] Message-ID: <1423134419-23109-1-git-send-email-addy.ke@rock-chips.com> (raw) 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
next reply other threads:[~2015-02-05 11:09 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-02-05 11:06 Addy Ke [this message] 2015-02-05 11:06 ` [PATCH] mmc: core: add runtime-resume caps to support resume at runtime_resume 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
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1423134419-23109-1-git-send-email-addy.ke@rock-chips.com \ --to=addy.ke@rock-chips.com \ --cc=amstan@chromium.org \ --cc=cf@rock-chips.com \ --cc=chenfen@rock-chips.com \ --cc=chris@printf.net \ --cc=devicetree@vger.kernel.org \ --cc=dianders@chromium.org \ --cc=dinguyen@altera.com \ --cc=galak@codeaurora.org \ --cc=heiko@sntech.de \ --cc=hj@rock-chips.com \ --cc=hl@rock-chips.com \ --cc=huangtao@rock-chips.com \ --cc=ijc+devicetree@hellion.org.uk \ --cc=jh80.chung@samsung.com \ --cc=kever.yang@rock-chips.com \ --cc=lintao@rock-chips.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=mark.rutland@arm.com \ --cc=olof@lixom.net \ --cc=pawel.moll@arm.com \ --cc=rdunlap@infradead.org \ --cc=robh+dt@kernel.org \ --cc=sonnyrao@chromium.org \ --cc=tgih.jun@samsung.com \ --cc=ulf.hansson@linaro.org \ --cc=xjq@rock-chips.com \ --cc=yzq@rock-chips.com \ --cc=zhangqing@rock-chips.com \ --cc=zhenfu.fang@rock-chips.com \ --cc=zyf@rock-chips.com \ --cc=zyw@rock-chips.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.