From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: STEricsson_nomadik_linux@list.st.com,
linus.walleij@stericsson.com, arnd@arndb.de,
Lee Jones <lee.jones@linaro.org>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: [PATCH 17/19] mfd: Enable the tc3589x for Device Tree
Date: Fri, 7 Sep 2012 12:14:57 +0100 [thread overview]
Message-ID: <1347016499-29354-18-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1347016499-29354-1-git-send-email-lee.jones@linaro.org>
Here we provide a means to probe and extract vital information
from Device Tree when booting with it enabled. Without this
patch sub-devices wouldn't be able to reference the tc3589x
from Device Tree.
CC: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mfd/tc3589x.c | 43 ++++++++++++++++++++++++++++++++++++++++---
1 file changed, 40 insertions(+), 3 deletions(-)
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
index 2df44ac..8f4c853 100644
--- a/drivers/mfd/tc3589x.c
+++ b/drivers/mfd/tc3589x.c
@@ -12,6 +12,7 @@
#include <linux/irqdomain.h>
#include <linux/slab.h>
#include <linux/i2c.h>
+#include <linux/of.h>
#include <linux/mfd/core.h>
#include <linux/mfd/tc3589x.h>
@@ -146,6 +147,7 @@ static struct mfd_cell tc3589x_dev_gpio[] = {
.name = "tc3589x-gpio",
.num_resources = ARRAY_SIZE(gpio_resources),
.resources = &gpio_resources[0],
+ .of_compatible = "tc3589x-gpio",
},
};
@@ -154,6 +156,7 @@ static struct mfd_cell tc3589x_dev_keypad[] = {
.name = "tc3589x-keypad",
.num_resources = ARRAY_SIZE(keypad_resources),
.resources = &keypad_resources[0],
+ .of_compatible = "tc3589x-keypad",
},
};
@@ -221,7 +224,7 @@ static struct irq_domain_ops tc3589x_irq_ops = {
.xlate = irq_domain_xlate_twocell,
};
-static int tc3589x_irq_init(struct tc3589x *tc3589x)
+static int tc3589x_irq_init(struct tc3589x *tc3589x, struct device_node *np)
{
int base = tc3589x->irq_base;
@@ -232,7 +235,7 @@ static int tc3589x_irq_init(struct tc3589x *tc3589x)
}
else {
tc3589x->domain = irq_domain_add_linear(
- NULL, TC3589x_NR_INTERNAL_IRQS,
+ np, TC3589x_NR_INTERNAL_IRQS,
&tc3589x_irq_ops, tc3589x);
}
@@ -309,13 +312,47 @@ static int __devinit tc3589x_device_init(struct tc3589x *tc3589x)
return ret;
}
+static int tc3589x_of_probe(struct device_node *np,
+ struct tc3589x_platform_data *pdata)
+{
+ struct device_node *child;
+
+ for_each_child_of_node(np, child) {
+ if (!strcmp(child->name, "tc3589x_gpio")) {
+ pdata->block |= TC3589x_BLOCK_GPIO;
+ }
+ if (!strcmp(child->name, "tc3589x_keypad")) {
+ pdata->block |= TC3589x_BLOCK_KEYPAD;
+ }
+ }
+
+ return 0;
+}
+
static int __devinit tc3589x_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct tc3589x_platform_data *pdata = i2c->dev.platform_data;
+ struct device_node *np = i2c->dev.of_node;
struct tc3589x *tc3589x;
int ret;
+ if (!pdata) {
+ if (np) {
+ pdata = devm_kzalloc(&i2c->dev, sizeof(*pdata), GFP_KERNEL);
+ if (!pdata)
+ return -ENOMEM;
+
+ ret = tc3589x_of_probe(np, pdata);
+ if (ret)
+ return ret;
+ }
+ else {
+ dev_err(&i2c->dev, "No platform data or DT found\n");
+ return -EINVAL;
+ }
+ }
+
if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA
| I2C_FUNC_SMBUS_I2C_BLOCK))
return -EIO;
@@ -338,7 +375,7 @@ static int __devinit tc3589x_probe(struct i2c_client *i2c,
if (ret)
goto out_free;
- ret = tc3589x_irq_init(tc3589x);
+ ret = tc3589x_irq_init(tc3589x, np);
if (ret)
goto out_free;
--
1.7.9.5
next prev parent reply other threads:[~2012-09-07 11:15 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-07 11:14 [PATCH 00/19] First HREF Device Tree enablement patch-set Lee Jones
2012-09-07 11:14 ` [PATCH 01/19] ARM: ux500: Add skeleton Device Tree for the HREF reference board Lee Jones
2012-09-10 8:47 ` Linus Walleij
2012-09-14 9:37 ` Lee Jones
2012-09-14 14:01 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 02/19] ARM: ux500: Add UART support to the HREF Device Tree Lee Jones
2012-09-10 8:49 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 03/19] ARM: ux500: Pass SDI DMA information though AUX_DATA to MMCI Lee Jones
2012-09-10 8:50 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 04/19] ARM: ux500: Add SDI (MMC) support to the HREF Device Tree Lee Jones
2012-09-07 12:29 ` Arnd Bergmann
2012-09-07 12:39 ` Lee Jones
2012-09-10 9:51 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 05/19] ARM: ux500: Stop registering HREF's SDI devices from platform data Lee Jones
2012-09-07 12:30 ` Arnd Bergmann
2012-09-07 11:14 ` [PATCH 06/19] ARM: ux500: Add nodes for the MSP into the HREF Device Tree Lee Jones
2012-09-10 9:53 ` Linus Walleij
2012-09-14 9:23 ` Lee Jones
2012-09-14 14:00 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 07/19] ARM: ux500: Add all encompassing sound node to " Lee Jones
2012-09-10 9:56 ` Linus Walleij
2012-09-14 9:20 ` Lee Jones
2012-09-07 11:14 ` [PATCH 08/19] ARM: ux500: Stop registering Audio devices for HREF when DT is enabled Lee Jones
2012-09-10 9:57 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 09/19] ARM: ux500: Enable SSP (SPI) for HREF when booting Device Tree Lee Jones
2012-09-10 11:11 ` Linus Walleij
2012-09-14 9:18 ` Lee Jones
2012-09-17 17:03 ` Roland Stigge
2012-09-18 12:08 ` Linus Walleij
2012-09-18 12:13 ` Roland Stigge
2012-09-07 11:14 ` [PATCH 10/19] ARM: ux500: Remove redundant #gpio-cell properties from HREF and Snowball DT Lee Jones
2012-09-10 11:12 ` Linus Walleij
2012-09-14 9:10 ` Lee Jones
2012-09-14 13:58 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 11/19] ARM: ux500: Add all known I2C sub-device nodes to the HREF DT Lee Jones
2012-09-10 11:34 ` Linus Walleij
2012-09-14 8:47 ` Lee Jones
2012-09-20 6:51 ` Linus Walleij
2012-09-18 15:49 ` Lee Jones
2012-09-07 11:14 ` [PATCH 12/19] i2c-nomadik: Register sub-devices when passed via Device Tree Lee Jones
2012-09-10 11:42 ` Linus Walleij
2012-09-12 10:52 ` Wolfram Sang
2012-09-14 8:27 ` Lee Jones
2012-09-14 8:41 ` Wolfram Sang
2012-09-14 9:02 ` Lee Jones
2012-09-14 9:39 ` Wolfram Sang
2012-09-14 10:15 ` Lee Jones
2012-09-14 11:32 ` Wolfram Sang
2012-09-19 20:12 ` Lee Jones
2012-10-06 11:25 ` Wolfram Sang
2012-09-14 8:22 ` Lee Jones
2012-09-07 11:14 ` [PATCH 13/19] ARM: ux500: Stop registering I2C sub-devices for HREF when DT is enabled Lee Jones
2012-09-10 12:56 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 14/19] ARM: ux500: Apply tc3589x's GPIO/IRQ properties to HREF's DT Lee Jones
2012-09-10 12:58 ` Linus Walleij
2012-09-14 8:33 ` Lee Jones
2012-09-07 11:14 ` [PATCH 15/19] mfd: Don't convert just one IRQ using irqdomain if a range is provided Lee Jones
2012-09-07 12:35 ` Arnd Bergmann
2012-09-07 12:46 ` Lee Jones
2012-09-07 13:37 ` Arnd Bergmann
2012-09-07 13:43 ` Lee Jones
2012-09-07 13:57 ` Arnd Bergmann
2012-09-17 13:45 ` Samuel Ortiz
2012-09-17 14:11 ` Lee Jones
2012-09-21 22:20 ` Samuel Ortiz
2012-09-07 11:14 ` [PATCH 16/19] mfd: Provide the tc3589x with its own IRQ domain Lee Jones
2012-09-10 13:05 ` Linus Walleij
2012-09-16 23:45 ` Samuel Ortiz
2012-09-07 11:14 ` Lee Jones [this message]
2012-09-10 13:08 ` [PATCH 17/19] mfd: Enable the tc3589x for Device Tree Linus Walleij
2012-09-16 23:45 ` Samuel Ortiz
2012-09-07 11:14 ` [PATCH 18/19] gpio: Provide the tc3589x GPIO expander driver with an IRQ domain Lee Jones
2012-09-10 13:10 ` Linus Walleij
2012-09-12 13:04 ` Linus Walleij
2012-09-14 8:14 ` Lee Jones
2012-09-12 21:21 ` Linus Walleij
2012-09-07 11:14 ` [PATCH 19/19] gpio: Enable the tc3298x GPIO expander driver for Device Tree Lee Jones
2012-09-10 13:20 ` Linus Walleij
2012-09-12 21:21 ` Linus Walleij
2012-09-07 12:41 ` [PATCH 00/19] First HREF Device Tree enablement patch-set Arnd Bergmann
2012-09-07 13:01 ` Lee Jones
2012-09-07 13:58 ` Arnd Bergmann
2012-09-07 14:22 ` Lee Jones
2012-09-10 8:41 ` Linus Walleij
2012-09-10 10:13 ` Arnd Bergmann
2012-09-10 11:29 ` Linus Walleij
2012-09-10 13:49 ` Arnd Bergmann
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=1347016499-29354-18-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=STEricsson_nomadik_linux@list.st.com \
--cc=arnd@arndb.de \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.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 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).