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 20/45] mci: Allow parsing for explicit DT node
Date: Mon,  6 Mar 2017 14:53:31 -0800	[thread overview]
Message-ID: <20170306225356.31475-21-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20170306225356.31475-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).

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-06 22:54 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-06 22:53 [PATCH 00/45] AT91, at91sam9x5ek updates Andrey Smirnov
2017-03-06 22:53 ` [PATCH 01/45] at91: Fix bug/typo in debug_ll.h Andrey Smirnov
2017-03-06 22:53 ` [PATCH 02/45] at91sam9x5ek: Convert to mult-image build Andrey Smirnov
2017-03-06 22:53 ` [PATCH 03/45] at91sam9x5ek: Add CONFIG_KALLSYMS to defconfig Andrey Smirnov
2017-03-06 22:53 ` [PATCH 04/45] at91sam9x5ek: Add preliminary device tree support Andrey Smirnov
2017-03-06 22:53 ` [PATCH 05/45] clocksource: at91: Move to 'drivers/clocksource' Andrey Smirnov
2017-03-06 22:53 ` [PATCH 06/45] clocksource: at91: Add DT compatibility table Andrey Smirnov
2017-03-06 22:53 ` [PATCH 07/45] serial: atmel: Check result of clk_get() Andrey Smirnov
2017-03-07  7:46   ` Sascha Hauer
2017-03-06 22:53 ` [PATCH 08/45] serial: atmel: Add DT compatibility table Andrey Smirnov
2017-03-06 22:53 ` [PATCH 09/45] regmap: Implement syscon_node_to_regmap() Andrey Smirnov
2017-03-06 22:53 ` [PATCH 10/45] clk: Port two helper functions from Linux Andrey Smirnov
2017-03-06 22:53 ` [PATCH 11/45] clk: Make COMMON_CLK_OF_PROVIDER depend on OFTREE Andrey Smirnov
2017-03-06 22:53 ` [PATCH 12/45] clk: No-op CLK_OF_DECLARE if not enabled Andrey Smirnov
2017-03-06 22:53 ` [PATCH 13/45] clk: at91: Port at91 DT clock code Andrey Smirnov
2017-03-06 22:53 ` [PATCH 14/45] at91sam9x5ek: Convert to use DT clock tree Andrey Smirnov
2017-03-06 22:53 ` [PATCH 15/45] at91sam9x5ek: Remove at91sam9x5ek_mem_init() Andrey Smirnov
2017-03-06 22:53 ` [PATCH 16/45] at91sam9x5ek: Configure LEDs in DT Andrey Smirnov
2017-03-06 22:53 ` [PATCH 17/45] pinctrl-at91: Fix a bug in at91_pinctrl_set_conf() Andrey Smirnov
2017-03-06 22:53 ` [PATCH 18/45] at91: Enable PINCTRL for SOC_AT91SAM9 Andrey Smirnov
2017-03-06 22:53 ` [PATCH 19/45] at91sam9x5ek: Configure I2C via DT Andrey Smirnov
2017-03-06 22:53 ` Andrey Smirnov [this message]
2017-03-06 22:53 ` [PATCH 21/45] mci: atmel_mci: Add DT support Andrey Smirnov
2017-03-06 22:53 ` [PATCH 22/45] at91sam9x5ek: Configure MMC in DT Andrey Smirnov
2017-03-06 22:53 ` [PATCH 23/45] of: base: Use scoring in DT device matching Andrey Smirnov
2017-03-06 22:53 ` [PATCH 24/45] pinctrl: at91: Fix a bug in at91_pinctrl_set_state Andrey Smirnov
2017-03-06 22:53 ` [PATCH 25/45] pinctrl: at91: Implement .get_direction hook Andrey Smirnov
2017-03-06 22:53 ` [PATCH 26/45] spi: atmel_spi: Add DT support Andrey Smirnov
2017-03-06 22:53 ` [PATCH 27/45] spi: atmel_spi: Configure CS GPIO as output Andrey Smirnov
2017-03-06 22:53 ` [PATCH 28/45] spi: atmel_spi: Use VERSION register instead of CPU type Andrey Smirnov
2017-03-06 22:53 ` [PATCH 29/45] at91sam9x5ek: Configure SPI in DT Andrey Smirnov
2017-03-06 22:53 ` [PATCH 30/45] w1-gpio: Add DT support Andrey Smirnov
2017-03-06 22:53 ` [PATCH 31/45] at91sam9x5ek: Configure 1-wire in DT Andrey Smirnov
2017-03-06 22:53 ` [PATCH 32/45] usb: ohci-at91: Check result of clk_get() Andrey Smirnov
2017-03-07 16:35   ` Sam Ravnborg
2017-03-07 21:21     ` Andrey Smirnov
2017-03-07 21:52       ` Sam Ravnborg
2017-03-06 22:53 ` [PATCH 33/45] usb: ohci-at91: Convert global variables to private data Andrey Smirnov
2017-03-06 22:53 ` [PATCH 34/45] usb: ohci-at91: Check result of clk_enable() Andrey Smirnov
2017-03-06 22:53 ` [PATCH 35/45] usb: ohci-at91: Add DT support Andrey Smirnov
2017-03-07 16:40   ` Sam Ravnborg
2017-03-06 22:53 ` [PATCH 36/45] usb/host: Allow USB_OHCI_AT91 even if USB_OHCI is disabled Andrey Smirnov
2017-03-06 22:53 ` [PATCH 37/45] usb: ehci-atmel: Check result of clk_enable() Andrey Smirnov
2017-03-06 22:53 ` [PATCH 38/45] usb: echi-atmel: Convert global variables to private data Andrey Smirnov
2017-03-06 22:53 ` [PATCH 39/45] usb: ehci-atmel: Zero ehci_data before using it Andrey Smirnov
2017-03-06 22:53 ` [PATCH 40/45] usb: echi-atmel: Check result of ehci_register() Andrey Smirnov
2017-03-06 22:53 ` [PATCH 41/45] usb: echi-atmel: Add DT support Andrey Smirnov
2017-03-06 22:53 ` [PATCH 42/45] at91sam9x5ek: Configure USB in DT Andrey Smirnov
2017-03-06 22:53 ` [PATCH 43/45] net: macb: Add DT support Andrey Smirnov
2017-03-06 22:53 ` [PATCH 44/45] at91sam9x5ek: Configure Ethernet in DT Andrey Smirnov
2017-03-06 22:53 ` [PATCH 45/45] at91sam9x5ek: Configure NAND " Andrey Smirnov
2017-03-07  8:13 ` [PATCH 00/45] AT91, at91sam9x5ek updates Sascha Hauer
2017-03-07 21:09   ` Andrey Smirnov
2017-03-07 16:34 ` Sam Ravnborg
2017-03-07 16:56   ` Jean-Christophe PLAGNIOL-VILLARD
2017-03-07 20:58     ` Sam Ravnborg
2017-03-07 21:18       ` Andrey Smirnov
2017-03-07 21:47         ` Jean-Christophe PLAGNIOL-VILLARD

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=20170306225356.31475-21-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