mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v2 04/11] mci: Allow parsing for explicit DT node
Date: Thu, 16 Mar 2017 08:04:41 -0700	[thread overview]
Message-ID: <20170316150448.11773-5-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20170316150448.11773-1-andrew.smirnov@gmail.com>

Convert mci_of_parse into mci_of_parse_node, a function that takes
explicit deivce tree node pointer to be used for SD/MMC related
properties extraction. Implement original mci_of_parse as a wrapper
around the call to new function.

This is useful for controllers who specify parameter like bus witdth and
GPIOs as a part of main controller's child nodes (e.g. AT91 SoCs).

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/mci/mci-core.c | 13 ++++++++-----
 include/mci.h          |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index 055a5e2..928277a 100644
--- a/drivers/mci/mci-core.c
+++ b/drivers/mci/mci-core.c
@@ -1843,20 +1843,18 @@ err_free:
 	return ret;
 }
 
-void mci_of_parse(struct mci_host *host)
+void mci_of_parse_node(struct mci_host *host,
+		       struct device_node *np)
 {
-	struct device_node *np;
 	u32 bus_width;
 	u32 dsr_val;
 
 	if (!IS_ENABLED(CONFIG_OFDEVICE))
 		return;
 
-	if (!host->hw_dev || !host->hw_dev->device_node)
+	if (!host->hw_dev || !np)
 		return;
 
-	np = host->hw_dev->device_node;
-
 	/* "bus-width" is translated to MMC_CAP_*_BIT_DATA flags */
 	if (of_property_read_u32(np, "bus-width", &bus_width) < 0) {
 		/* If bus-width is missing we get the driver's default, which
@@ -1897,6 +1895,11 @@ void mci_of_parse(struct mci_host *host)
 	host->non_removable = of_property_read_bool(np, "non-removable");
 }
 
+void mci_of_parse(struct mci_host *host)
+{
+	return mci_of_parse_node(host, host->hw_dev->device_node);
+}
+
 struct mci *mci_get_device_by_name(const char *name)
 {
 	struct mci *mci;
diff --git a/include/mci.h b/include/mci.h
index cc4712c..781e6e0 100644
--- a/include/mci.h
+++ b/include/mci.h
@@ -480,6 +480,7 @@ struct mci {
 
 int mci_register(struct mci_host*);
 void mci_of_parse(struct mci_host *host);
+void mci_of_parse_node(struct mci_host *host, struct device_node *np);
 int mci_detect_card(struct mci_host *);
 int mci_send_ext_csd(struct mci *mci, char *ext_csd);
 int mci_switch(struct mci *mci, unsigned set, unsigned index,
-- 
2.9.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2017-03-16 15:05 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-16 15:04 [PATCH v2 00/11] AT91, at91sam9x5ek updates (part II/III) Andrey Smirnov
2017-03-16 15:04 ` [PATCH v2 01/11] clocksource: at91: Add DT compatibility table Andrey Smirnov
2017-03-16 15:04 ` [PATCH v2 02/11] serial: atmel: " Andrey Smirnov
2017-03-16 15:04 ` [PATCH v2 03/11] clk: at91: Port at91 DT clock code Andrey Smirnov
2017-03-16 15:04 ` Andrey Smirnov [this message]
2017-03-16 15:04 ` [PATCH v2 05/11] mci: atmel_mci: Add DT support Andrey Smirnov
2017-03-16 15:04 ` [PATCH v2 06/11] spi: atmel_spi: " Andrey Smirnov
2017-03-16 15:04 ` [PATCH v2 07/11] w1-gpio: " Andrey Smirnov
2017-03-16 15:04 ` [PATCH v2 08/11] usb: ohci-at91: " Andrey Smirnov
2017-03-16 15:04 ` [PATCH v2 09/11] usb/host: Allow USB_OHCI_AT91 even if USB_OHCI is disabled Andrey Smirnov
2017-03-16 15:04 ` [PATCH v2 10/11] usb: echi-atmel: Add DT support Andrey Smirnov
2017-03-16 15:04 ` [PATCH v2 11/11] net: macb: " Andrey Smirnov
2017-07-08 22:35   ` Sam Ravnborg
2017-07-10 22:05     ` Andrey Smirnov
2017-03-17 12:19 ` [PATCH v2 00/11] AT91, at91sam9x5ek updates (part II/III) Sascha Hauer
2017-03-20  3:21   ` Andrey Smirnov
2017-04-15 21:50 ` Sam Ravnborg
2017-04-19  9:42   ` Sascha Hauer

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=20170316150448.11773-5-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.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