devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>,
	Linus Walleij
	<linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Subject: [PATCH V3 04/19] mmc: mmci: Add DT bindings for signal direction
Date: Thu, 10 Apr 2014 14:20:47 +0200	[thread overview]
Message-ID: <1397132462-8005-5-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1397132462-8005-1-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

Some variants have support for indicating the bus signal directions,
which currently are configured through platform data.

Add corresponding DT bindings to enable us to move away from using the
platform data.

Signed-off-by: Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Reviewed-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
 Documentation/devicetree/bindings/mmc/mmci.txt |   11 ++++++++++-
 drivers/mmc/host/mmci.c                        |   11 +++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/mmc/mmci.txt b/Documentation/devicetree/bindings/mmc/mmci.txt
index ff233d1..9bd2ffa 100644
--- a/Documentation/devicetree/bindings/mmc/mmci.txt
+++ b/Documentation/devicetree/bindings/mmc/mmci.txt
@@ -4,7 +4,8 @@ The ARM PrimeCell MMCI PL180 and PL181 provides an interface for
 reading and writing to MultiMedia and SD cards alike.
 
 This file documents differences between the core properties described
-by mmc.txt and the properties used by the mmci driver.
+by mmc.txt and the properties used by the mmci driver. Using "st" as
+the prefix for a property, indicates support by the ST Micro variant.
 
 Required properties:
 - compatible             : contains "arm,pl18x", "arm,primecell".
@@ -18,6 +19,11 @@ Optional properties:
 - mmc-cap-sd-highspeed   : indicates whether SD is high speed capable.
 - vqmmc-supply           : phandle to the regulator device tree node, mentioned
                            as the VCCQ/VDD_IO supply in the eMMC/SD specs.
+- st,sig-dir-dat0        : bus signal direction pin used for DAT[0].
+- st,sig-dir-dat2        : bus signal direction pin used for DAT[2].
+- st,sig-dir-dat31       : bus signal direction pin used for DAT[3] and DAT[1].
+- st,sig-dir-dat74       : bus signal direction pin used for DAT[4] to DAT[7].
+- st,sig-dir-cmd         : cmd signal direction pin used for CMD.
 
 Example:
 
@@ -38,6 +44,9 @@ sdi0_per1@80126000 {
 	mmc-cap-sd-highspeed;
 	mmc-cap-mmc-highspeed;
 	cd-gpios  = <&gpio2 31 0x4>; // 95
+	st,sig-dir-dat0;
+	st,sig-dir-dat2;
+	st,sig-dir-cmd;
 
 	vmmc-supply = <&ab8500_ldo_aux3_reg>;
 	vqmmc-supply = <&vmmci>;
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 93b1b10..2766e5c 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1392,6 +1392,17 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np,
 {
 	int bus_width = 0;
 
+	if (of_get_property(np, "st,sig-dir-dat0", NULL))
+		pdata->sigdir |= MCI_ST_DATA0DIREN;
+	if (of_get_property(np, "st,sig-dir-dat2", NULL))
+		pdata->sigdir |= MCI_ST_DATA2DIREN;
+	if (of_get_property(np, "st,sig-dir-dat31", NULL))
+		pdata->sigdir |= MCI_ST_DATA31DIREN;
+	if (of_get_property(np, "st,sig-dir-dat74", NULL))
+		pdata->sigdir |= MCI_ST_DATA74DIREN;
+	if (of_get_property(np, "st,sig-dir-cmd", NULL))
+		pdata->sigdir |= MCI_ST_CMDDIREN;
+
 	pdata->gpio_wp = of_get_named_gpio(np, "wp-gpios", 0);
 	pdata->gpio_cd = of_get_named_gpio(np, "cd-gpios", 0);
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2014-04-10 12:20 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-10 12:20 [PATCH V3 00/19] mmc: mmci: Improve DT support Ulf Hansson
     [not found] ` <1397132462-8005-1-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-04-10 12:20   ` [PATCH V3 01/19] mmc: mmci: Convert to the mmc gpio API Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 02/19] mmc: mmci: Convert to devm functions Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 03/19] mmc: mmci: Update DT documentation Ulf Hansson
2014-04-10 12:20   ` Ulf Hansson [this message]
2014-04-10 12:20   ` [PATCH V3 05/19] mmc: mmci: Add DT bindings for feedback clock pin Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 06/19] mmc: mmci: Use the common mmc DT parser Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 07/19] ARM: ux500: Add mmci signal directions and feeback clock in DT for href Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 08/19] ARM: ux500: Convert to the common mmc DT bindings for highspeed mode Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 09/19] ARM: nomadik: " Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 10/19] ARM: u300: " Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 11/19] mmc: mmci: Mark the DT bindings for highspeed mode as deprecated Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 12/19] mmc: mmci: Enable MMC_CAP_CMD23 Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 13/19] ARM: ux500: Add the mmc capabilities flags to DT Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 14/19] ARM: ux500: Add a vmmc regulator through DT for the poped eMMC for href Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 15/19] ARM: ux500: Remove redundant board file for mmci platform data Ulf Hansson
2014-04-10 12:20   ` [PATCH V3 16/19] mmc: mmci: Enforce DT for signal direction and feedback clock Ulf Hansson
2014-04-10 12:21   ` [PATCH V3 17/19] mmc: mmci: Enforce mmc capabilities through DT Ulf Hansson
2014-04-10 12:21   ` [PATCH V3 18/19] mmc: mmci: Enforce DMA configuration " Ulf Hansson
     [not found]     ` <1397132462-8005-19-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-05-20  4:24       ` Ulf Hansson
2014-04-10 12:21   ` [PATCH V3 19/19] mmc: mmci: Enforce max frequency " Ulf Hansson
2014-04-10 12:26   ` [PATCH V3 00/19] mmc: mmci: Improve DT support Ulf Hansson

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=1397132462-8005-5-git-send-email-ulf.hansson@linaro.org \
    --to=ulf.hansson-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).