1 From 8c2057afe84c074ef7cd3ee2ec8e9bed835b9e93 Mon Sep 17 00:00:00 2001
2 From: Sascha Hauer <s.hauer@pengutronix.de>
3 Date: Wed, 21 May 2014 19:50:04 +0200
4 Subject: [PATCH] mmc: Add SDIO function devicetree subnode parsing
6 This adds SDIO devicetree subnode parsing to the mmc core. While
7 SDIO devices are runtime probable they sometimes need nonprobable
8 additional information on embedded systems, like an additional gpio
9 interrupt or a clock. This patch makes it possible to supply this
10 information from the devicetree. SDIO drivers will find a pointer
11 to the devicenode in their devices of_node pointer.
13 Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
14 [hdegoede@redhat.com: Misc. cleanups]
15 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
17 drivers/mmc/core/bus.c | 4 ++++
18 drivers/mmc/core/core.c | 28 ++++++++++++++++++++++++++++
19 drivers/mmc/core/core.h | 3 +++
20 drivers/mmc/core/sdio_bus.c | 11 +++++++++++
21 4 files changed, 46 insertions(+)
23 --- a/drivers/mmc/core/bus.c
24 +++ b/drivers/mmc/core/bus.c
26 #include <linux/err.h>
27 #include <linux/slab.h>
28 #include <linux/stat.h>
29 +#include <linux/of.h>
30 #include <linux/pm_runtime.h>
32 #include <linux/mmc/card.h>
33 @@ -352,6 +353,8 @@ int mmc_add_card(struct mmc_card *card)
35 mmc_init_context_info(card->host);
37 + card->dev.of_node = mmc_of_find_child_device(card->host, 0);
39 ret = device_add(&card->dev);
42 @@ -380,6 +383,7 @@ void mmc_remove_card(struct mmc_card *ca
43 mmc_hostname(card->host), card->rca);
45 device_del(&card->dev);
46 + of_node_put(card->dev.of_node);
49 put_device(&card->dev);
50 --- a/drivers/mmc/core/core.c
51 +++ b/drivers/mmc/core/core.c
52 @@ -1205,6 +1205,34 @@ EXPORT_SYMBOL(mmc_of_parse_voltage);
54 #endif /* CONFIG_OF */
56 +static int mmc_of_get_func_num(struct device_node *node)
61 + ret = of_property_read_u32(node, "reg", ®);
68 +struct device_node *mmc_of_find_child_device(struct mmc_host *host,
71 + struct device_node *node;
73 + if (!host->parent || !host->parent->of_node)
76 + for_each_child_of_node(host->parent->of_node, node) {
77 + if (mmc_of_get_func_num(node) == func_num)
84 #ifdef CONFIG_REGULATOR
87 --- a/drivers/mmc/core/core.h
88 +++ b/drivers/mmc/core/core.h
89 @@ -32,6 +32,9 @@ struct mmc_bus_ops {
90 void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops);
91 void mmc_detach_bus(struct mmc_host *host);
93 +struct device_node *mmc_of_find_child_device(struct mmc_host *host,
96 void mmc_init_erase(struct mmc_card *card);
98 void mmc_set_chip_select(struct mmc_host *host, int mode);
99 --- a/drivers/mmc/core/sdio_bus.c
100 +++ b/drivers/mmc/core/sdio_bus.c
102 #include <linux/mmc/card.h>
103 #include <linux/mmc/host.h>
104 #include <linux/mmc/sdio_func.h>
105 +#include <linux/of.h>
108 #include "sdio_cis.h"
109 #include "sdio_bus.h"
111 @@ -303,6 +305,13 @@ static void sdio_acpi_set_handle(struct
112 static inline void sdio_acpi_set_handle(struct sdio_func *func) {}
115 +static void sdio_set_of_node(struct sdio_func *func)
117 + struct mmc_host *host = func->card->host;
119 + func->dev.of_node = mmc_of_find_child_device(host, func->num);
123 * Register a new SDIO function with the driver model.
125 @@ -312,6 +321,7 @@ int sdio_add_func(struct sdio_func *func
127 dev_set_name(&func->dev, "%s:%d", mmc_card_id(func->card), func->num);
129 + sdio_set_of_node(func);
130 sdio_acpi_set_handle(func);
131 ret = device_add(&func->dev);
133 @@ -335,6 +345,7 @@ void sdio_remove_func(struct sdio_func *
135 dev_pm_domain_detach(&func->dev, false);
136 device_del(&func->dev);
137 + of_node_put(func->dev.of_node);
138 put_device(&func->dev);