From: Andrzej Hajda <a.hajda@samsung.com>
To: linux-media@vger.kernel.org
Cc: Samuel Ortiz <sameo@linux.intel.com>,
devicetree-discuss@lists.ozlabs.org,
linux-kernel@vger.kernel.org,
Kyungmin Park <kyungmin.park@samsung.com>,
Seung-Woo Kim <sw0312.kim@samsung.com>,
Sylwester Nawrocki <s.nawrocki@samsung.com>,
Andrzej Hajda <a.hajda@samsung.com>
Subject: [PATCH RFC v2 1/2] max77693: added device tree support
Date: Tue, 19 Feb 2013 16:36:16 +0100 [thread overview]
Message-ID: <1361288177-14452-2-git-send-email-a.hajda@samsung.com> (raw)
In-Reply-To: <1361288177-14452-1-git-send-email-a.hajda@samsung.com>
max77693 mfd main device uses only wakeup field
from max77693_platform_data. This field is mapped
to wakeup-source property in device tree.
Device tree bindings doc will be added in max77693-led patch.
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/mfd/max77693.c | 40 +++++++++++++++++++++++++++++++++-------
1 file changed, 33 insertions(+), 7 deletions(-)
diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
index cc5155e..46223da 100644
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -106,11 +106,30 @@ static const struct regmap_config max77693_regmap_config = {
.max_register = MAX77693_PMIC_REG_END,
};
+static int max77693_get_platform_data(struct max77693_dev *max77693,
+ struct device *dev)
+{
+ struct device_node *node = dev->of_node;
+ struct max77693_platform_data *pdata = dev->platform_data;
+
+ if (node) {
+ max77693->wakeup = of_property_read_bool(node, "wakeup-source");
+ return 0;
+ }
+
+ if (pdata) {
+ max77693->wakeup = pdata->wakeup;
+ return 0;
+ }
+
+ dev_err(dev, "No platform data found.\n");
+ return -EINVAL;
+}
+
static int max77693_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct max77693_dev *max77693;
- struct max77693_platform_data *pdata = i2c->dev.platform_data;
u8 reg_data;
int ret = 0;
@@ -119,6 +138,10 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
if (max77693 == NULL)
return -ENOMEM;
+ ret = max77693_get_platform_data(max77693, &i2c->dev);
+ if (ret < 0)
+ return ret;
+
max77693->regmap = devm_regmap_init_i2c(i2c, &max77693_regmap_config);
if (IS_ERR(max77693->regmap)) {
ret = PTR_ERR(max77693->regmap);
@@ -133,11 +156,6 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
max77693->irq = i2c->irq;
max77693->type = id->driver_data;
- if (!pdata)
- goto err_regmap;
-
- max77693->wakeup = pdata->wakeup;
-
if (max77693_read_reg(max77693->regmap,
MAX77693_PMIC_REG_PMIC_ID2, ®_data) < 0) {
dev_err(max77693->dev, "device not found on this channel\n");
@@ -177,7 +195,7 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
if (ret < 0)
goto err_mfd;
- device_init_wakeup(max77693->dev, pdata->wakeup);
+ device_init_wakeup(max77693->dev, max77693->wakeup);
return ret;
@@ -233,11 +251,19 @@ static const struct dev_pm_ops max77693_pm = {
.resume = max77693_resume,
};
+#ifdef CONFIG_OF
+static struct of_device_id max77693_dt_match[] = {
+ {.compatible = "maxim,max77693"},
+ {},
+};
+#endif
+
static struct i2c_driver max77693_i2c_driver = {
.driver = {
.name = "max77693",
.owner = THIS_MODULE,
.pm = &max77693_pm,
+ .of_match_table = of_match_ptr(max77693_dt_match),
},
.probe = max77693_i2c_probe,
.remove = max77693_i2c_remove,
--
1.7.10.4
next prev parent reply other threads:[~2013-02-19 15:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-19 15:36 [PATCH RFC v2 0/2] max77693-led driver Andrzej Hajda
2013-02-19 15:36 ` Andrzej Hajda [this message]
2013-04-08 15:21 ` [PATCH RFC v2 1/2] max77693: added device tree support Samuel Ortiz
2013-07-17 7:45 ` Andrzej Hajda
2013-08-14 15:35 ` Andrzej Hajda
2013-08-14 16:04 ` Lee Jones
2013-02-19 15:36 ` [PATCH RFC v2 2/2] media: added max77693-led driver Andrzej Hajda
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=1361288177-14452-2-git-send-email-a.hajda@samsung.com \
--to=a.hajda@samsung.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=s.nawrocki@samsung.com \
--cc=sameo@linux.intel.com \
--cc=sw0312.kim@samsung.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
all inboxes | Powered by JetHome®