devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH/RFC] mmc: add DT bindings for more MMC capability flags
@ 2013-01-23 16:45 Guennadi Liakhovetski
  2013-02-06 15:15 ` Mark Rutland
  0 siblings, 1 reply; 6+ messages in thread
From: Guennadi Liakhovetski @ 2013-01-23 16:45 UTC (permalink / raw)
  To: linux-mmc; +Cc: Chris Ball, devicetree-discuss, Magnus Damm

Many MMC capability flags are platform-dependent and are traditionally set
in platform data. With DT often each such capability requires a special
binding. Add bindings for MMC_CAP_SD_HIGHSPEED, MMC_CAP_MMC_HIGHSPEED and
MMC_CAP_POWER_OFF_CARD capabilities. Also add code to DT parser to look
up "keep-power-in-suspend" and "enable-sdio-wakeup" bindings and set
MMC_PM_KEEP_POWER and MMC_PM_WAKE_SDIO_IRQ respectively, if found.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---

Attention: contains new DT bindings, please, comment!

 Documentation/devicetree/bindings/mmc/mmc.txt |    5 ++++-
 drivers/mmc/core/host.c                       |   11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index e180892..92ec534c 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -25,8 +25,11 @@ Optional properties:
 - max-frequency: maximum operating clock frequency
 - no-1-8-v: when present, denotes that 1.8v card voltage is not supported on
   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
+- cap-power-off-card: powering off the card is safe
 
-cd-inverted and wp-inverted properties are deprecated ans shouldn't be used,
+cd-inverted and wp-inverted properties are deprecated and shouldn't be used,
 instead pleaseuse the OF_GPIO_ACTIVE_LOW flag in respective GPIO bindings. Note,
 that the default (as defined by the SDHCI standard) CD and WP polarity is
 active-low, so, OF_GPIO_ACTIVE_LOW should normally be set, and only be left
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index e4c1cbd..f3ea268 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -372,6 +372,17 @@ void mmc_of_parse(struct mmc_host *host)
 			dev_err(host->parent,
 				"Failed to request WP GPIO: %d!\n", ret);
 	}
+
+	if (of_find_property(np, "cap-sd-highspeed", &len))
+		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, "cap-power-off-card", &len))
+		host->caps |= MMC_CAP_POWER_OFF_CARD;
+	if (of_find_property(np, "keep-power-in-suspend", &len))
+		host->pm_caps |= MMC_PM_KEEP_POWER;
+	if (of_find_property(np, "enable-sdio-wakeup", &len))
+		host->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
 }
 
 EXPORT_SYMBOL(mmc_of_parse);
-- 
1.7.2.5


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-02-07  0:44 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-23 16:45 [PATCH/RFC] mmc: add DT bindings for more MMC capability flags Guennadi Liakhovetski
2013-02-06 15:15 ` Mark Rutland
2013-02-06 16:25   ` Guennadi Liakhovetski
2013-02-07  0:44     ` Arnd Bergmann
2013-02-06 17:32       ` Guennadi Liakhovetski
2013-02-06 22:00         ` Arnd Bergmann

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).