All of lore.kernel.org
 help / color / mirror / Atom feed
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
To: linux-mmc@vger.kernel.org
Cc: linux-sh@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>
Subject: [PATCH 03/11] mmc: provide a standard MMC device-tree binding parser centrally
Date: Wed, 16 Jan 2013 16:54:38 +0000	[thread overview]
Message-ID: <1358355286-26029-4-git-send-email-g.liakhovetski@gmx.de> (raw)
In-Reply-To: <1358355286-26029-1-git-send-email-g.liakhovetski@gmx.de>

MMC defines a number of standard DT bindings. Having each driver parse
them individually adds code redundancy and is error prone. Provide a
standard function to unify the parsing. After all drivers are converted
to using it instead of their own parsers, this function can be integrated
into mmc_alloc_host().

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

MMC host drivers are welcome and encouraged to use this helper function:-)

 drivers/mmc/core/host.c  |   82 ++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/mmc/host.h |    1 +
 2 files changed, 83 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index ee2e16b..e4c1cbd 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -15,6 +15,8 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/idr.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
 #include <linux/pagemap.h>
 #include <linux/export.h>
 #include <linux/leds.h>
@@ -23,6 +25,7 @@
 
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
+#include <linux/mmc/slot-gpio.h>
 
 #include "core.h"
 #include "host.h"
@@ -294,6 +297,85 @@ static inline void mmc_host_clk_sysfs_init(struct mmc_host *host)
 
 #endif
 
