2012-11-06 07:46:49

by Qing Xu

Subject: [PATCH 6/7] mfd: max8925: support dt for backlight

From: Qing Xu <[email protected]>

Signed-off-by: Qing Xu <[email protected]>
---
drivers/video/backlight/max8925_bl.c | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
index f72ba54..7de02ed 100644
--- a/drivers/video/backlight/max8925_bl.c
+++ b/drivers/video/backlight/max8925_bl.c
@@ -101,6 +101,29 @@ static const struct backlight_ops max8925_backlight_ops = {
.get_brightness = max8925_backlight_get_brightness,
};

+#ifdef CONFIG_OF
+static int max8925_backlight_dt_init(struct platform_device *pdev,
+ struct max8925_backlight_pdata *pdata)
+{
+ struct device_node *nproot = pdev->dev.parent->of_node, *np;
+ int dual_string;
+
+ if (!nproot)
+ return -ENODEV;
+ np = of_find_node_by_name(nproot, "backlight");
+ if (!np) {
+ dev_err(&pdev->dev, "failed to find backlight node\n");
+ return -ENODEV;
+ }
+
+ of_property_read_u32(np, "dual-string", &dual_string);
+ pdata->dual_string = dual_string;
+ return 0;
+}
+#else
+#define max8925_backlight_dt_init(x, y) (-1)
+#endif
+
static int __devinit max8925_backlight_probe(struct platform_device *pdev)
{
struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
@@ -150,6 +173,13 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, bl);

value = 0;
+ if (pdev->dev.parent->of_node && !pdata) {
+ pdata = devm_kzalloc(&pdev->dev,
+ sizeof(struct max8925_backlight_pdata),
+ GFP_KERNEL);
+ max8925_backlight_dt_init(pdev, pdata);
+ }
+
if (pdata) {
if (pdata->lxw_scl)
value |= (1 << 7);
@@ -161,7 +191,6 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev)
ret = max8925_set_bits(chip->i2c, data->reg_mode_cntl, 0xfe, value);
if (ret < 0)
goto out_brt;
-
backlight_update_status(bl);
return 0;
out_brt:
--
1.7.0.4

2012-11-23 07:22:12

by Qing Xu

Subject: Re: [PATCH 6/7] mfd: max8925: support dt for backlight

On 11/06/2012 03:47 PM, Qing Xu wrote:
> From: Qing Xu <[email protected]>
>
> Signed-off-by: Qing Xu <[email protected]>
> ---
> drivers/video/backlight/max8925_bl.c | 31 ++++++++++++++++++++++++++++++-
> 1 files changed, 30 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
> index f72ba54..7de02ed 100644
> --- a/drivers/video/backlight/max8925_bl.c
> +++ b/drivers/video/backlight/max8925_bl.c
> @@ -101,6 +101,29 @@ static const struct backlight_ops max8925_backlight_ops = {
> .get_brightness = max8925_backlight_get_brightness,
> };
>
> +#ifdef CONFIG_OF
> +static int max8925_backlight_dt_init(struct platform_device *pdev,
> + struct max8925_backlight_pdata *pdata)
> +{
> + struct device_node *nproot = pdev->dev.parent->of_node, *np;
> + int dual_string;
> +
> + if (!nproot)
> + return -ENODEV;
> + np = of_find_node_by_name(nproot, "backlight");
> + if (!np) {
> + dev_err(&pdev->dev, "failed to find backlight node\n");
> + return -ENODEV;
> + }
> +
> + of_property_read_u32(np, "dual-string", &dual_string);
> + pdata->dual_string = dual_string;
> + return 0;
> +}
> +#else
> +#define max8925_backlight_dt_init(x, y) (-1)
> +#endif
> +
> static int __devinit max8925_backlight_probe(struct platform_device *pdev)
> {
> struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
> @@ -150,6 +173,13 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev)
> platform_set_drvdata(pdev, bl);
>
> value = 0;
> + if (pdev->dev.parent->of_node && !pdata) {
> + pdata = devm_kzalloc(&pdev->dev,
> + sizeof(struct max8925_backlight_pdata),
> + GFP_KERNEL);
> + max8925_backlight_dt_init(pdev, pdata);
> + }
> +
> if (pdata) {
> if (pdata->lxw_scl)
> value |= (1 << 7);
> @@ -161,7 +191,6 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev)
> ret = max8925_set_bits(chip->i2c, data->reg_mode_cntl, 0xfe, value);
> if (ret < 0)
> goto out_brt;
> -
> backlight_update_status(bl);
> return 0;
> out_brt:
Hi Liam, Mark,

Could you help me review this patch, Thanks a lot!

-Qing

2012-11-23 07:25:26

by Qing Xu

Subject: Re: [PATCH 6/7] mfd: max8925: support dt for backlight

On 11/06/2012 03:47 PM, Qing Xu wrote:
> From: Qing Xu <[email protected]>
>
> Signed-off-by: Qing Xu <[email protected]>
> ---
> drivers/video/backlight/max8925_bl.c | 31 ++++++++++++++++++++++++++++++-
> 1 files changed, 30 insertions(+), 1 deletions(-)
>
Hi Richard, Florian,

Could you help to review this patch, thanks a lot!

-Qing

2012-11-23 09:08:41

by Haojian Zhuang

Subject: Re: [PATCH 6/7] mfd: max8925: support dt for backlight

