From: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
To: linux-arm-kernel@lists.infradead.org
Cc: devicetree@vger.kernel.org, sameo@linux.intel.com,
yizhang@marvell.com, linux-kernel@vger.kernel.org,
Vaibhav Hiremath <vaibhav.hiremath@linaro.org>,
robh+dt@kernel.org, Chao Xie <chao.xie@marvell.com>,
lee.jones@linaro.org
Subject: [PATCH-V5 1/4] mfd: 88pm800: Add device tree support
Date: Mon, 29 Jun 2015 21:01:14 +0530 [thread overview]
Message-ID: <1435591877-18214-2-git-send-email-vaibhav.hiremath@linaro.org> (raw)
In-Reply-To: <1435591877-18214-1-git-send-email-vaibhav.hiremath@linaro.org>
Add DT support to the 88pm800 driver, along with compatible
field for it's sub-devices (rtc, onkey and regulator)
Signed-off-by: Chao Xie <chao.xie@marvell.com>
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
---
drivers/mfd/88pm800.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
index 841717a..40fd014 100644
--- a/drivers/mfd/88pm800.c
+++ b/drivers/mfd/88pm800.c
@@ -27,6 +27,7 @@
#include <linux/mfd/core.h>
#include <linux/mfd/88pm80x.h>
#include <linux/slab.h>
+#include <linux/of_device.h>
/* Interrupt Registers */
#define PM800_INT_STATUS1 (0x05)
@@ -121,6 +122,11 @@ static const struct i2c_device_id pm80x_id_table[] = {
};
MODULE_DEVICE_TABLE(i2c, pm80x_id_table);
+static const struct of_device_id pm80x_of_match_table[] = {
+ { .compatible = "marvell,88pm800", },
+ {},
+};
+
static struct resource rtc_resources[] = {
{
.name = "88pm80x-rtc",
@@ -133,6 +139,7 @@ static struct resource rtc_resources[] = {
static struct mfd_cell rtc_devs[] = {
{
.name = "88pm80x-rtc",
+ .of_compatible = "marvell,88pm80x-rtc",
.num_resources = ARRAY_SIZE(rtc_resources),
.resources = &rtc_resources[0],
.id = -1,
@@ -151,6 +158,7 @@ static struct resource onkey_resources[] = {
static const struct mfd_cell onkey_devs[] = {
{
.name = "88pm80x-onkey",
+ .of_compatible = "marvell,88pm80x-onkey",
.num_resources = 1,
.resources = &onkey_resources[0],
.id = -1,
@@ -160,6 +168,7 @@ static const struct mfd_cell onkey_devs[] = {
static const struct mfd_cell regulator_devs[] = {
{
.name = "88pm80x-regulator",
+ .of_compatible = "marvell,88pm80x-regulator",
.id = -1,
},
};
@@ -544,8 +553,21 @@ static int pm800_probe(struct i2c_client *client,
int ret = 0;
struct pm80x_chip *chip;
struct pm80x_platform_data *pdata = dev_get_platdata(&client->dev);
+ struct device_node *np = client->dev.of_node;
struct pm80x_subchip *subchip;
+ if (!pdata && !np) {
+ dev_err(&client->dev,
+ "pm80x requires platform data or of_node\n");
+ return -EINVAL;
+ }
+
+ if (!pdata) {
+ pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
+ if (!pdata)
+ return -ENOMEM;
+ }
+
ret = pm80x_init(client);
if (ret) {
dev_err(&client->dev, "pm800_init fail\n");
@@ -611,6 +633,7 @@ static struct i2c_driver pm800_driver = {
.name = "88PM800",
.owner = THIS_MODULE,
.pm = &pm80x_pm_ops,
+ .of_match_table = pm80x_of_match_table,
},
.probe = pm800_probe,
.remove = pm800_remove,
--
1.9.1
next prev parent reply other threads:[~2015-06-29 15:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-29 15:31 [PATCH-V5 0/4] mfd: 88pm800: Add Device tree support Vaibhav Hiremath
2015-06-29 15:31 ` Vaibhav Hiremath [this message]
[not found] ` <1435591877-18214-2-git-send-email-vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-06-30 0:32 ` [PATCH-V5 1/4] mfd: 88pm800: Add device " Krzysztof Kozlowski
2015-07-07 7:30 ` Lee Jones
[not found] ` <1435591877-18214-1-git-send-email-vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-06-29 15:31 ` [PATCH-V5 2/4] mfd: 88pm800: Remove unnecessary protection around pdata Vaibhav Hiremath
[not found] ` <1435591877-18214-3-git-send-email-vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-06-30 0:34 ` Krzysztof Kozlowski
2015-07-07 7:30 ` Lee Jones
2015-06-29 15:31 ` [PATCH-V5 3/4] mfd: 88pm800: Set default interrupt clear method Vaibhav Hiremath
[not found] ` <1435591877-18214-4-git-send-email-vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-06-30 0:29 ` Krzysztof Kozlowski
2015-07-07 7:29 ` Lee Jones
2015-07-07 9:53 ` Vaibhav Hiremath
[not found] ` <559BA1AE.9050006-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-07-07 10:40 ` Lee Jones
2015-07-07 10:51 ` Vaibhav Hiremath
2015-07-07 11:12 ` Lee Jones
2015-07-07 11:18 ` Vaibhav Hiremath
[not found] ` <559BB58E.9010406-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-07-07 11:25 ` Vaibhav Hiremath
[not found] ` <559BB727.2070106-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-07-07 12:54 ` Lee Jones
2015-07-07 14:47 ` Vaibhav Hiremath
2015-07-07 14:57 ` Lee Jones
2015-07-08 12:22 ` Vaibhav Hiremath
2015-06-29 15:31 ` [PATCH-V5 4/4] mfd: devicetree: bindings: Add new 88pm800 mfd binding Vaibhav Hiremath
[not found] ` <1435591877-18214-5-git-send-email-vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-06-30 0:30 ` Krzysztof Kozłowski
2015-07-01 7:43 ` Lee Jones
2015-07-01 8:00 ` Krzysztof Kozłowski
2015-06-30 0:31 ` Krzysztof Kozlowski
[not found] ` <CAJKOXPdyDRPiEwKd_MLq6rkhuWxxqqageUweMk-p69RXfH2hJA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-06-30 5:40 ` Vaibhav Hiremath
2015-07-07 7:31 ` Lee Jones
2015-07-01 16:10 ` Rob Herring
2015-07-01 16:21 ` Vaibhav Hiremath
[not found] ` <5594137D.6070106-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-07-01 17:17 ` Rob Herring
[not found] ` <CAL_JsqKgxPK3oBJifAn9-S8pB8Ew7JRmi9cJE4qO1b=aRC4N+w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-07-01 17:24 ` Vaibhav Hiremath
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=1435591877-18214-2-git-send-email-vaibhav.hiremath@linaro.org \
--to=vaibhav.hiremath@linaro.org \
--cc=chao.xie@marvell.com \
--cc=devicetree@vger.kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=sameo@linux.intel.com \
--cc=yizhang@marvell.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).