[RFC,v2,1/2] max77693: added device tree support
Commit Message
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(-)
Comments
Hi Andrzej,
On Tue, Feb 19, 2013 at 04:36:16PM +0100, Andrzej Hajda wrote:
> 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(-)
This patch looks good to me, but doesn't apply to mfd-next. Would you mind
rebasing it ?
Cheers,
Samuel.
Hi Samuel,
A while ago I have send rebased patch adding device-tree support for
max77693 as you asked:
https://patchwork.kernel.org/patch/2414341/
The patch is still not applied. Is there a reason for that or just an
omission?
Regards
Andrzej
On 04/08/2013 05:21 PM, Samuel Ortiz wrote:
> Hi Andrzej,
>
> On Tue, Feb 19, 2013 at 04:36:16PM +0100, Andrzej Hajda wrote:
>> 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(-)
> This patch looks good to me, but doesn't apply to mfd-next. Would you mind
> rebasing it ?
>
> Cheers,
> Samuel.
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Lee,
I have no response from Samuel regarding this patch.
Could you take care of it, I can rebase it again if necessary.
Regards
Andrzej
On 07/17/2013 09:45 AM, Andrzej Hajda wrote:
> Hi Samuel,
>
> A while ago I have send rebased patch adding device-tree support for
> max77693 as you asked:
> https://patchwork.kernel.org/patch/2414341/
>
> The patch is still not applied. Is there a reason for that or just an
> omission?
>
> Regards
> Andrzej
>
> On 04/08/2013 05:21 PM, Samuel Ortiz wrote:
>> Hi Andrzej,
>>
>> On Tue, Feb 19, 2013 at 04:36:16PM +0100, Andrzej Hajda wrote:
>>> 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(-)
>> This patch looks good to me, but doesn't apply to mfd-next. Would you mind
>> rebasing it ?
>>
>> Cheers,
>> Samuel.
>>
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
> I have no response from Samuel regarding this patch.
> Could you take care of it, I can rebase it again if necessary.
Yes, please rebase onto v3.11-rc5 and resubmit.
Thanks.
@@ -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,