* [PATCH] backlight: pwm: reject legacy pwm request for device defined in dt
@ 2015-06-14 14:29 Vladimir Zapolskiy
2015-09-21 15:16 ` Vladimir Zapolskiy
2015-09-21 23:22 ` Lee Jones
0 siblings, 2 replies; 4+ messages in thread
From: Vladimir Zapolskiy @ 2015-06-14 14:29 UTC (permalink / raw)
To: Lee Jones, Jingoo Han, Thierry Reding; +Cc: linux-pwm, linux-fbdev
Platform PWM backlight data provided by board's device tree should be
complete enough to successfully request a pwm device using pwm_get()
API. This change fixes a bug, when an arbitrary (first found) PWM is
connected to a "pwm-backlight" compatible device, when explicit PWM
device reference is not given.
Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt
already describes "pwms" as a required property, instead of blind
selection of a potentially wrong PWM reject legacy PWM device
registration request, leave legacy API only for non-dt cases.
Based on initial implementation done by Dmitry Eremin-Solenikov.
Reported-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Acked-by: Thierry Reding <thierry.reding@gmail.com>
---
drivers/video/backlight/pwm_bl.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 57cb9ec..9991cdb 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -271,15 +271,16 @@ static int pwm_backlight_probe(struct platform_device *pdev)
}
pb->pwm = devm_pwm_get(&pdev->dev, NULL);
- if (IS_ERR(pb->pwm)) {
+ if (IS_ERR(pb->pwm) && !pdev->dev.of_node) {
dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n");
pb->legacy = true;
pb->pwm = pwm_request(data->pwm_id, "pwm-backlight");
- if (IS_ERR(pb->pwm)) {
- dev_err(&pdev->dev, "unable to request legacy PWM\n");
- ret = PTR_ERR(pb->pwm);
- goto err_alloc;
- }
+ }
+
+ if (IS_ERR(pb->pwm)) {
+ dev_err(&pdev->dev, "unable to request PWM\n");
+ ret = PTR_ERR(pb->pwm);
+ goto err_alloc;
}
dev_dbg(&pdev->dev, "got pwm for backlight\n");
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] backlight: pwm: reject legacy pwm request for device defined in dt
2015-06-14 14:29 [PATCH] backlight: pwm: reject legacy pwm request for device defined in dt Vladimir Zapolskiy
@ 2015-09-21 15:16 ` Vladimir Zapolskiy
2015-09-21 23:22 ` Lee Jones
1 sibling, 0 replies; 4+ messages in thread
From: Vladimir Zapolskiy @ 2015-09-21 15:16 UTC (permalink / raw)
To: Lee Jones, Thierry Reding; +Cc: Jingoo Han, linux-pwm, linux-fbdev
Lee, Thierry,
On 14.06.2015 17:29, Vladimir Zapolskiy wrote:
> Platform PWM backlight data provided by board's device tree should be
> complete enough to successfully request a pwm device using pwm_get()
> API. This change fixes a bug, when an arbitrary (first found) PWM is
> connected to a "pwm-backlight" compatible device, when explicit PWM
> device reference is not given.
>
> Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt
> already describes "pwms" as a required property, instead of blind
> selection of a potentially wrong PWM reject legacy PWM device
> registration request, leave legacy API only for non-dt cases.
>
> Based on initial implementation done by Dmitry Eremin-Solenikov.
>
> Reported-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
> Acked-by: Thierry Reding <thierry.reding@gmail.com>
> ---
> drivers/video/backlight/pwm_bl.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
> index 57cb9ec..9991cdb 100644
> --- a/drivers/video/backlight/pwm_bl.c
> +++ b/drivers/video/backlight/pwm_bl.c
> @@ -271,15 +271,16 @@ static int pwm_backlight_probe(struct platform_device *pdev)
> }
>
> pb->pwm = devm_pwm_get(&pdev->dev, NULL);
> - if (IS_ERR(pb->pwm)) {
> + if (IS_ERR(pb->pwm) && !pdev->dev.of_node) {
> dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n");
> pb->legacy = true;
> pb->pwm = pwm_request(data->pwm_id, "pwm-backlight");
> - if (IS_ERR(pb->pwm)) {
> - dev_err(&pdev->dev, "unable to request legacy PWM\n");
> - ret = PTR_ERR(pb->pwm);
> - goto err_alloc;
> - }
> + }
> +
> + if (IS_ERR(pb->pwm)) {
> + dev_err(&pdev->dev, "unable to request PWM\n");
> + ret = PTR_ERR(pb->pwm);
> + goto err_alloc;
> }
>
> dev_dbg(&pdev->dev, "got pwm for backlight\n");
>
could you please apply this reviewed and acked change?
Thank you in advance.
--
With best wishes,
Vladimir
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] backlight: pwm: reject legacy pwm request for device defined in dt
2015-06-14 14:29 [PATCH] backlight: pwm: reject legacy pwm request for device defined in dt Vladimir Zapolskiy
2015-09-21 15:16 ` Vladimir Zapolskiy
@ 2015-09-21 23:22 ` Lee Jones
2015-10-05 12:46 ` Lee Jones
1 sibling, 1 reply; 4+ messages in thread
From: Lee Jones @ 2015-09-21 23:22 UTC (permalink / raw)
To: Vladimir Zapolskiy; +Cc: Jingoo Han, Thierry Reding, linux-pwm, linux-fbdev
On Sun, 14 Jun 2015, Vladimir Zapolskiy wrote:
> Platform PWM backlight data provided by board's device tree should be
> complete enough to successfully request a pwm device using pwm_get()
> API. This change fixes a bug, when an arbitrary (first found) PWM is
> connected to a "pwm-backlight" compatible device, when explicit PWM
> device reference is not given.
>
> Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt
> already describes "pwms" as a required property, instead of blind
> selection of a potentially wrong PWM reject legacy PWM device
> registration request, leave legacy API only for non-dt cases.
>
> Based on initial implementation done by Dmitry Eremin-Solenikov.
>
> Reported-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
> Acked-by: Thierry Reding <thierry.reding@gmail.com>
> ---
> drivers/video/backlight/pwm_bl.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
Applied, thanks.
> diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
> index 57cb9ec..9991cdb 100644
> --- a/drivers/video/backlight/pwm_bl.c
> +++ b/drivers/video/backlight/pwm_bl.c
> @@ -271,15 +271,16 @@ static int pwm_backlight_probe(struct platform_device *pdev)
> }
>
> pb->pwm = devm_pwm_get(&pdev->dev, NULL);
> - if (IS_ERR(pb->pwm)) {
> + if (IS_ERR(pb->pwm) && !pdev->dev.of_node) {
> dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n");
> pb->legacy = true;
> pb->pwm = pwm_request(data->pwm_id, "pwm-backlight");
> - if (IS_ERR(pb->pwm)) {
> - dev_err(&pdev->dev, "unable to request legacy PWM\n");
> - ret = PTR_ERR(pb->pwm);
> - goto err_alloc;
> - }
> + }
> +
> + if (IS_ERR(pb->pwm)) {
> + dev_err(&pdev->dev, "unable to request PWM\n");
> + ret = PTR_ERR(pb->pwm);
> + goto err_alloc;
> }
>
> dev_dbg(&pdev->dev, "got pwm for backlight\n");
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] backlight: pwm: reject legacy pwm request for device defined in dt
2015-09-21 23:22 ` Lee Jones
@ 2015-10-05 12:46 ` Lee Jones
0 siblings, 0 replies; 4+ messages in thread
From: Lee Jones @ 2015-10-05 12:46 UTC (permalink / raw)
To: Vladimir Zapolskiy; +Cc: Jingoo Han, Thierry Reding, linux-pwm, linux-fbdev
On Tue, 22 Sep 2015, Lee Jones wrote:
> On Sun, 14 Jun 2015, Vladimir Zapolskiy wrote:
>
> > Platform PWM backlight data provided by board's device tree should be
> > complete enough to successfully request a pwm device using pwm_get()
> > API. This change fixes a bug, when an arbitrary (first found) PWM is
> > connected to a "pwm-backlight" compatible device, when explicit PWM
> > device reference is not given.
> >
> > Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt
> > already describes "pwms" as a required property, instead of blind
> > selection of a potentially wrong PWM reject legacy PWM device
> > registration request, leave legacy API only for non-dt cases.
> >
> > Based on initial implementation done by Dmitry Eremin-Solenikov.
> >
> > Reported-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> > Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
> > Acked-by: Thierry Reding <thierry.reding@gmail.com>
> > ---
> > drivers/video/backlight/pwm_bl.c | 13 +++++++------
> > 1 file changed, 7 insertions(+), 6 deletions(-)
>
> Applied, thanks.
Slight change of plan, as the patch does not apply.
Please rebase it on top of the backlight tree and resubmit with my
Ack.
> > diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
> > index 57cb9ec..9991cdb 100644
> > --- a/drivers/video/backlight/pwm_bl.c
> > +++ b/drivers/video/backlight/pwm_bl.c
> > @@ -271,15 +271,16 @@ static int pwm_backlight_probe(struct platform_device *pdev)
> > }
> >
> > pb->pwm = devm_pwm_get(&pdev->dev, NULL);
> > - if (IS_ERR(pb->pwm)) {
> > + if (IS_ERR(pb->pwm) && !pdev->dev.of_node) {
> > dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n");
> > pb->legacy = true;
> > pb->pwm = pwm_request(data->pwm_id, "pwm-backlight");
> > - if (IS_ERR(pb->pwm)) {
> > - dev_err(&pdev->dev, "unable to request legacy PWM\n");
> > - ret = PTR_ERR(pb->pwm);
> > - goto err_alloc;
> > - }
> > + }
> > +
> > + if (IS_ERR(pb->pwm)) {
> > + dev_err(&pdev->dev, "unable to request PWM\n");
> > + ret = PTR_ERR(pb->pwm);
> > + goto err_alloc;
> > }
> >
> > dev_dbg(&pdev->dev, "got pwm for backlight\n");
>
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-10-05 12:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-14 14:29 [PATCH] backlight: pwm: reject legacy pwm request for device defined in dt Vladimir Zapolskiy
2015-09-21 15:16 ` Vladimir Zapolskiy
2015-09-21 23:22 ` Lee Jones
2015-10-05 12:46 ` Lee Jones
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).