On Tue, Nov 6, 2012 at 3:47 PM, Qing Xu <[email protected]> wrote:
> From: Qing Xu <[email protected]>
>
> Signed-off-by: Qing Xu <[email protected]>
> ---
> drivers/video/backlight/max8925_bl.c | 31 ++++++++++++++++++++++++++++++-
> 1 files changed, 30 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
> index f72ba54..7de02ed 100644
> --- a/drivers/video/backlight/max8925_bl.c
> +++ b/drivers/video/backlight/max8925_bl.c
> @@ -101,6 +101,29 @@ static const struct backlight_ops max8925_backlight_ops = {
> .get_brightness = max8925_backlight_get_brightness,
> };
>
> +#ifdef CONFIG_OF
> +static int max8925_backlight_dt_init(struct platform_device *pdev,
> + struct max8925_backlight_pdata *pdata)
> +{
> + struct device_node *nproot = pdev->dev.parent->of_node, *np;
> + int dual_string;
> +
> + if (!nproot)
> + return -ENODEV;
> + np = of_find_node_by_name(nproot, "backlight");
> + if (!np) {
> + dev_err(&pdev->dev, "failed to find backlight node\n");
> + return -ENODEV;
> + }
> +
> + of_property_read_u32(np, "dual-string", &dual_string);
Please use the property like "maxium,max8925-dual-string" at here. It's used
to avoid naming conflict.

> + pdata->dual_string = dual_string;
> + return 0;
> +}
> +#else
> +#define max8925_backlight_dt_init(x, y) (-1)
> +#endif
> +
> static int __devinit max8925_backlight_probe(struct platform_device *pdev)
> {
> struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
> @@ -150,6 +173,13 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev)
> platform_set_drvdata(pdev, bl);
>
> value = 0;
> + if (pdev->dev.parent->of_node && !pdata) {
> + pdata = devm_kzalloc(&pdev->dev,
> + sizeof(struct max8925_backlight_pdata),
> + GFP_KERNEL);
> + max8925_backlight_dt_init(pdev, pdata);
> + }
> +
> if (pdata) {
> if (pdata->lxw_scl)
> value |= (1 << 7);
> @@ -161,7 +191,6 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev)
> ret = max8925_set_bits(chip->i2c, data->reg_mode_cntl, 0xfe, value);
> if (ret < 0)
> goto out_brt;
> -
> backlight_update_status(bl);
> return 0;
> out_brt:
> --
> 1.7.0.4
>

2012-11-28 02:09:44

by Qing Xu

Subject: Re: [PATCH 6/7] mfd: max8925: support dt for backlight

On 11/23/2012 05:08 PM, Haojian Zhuang wrote:
> On Tue, Nov 6, 2012 at 3:47 PM, Qing Xu <[email protected]> wrote:
>> From: Qing Xu <[email protected]>
>>
>> Signed-off-by: Qing Xu <[email protected]>
>> ---
>> drivers/video/backlight/max8925_bl.c | 31 ++++++++++++++++++++++++++++++-
>> 1 files changed, 30 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
>> index f72ba54..7de02ed 100644
>> --- a/drivers/video/backlight/max8925_bl.c
>> +++ b/drivers/video/backlight/max8925_bl.c
>> @@ -101,6 +101,29 @@ static const struct backlight_ops max8925_backlight_ops = {
>> .get_brightness = max8925_backlight_get_brightness,
>> };
>>
>> +#ifdef CONFIG_OF
>> +static int max8925_backlight_dt_init(struct platform_device *pdev,
>> + struct max8925_backlight_pdata *pdata)
>> +{
>> + struct device_node *nproot = pdev->dev.parent->of_node, *np;
>> + int dual_string;
>> +
>> + if (!nproot)
>> + return -ENODEV;
>> + np = of_find_node_by_name(nproot, "backlight");
>> + if (!np) {
>> + dev_err(&pdev->dev, "failed to find backlight node\n");
>> + return -ENODEV;
>> + }
>> +
>> + of_property_read_u32(np, "dual-string", &dual_string);
> Please use the property like "maxium,max8925-dual-string" at here. It's used
> to avoid naming conflict.

patch updated in v2, and dts patch update in v3

>> + pdata->dual_string = dual_string;
>> + return 0;
>> +}
>> +#else
>> +#define max8925_backlight_dt_init(x, y) (-1)
>> +#endif
>> +
>> static int __devinit max8925_backlight_probe(struct platform_device *pdev)
>> {
>> struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
>> @@ -150,6 +173,13 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev)
>> platform_set_drvdata(pdev, bl);
>>
>> value = 0;
>> + if (pdev->dev.parent->of_node && !pdata) {
>> + pdata = devm_kzalloc(&pdev->dev,
>> + sizeof(struct max8925_backlight_pdata),
>> + GFP_KERNEL);
>> + max8925_backlight_dt_init(pdev, pdata);
>> + }
>> +
>> if (pdata) {
>> if (pdata->lxw_scl)
>> value |= (1 << 7);
>> @@ -161,7 +191,6 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev)
>> ret = max8925_set_bits(chip->i2c, data->reg_mode_cntl, 0xfe, value);
>> if (ret < 0)
>> goto out_brt;
>> -
>> backlight_update_status(bl);
>> return 0;
>> out_brt:
>> --
>> 1.7.0.4
>>