+void mmc_of_parse(struct mmc_host *host)
+{
+	struct device_node *np;
+	u32 bus_width;
+	bool legacy_inv_cd, legacy_inv_wp;
+	enum of_gpio_flags flags;
+	int len, ret, gpio;
+
+	if (!host->parent || !host->parent->of_node)
+		return;
+
+	np = host->parent->of_node;
+
+	/* Both CD and WP pins are by default active low */
+
+	legacy_inv_cd = !!of_find_property(np, "cd-inverted", &len);
+	legacy_inv_wp = !!of_find_property(np, "wp-inverted", &len);
+
+	if (legacy_inv_cd || legacy_inv_wp)
+		dev_warn(host->parent,
+			 "\"cd-/wp-inverted\" properties are deprecated, use GPIO flags");
+
+	if (of_property_read_u32_array(np, "bus-width", &bus_width, 1) < 0) {
+		dev_err(host->parent,
+			"Compulsory \"bus-width\" property is missing!\n");
+		return;
+	}
+
+	switch (bus_width) {
+	case 8:
+		host->caps |= MMC_CAP_8_BIT_DATA;
+		/* Hosts, capable of 8-bit transfers can also do 4 bits */
+	case 4:
+		host->caps |= MMC_CAP_4_BIT_DATA;
+		break;
+	case 1:
+		break;
+	default:
+		dev_err(host->parent,
+			"Invalid \"bus-width\" value %ud!\n", bus_width);
+	}
+
+	/* Optional property: ignore errors */
+	of_property_read_u32_array(np, "max-frequency", &host->f_max, 1);
+
+	if (of_find_property(np, "non-removable", &len)) {
+		host->caps |= MMC_CAP_NONREMOVABLE;
+	} else {
+		if (of_find_property(np, "broken-cd", &len))
+			host->caps |= MMC_CAP_NEEDS_POLL;
+
+		gpio = of_get_named_gpio_flags(np, "cd-gpios", 0, &flags);
+		if (gpio_is_valid(gpio)) {
+			if (legacy_inv_cd || !(flags & OF_GPIO_ACTIVE_LOW))
+				host->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH;
+			ret = mmc_gpio_request_cd(host, gpio);
+			if (ret < 0)
+				dev_err(host->parent,
+					"Failed to request CD GPIO #%d: %d!\n",
+					gpio, ret);
+			else
+				dev_info(host->parent, "Got CD GPIO #%d.\n",
+					 gpio);
+		}
+	}
+
+	gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags);
+	if (gpio_is_valid(gpio)) {
+		if (legacy_inv_wp || !(flags & OF_GPIO_ACTIVE_LOW))
+			host->caps2 |= MMC_CAP2_RO_ACTIVE_HIGH;
+		ret = mmc_gpio_request_ro(host, gpio);
+		if (ret < 0)
+			dev_err(host->parent,
+				"Failed to request WP GPIO: %d!\n", ret);
+	}
+}
+
+EXPORT_SYMBOL(mmc_of_parse);
+
 /**
  *	mmc_alloc_host - initialise the per-host structure.
  *	@extra: sizeof private data structure
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 61a10c1..13c0c8d 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -345,6 +345,7 @@ extern struct mmc_host *mmc_alloc_host(int extra, struct device *);
 extern int mmc_add_host(struct mmc_host *);
 extern void mmc_remove_host(struct mmc_host *);
 extern void mmc_free_host(struct mmc_host *);
+void mmc_of_parse(struct mmc_host *host);
 
 static inline void *mmc_priv(struct mmc_host *host)
 {
-- 
1.7.2.5


WARNING: multiple messages have this Message-ID
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
To: linux-mmc@vger.kernel.org
Cc: linux-sh@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>
Subject: [PATCH 03/11] mmc: provide a standard MMC device-tree binding parser centrally
Date: Wed, 16 Jan 2013 17:54:38 +0100	[thread overview]
Message-ID: <1358355286-26029-4-git-send-email-g.liakhovetski@gmx.de> (raw)
In-Reply-To: <1358355286-26029-1-git-send-email-g.liakhovetski@gmx.de>

MMC defines a number of standard DT bindings. Having each driver parse
them individually adds code redundancy and is error prone. Provide a
standard function to unify the parsing. After all drivers are converted
to using it instead of their own parsers, this function can be integrated
into mmc_alloc_host().

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

MMC host drivers are welcome and encouraged to use this helper function:-)

 drivers/mmc/core/host.c  |   82 ++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/mmc/host.h |    1 +
 2 files changed, 83 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index ee2e16b..e4c1cbd 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -15,6 +15,8 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/idr.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
 #include <linux/pagemap.h>
 #include <linux/export.h>
 #include <linux/leds.h>
@@ -23,6 +25,7 @@
 
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
+#include <linux/mmc/slot-gpio.h>
 
 #include "core.h"
 #include "host.h"
@@ -294,6 +297,85 @@ static inline void mmc_host_clk_sysfs_init(struct mmc_host *host)
 
 #endif
 
+void mmc_of_parse(struct mmc_host *host)
+{
+	struct device_node *np;
+	u32 bus_width;
+	bool legacy_inv_cd, legacy_inv_wp;
+	enum of_gpio_flags flags;
+	int len, ret, gpio;
+
+	if (!host->parent || !host->parent->of_node)
+		return;
+
+	np = host->parent->of_node;
+
+	/* Both CD and WP pins are by default active low */
+
+	legacy_inv_cd = !!of_find_property(np, "cd-inverted", &len);
+	legacy_inv_wp = !!of_find_property(np, "wp-inverted", &len);
+
+	if (legacy_inv_cd || legacy_inv_wp)
+		dev_warn(host->parent,
+			 "\"cd-/wp-inverted\" properties are deprecated, use GPIO flags");
+
+	if (of_property_read_u32_array(np, "bus-width", &bus_width, 1) < 0) {
+		dev_err(host->parent,
+			"Compulsory \"bus-width\" property is missing!\n");
+		return;
+	}
+
+	switch (bus_width) {
+	case 8:
+		host->caps |= MMC_CAP_8_BIT_DATA;
+		/* Hosts, capable of 8-bit transfers can also do 4 bits */
+	case 4:
+		host->caps |= MMC_CAP_4_BIT_DATA;
+		break;
+	case 1:
+		break;
+	default:
+		dev_err(host->parent,
+			"Invalid \"bus-width\" value %ud!\n", bus_width);
+	}
+
+	/* Optional property: ignore errors */
+	of_property_read_u32_array(np, "max-frequency", &host->f_max, 1);
+
+	if (of_find_property(np, "non-removable", &len)) {
+		host->caps |= MMC_CAP_NONREMOVABLE;
+	} else {
+		if (of_find_property(np, "broken-cd", &len))
+			host->caps |= MMC_CAP_NEEDS_POLL;
+
+		gpio = of_get_named_gpio_flags(np, "cd-gpios", 0, &flags);
+		if (gpio_is_valid(gpio)) {
+			if (legacy_inv_cd || !(flags & OF_GPIO_ACTIVE_LOW))
+				host->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH;
+			ret = mmc_gpio_request_cd(host, gpio);
+			if (ret < 0)
+				dev_err(host->parent,
+					"Failed to request CD GPIO #%d: %d!\n",
+					gpio, ret);
+			else
+				dev_info(host->parent, "Got CD GPIO #%d.\n",
+					 gpio);
+		}
+	}
+
+	gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags);
+	if (gpio_is_valid(gpio)) {
+		if (legacy_inv_wp || !(flags & OF_GPIO_ACTIVE_LOW))
+			host->caps2 |= MMC_CAP2_RO_ACTIVE_HIGH;
+		ret = mmc_gpio_request_ro(host, gpio);
+		if (ret < 0)
+			dev_err(host->parent,
+				"Failed to request WP GPIO: %d!\n", ret);
+	}
+}
+
+EXPORT_SYMBOL(mmc_of_parse);
+
 /**
  *	mmc_alloc_host - initialise the per-host structure.
  *	@extra: sizeof private data structure
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 61a10c1..13c0c8d 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -345,6 +345,7 @@ extern struct mmc_host *mmc_alloc_host(int extra, struct device *);
 extern int mmc_add_host(struct mmc_host *);
 extern void mmc_remove_host(struct mmc_host *);
 extern void mmc_free_host(struct mmc_host *);
+void mmc_of_parse(struct mmc_host *host);
 
 static inline void *mmc_priv(struct mmc_host *host)
 {
-- 
1.7.2.5


  parent reply	other threads:[~2013-01-16 16:54 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-16 16:54 [PATCH 00/11] mmc: core and driver DT and related development Guennadi Liakhovetski
2013-01-16 16:54 ` Guennadi Liakhovetski
2013-01-16 16:54 ` [PATCH 01/11] mmc: sdhi, tmio: only check flags in tmio-mmc driver proper Guennadi Liakhovetski
2013-01-16 16:54   ` Guennadi Liakhovetski
2013-01-16 16:54 ` [PATCH 02/11] mmc: deprecate redundant cd-inverted and wp-inverted DT properties Guennadi Liakhovetski
2013-01-16 16:54   ` Guennadi Liakhovetski
2013-01-16 16:54 ` Guennadi Liakhovetski [this message]
2013-01-16 16:54   ` [PATCH 03/11] mmc: provide a standard MMC device-tree binding parser centrally Guennadi Liakhovetski
2013-01-16 16:54 ` [PATCH 04/11] mmc: (cosmetic) remove "extern" from function declarations Guennadi Liakhovetski
2013-01-16 16:54   ` Guennadi Liakhovetski
2013-01-16 16:54 ` [PATCH 05/11] mmc: sh-mmcif: use mmc_of_parse() to parse standard MMC DT bindings Guennadi Liakhovetski
2013-01-16 16:54   ` Guennadi Liakhovetski
2013-01-16 16:54 ` [PATCH/RFC 06/11] mmc: tmio-mmc: define device-tree bindings Guennadi Liakhovetski
2013-01-16 16:54   ` Guennadi Liakhovetski
2013-01-16 16:54 ` [PATCH 07/11] mmc: tmio-mmc: parse " Guennadi Liakhovetski
2013-01-16 16:54   ` Guennadi Liakhovetski
2013-01-16 16:54 ` [PATCH 08/11] mmc: sh_mobile_sdhi: remove unused .pdata field Guennadi Liakhovetski
2013-01-16 16:54   ` Guennadi Liakhovetski
2013-01-16 16:54 ` [PATCH 09/11] mmc: sh_mobile_sdhi: use managed resource allocations Guennadi Liakhovetski
2013-01-16 16:54   ` Guennadi Liakhovetski
2013-01-16 16:54 ` [PATCH 10/11] mmc: tmio: remove unused and deprecated symbols Guennadi Liakhovetski
2013-01-16 16:54   ` Guennadi Liakhovetski
2013-01-16 16:54 ` [PATCH 11/11] mmc: tmio: add support for the VccQ regulator Guennadi Liakhovetski
2013-01-16 16:54   ` Guennadi Liakhovetski

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=1358355286-26029-4-git-send-email-g.liakhovetski@gmx.de \
    --to=g.liakhovetski@gmx.de \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=magnus.damm@gmail.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: link
Be 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.