backlight: atmel-pwm-bl: fixes and clean ups
Subsystems (4)
cover backlight: atmel-pwm-bl: fixes and clean ups
These patches fix a few issues and clean up the atmel-pwm-bl driver somewhat.
Resend with added ack from Jingo Han.
Johan
Johan Hovold (9):
backlight: atmel-pwm-bl: fix reported brightness
backlight: atmel-pwm-bl: fix gpio polarity in remove
backlight: atmel-pwm-bl: fix module autoload
backlight: atmel-pwm-bl: clean up probe error handling
backlight: atmel-pwm-bl: clean up get_intensity
backlight: atmel-pwm-bl: remove unused include
backlight: atmel-pwm-bl: use gpio_is_valid
backlight: atmel-pwm-bl: refactor gpio_on handling
backlight: atmel-pwm-bl: use gpio_request_one
drivers/video/backlight/atmel-pwm-bl.c | 86 ++++++++++++++++------------------ 1 file changed, 40 insertions(+), 46 deletions(-)
Signature · 1 line
1.8.4
PATCH 1/9 backlight: atmel-pwm-bl: fix reported brightness
The driver supports 16-bit brightness values, but the value returned from get_brightness was truncated to eight bits.
--- drivers/video/backlight/atmel-pwm-bl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +2 -2
@@ -70,7 +70,7 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)static int atmel_pwm_bl_get_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd); -u8 intensity; +u32 intensity;if (pwmbl->pdata->pwm_active_low) { intensity = pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY) -
@@ -80,7 +80,7 @@ static int atmel_pwm_bl_get_intensity(struct backlight_device *bd)pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); } -return intensity; +return (u16 )intensity; }static int atmel_pwm_bl_init_pwm (struct atmel_pwm_bl *pwmbl)
Signature · 1 line
1.8.4
Re: [PATCH 1/9] backlight: atmel-pwm-bl: fix reported brightness
Quoted 24 lines · Johan Hovold
The driver supports 16-bit brightness values, but the value returned from
get_brightnesswas truncated to eight bits.Acked-by Jingoo Han <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/video/backlight/atmel-pwm-bl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/video/backlight/atmel-pwm-bl.c +1
-1@@ -70,7 +70,7 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)static int atmel_pwm_bl_get_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd); -u8 intensity; +u32 intensity;if (pwmbl->pdata->pwm_active_low) { intensity = pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY) -
drivers/video/backlight/atmel-pwm-bl.c static int atmel_pwm_bl_get_intensity(struct backlight_device *bd) · line 83
Quoted 5 lines
drivers/video/backlight/atmel-pwm-bl.c +1
-1@@ -80,7 +80,7 @@ static int atmel_pwm_bl_get_intensity(struct backlight_device *bd)pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); } -return intensity; +return (u16 )intensity;
no cast mask it
Quoted 6 lines
drivers/video/backlight/atmel-pwm-bl.c +0
-0}static int atmel_pwm_bl_init_pwm (struct atmel_pwm_bl *pwmbl)Signature · 1 line
1.8.4
Re: [PATCH 1/9] backlight: atmel-pwm-bl: fix reported brightness
Quoted 28 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 27 lines · Johan Hovold
The driver supports 16-bit brightness values, but the value returned from
get_brightnesswas truncated to eight bits.Acked-by Jingoo Han <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/video/backlight/atmel-pwm-bl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/video/backlight/atmel-pwm-bl.c +1
-1@@ -70,7 +70,7 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)static int atmel_pwm_bl_get_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd); -u8 intensity; +u32 intensity;if (pwmbl->pdata->pwm_active_low) { intensity = pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY) -@@ -80,7 +80,7 @@ static int atmel_pwm_bl_get_intensity(struct backlight_device *bd)pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); }
Quoted 3 lines
drivers/video/backlight/atmel-pwm-bl.c static int atmel_pwm_bl_get_intensity(struct backlight_device *bd) · line 83
Quoted 2 lines
drivers/video/backlight/atmel-pwm-bl.c +1
-1-return intensity; +return (u16 )intensity;no cast mask it
Yeah, perhaps that is better. I discussed this a bit with Jingoo Han in the thread of the original post. I'll respin.
Thanks,
Johan
Quoted 6 lines
Quoted 6 lines
drivers/video/backlight/atmel-pwm-bl.c +0
-0}static int atmel_pwm_bl_init_pwm (struct atmel_pwm_bl *pwmbl)Signature · 1 line
1.8.4
PATCH 2/9 backlight: atmel-pwm-bl: fix gpio polarity in remove
In reply to Johan HovoldMake sure to honour gpio polarity also at remove so that the backlight is actually disabled on boards with active-low enable pin.
--- drivers/video/backlight/atmel-pwm-bl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +4 -2
@@ -205,8 +205,10 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) {struct atmel_pwm_bl *pwmbl =platform_get_drvdata (pdev); -if (pwmbl->gpio_on !=-1 ) -gpio_set_value (pwmbl->gpio_on,0 ); +if (pwmbl->gpio_on !=-1 ) { +gpio_set_value (pwmbl->gpio_on, +0 ^ pwmbl->pdata->on_active_low); + }pwm_channel_disable (&pwmbl->pwmc);pwm_channel_free (&pwmbl->pwmc);
Signature · 1 line
1.8.4
Re: [PATCH 2/9] backlight: atmel-pwm-bl: fix gpio polarity in remove
Quoted 15 lines · Johan Hovold
Make sure to honour gpio polarity also at remove so that the backlight is actually disabled on boards with active-low enable pin.
Acked-by Jingoo Han <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/video/backlight/atmel-pwm-bl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/video/backlight/atmel-pwm-bl.c +0
-0
drivers/video/backlight/atmel-pwm-bl.c static int atmel_pwm_bl_remove(struct platform_device *pdev) · line 208
Quoted 6 lines
drivers/video/backlight/atmel-pwm-bl.c +1
-2@@ -205,8 +205,10 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) {struct atmel_pwm_bl *pwmbl =platform_get_drvdata (pdev); -if (pwmbl->gpio_on !=-1 ) -gpio_set_value (pwmbl->gpio_on,0 ); +if (pwmbl->gpio_on !=-1 ) {
here we need to use gpio_is_valid
Quoted 9 lines
drivers/video/backlight/atmel-pwm-bl.c +3
-0+gpio_set_value (pwmbl->gpio_on, +0 ^ pwmbl->pdata->on_active_low); + }pwm_channel_disable (&pwmbl->pwmc);pwm_channel_free (&pwmbl->pwmc);Signature · 1 line
1.8.4
Re: [PATCH 2/9] backlight: atmel-pwm-bl: fix gpio polarity in remove
Quoted 19 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 18 lines · Johan Hovold
Make sure to honour gpio polarity also at remove so that the backlight is actually disabled on boards with active-low enable pin.
Acked-by Jingoo Han <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/video/backlight/atmel-pwm-bl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/video/backlight/atmel-pwm-bl.c +0
-0@@ -205,8 +205,10 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) {struct atmel_pwm_bl *pwmbl =platform_get_drvdata (pdev);
Quoted 4 lines
drivers/video/backlight/atmel-pwm-bl.c static int atmel_pwm_bl_remove(struct platform_device *pdev) · line 208
Quoted 3 lines
drivers/video/backlight/atmel-pwm-bl.c +1
-2-if (pwmbl->gpio_on !=-1 ) -gpio_set_value (pwmbl->gpio_on,0 ); +if (pwmbl->gpio_on !=-1 ) {here we need to use
gpio_is_valid
That is a different issue which is fixed by patch 7/9. It doesn't make sense to only change one of the gpio-validity tests.
Johan
Quoted 9 lines
Quoted 9 lines
drivers/video/backlight/atmel-pwm-bl.c +3
-0+gpio_set_value (pwmbl->gpio_on, +0 ^ pwmbl->pdata->on_active_low); + }pwm_channel_disable (&pwmbl->pwmc);pwm_channel_free (&pwmbl->pwmc);Signature · 1 line
1.8.4
PATCH 3/9 backlight: atmel-pwm-bl: fix module autoload
In reply to Johan HovoldAdd missing module alias which is needed for module autoloading.
--- drivers/video/backlight/atmel-pwm-bl.c | 1 + 1 file changed, 1 insertion(+)
drivers/video/backlight/atmel-pwm-bl.c +1 -0
@@ -229,3 +229,4 @@ module_platform_driver(atmel_pwm_bl_driver);MODULE_AUTHOR ("Hans-Christian egtvedt <[email protected]>" );MODULE_DESCRIPTION ("Atmel PWM backlight driver" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:atmel-pwm-bl" );
Signature · 1 line
1.8.4
PATCH 4/9 backlight: atmel-pwm-bl: clean up probe error handling
In reply to Johan HovoldClean up probe error handling by checking parameters before any allocations and removing an obsolete error label. Also remove unnecessary reset of private gpio number.
--- drivers/video/backlight/atmel-pwm-bl.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +12 -19
@@ -126,40 +126,33 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)struct atmel_pwm_bl *pwmbl;int retval; + pdata =dev_get_platdata (&pdev->dev); +if (!pdata) +return -ENODEV ; + +if (pdata->pwm_compare_max < pdata->pwm_duty_max || + pdata->pwm_duty_min > pdata->pwm_duty_max || + pdata->pwm_frequency =0 ) +return -EINVAL ; + pwmbl =devm_kzalloc (&pdev->dev,sizeof (struct atmel_pwm_bl ),GFP_KERNEL );if (!pwmbl)return -ENOMEM ; pwmbl->pdev = pdev; - - pdata =dev_get_platdata (&pdev->dev); -if (!pdata) { - retval = -ENODEV ; - goto err_free_mem; - } - -if (pdata->pwm_compare_max < pdata->pwm_duty_max || - pdata->pwm_duty_min > pdata->pwm_duty_max || - pdata->pwm_frequency =0 ) { - retval = -EINVAL ; - goto err_free_mem; - } - pwmbl->pdata = pdata; pwmbl->gpio_on = pdata->gpio_on; retval =pwm_channel_alloc (pdata->pwm_channel, &pwmbl->pwmc);if (retval) - goto err_free_mem; +return retval;if (pwmbl->gpio_on !=-1 ) { retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on,"gpio_atmel_pwm_bl" ); -if (retval) { - pwmbl->gpio_on =-1 ; +if (retval) goto err_free_pwm; - }/* Turn display off by default. */ retval = gpio_direction_output(pwmbl->gpio_on,
@@ -197,7 +190,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev) err_free_pwm:pwm_channel_free (&pwmbl->pwmc); -err_free_mem: +return retval; }
Signature · 1 line
1.8.4
Re: [PATCH 4/9] backlight: atmel-pwm-bl: clean up probe error handling
Quoted 46 lines · Johan Hovold
Clean up probe error handling by checking parameters before any allocations and removing an obsolete error label. Also remove unnecessary reset of private gpio number.
Acked-by Jingoo Han <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/video/backlight/atmel-pwm-bl.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-)drivers/video/backlight/atmel-pwm-bl.c +9
-13@@ -126,40 +126,33 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)struct atmel_pwm_bl *pwmbl;int retval; + pdata =dev_get_platdata (&pdev->dev); +if (!pdata) +return -ENODEV ; + +if (pdata->pwm_compare_max < pdata->pwm_duty_max || + pdata->pwm_duty_min > pdata->pwm_duty_max || + pdata->pwm_frequency =0 ) +return -EINVAL ; + pwmbl =devm_kzalloc (&pdev->dev,sizeof (struct atmel_pwm_bl ),GFP_KERNEL );if (!pwmbl)return -ENOMEM ; pwmbl->pdev = pdev; - - pdata =dev_get_platdata (&pdev->dev); -if (!pdata) { - retval = -ENODEV ; - goto err_free_mem; - } - -if (pdata->pwm_compare_max < pdata->pwm_duty_max || - pdata->pwm_duty_min > pdata->pwm_duty_max || - pdata->pwm_frequency =0 ) { - retval = -EINVAL ; - goto err_free_mem; - }
drivers/video/backlight/atmel-pwm-bl.c static int atmel_pwm_bl_probe(struct platform_device *pdev) · line 151
Quoted 10 lines
drivers/video/backlight/atmel-pwm-bl.c +1
-2- pwmbl->pdata = pdata; pwmbl->gpio_on = pdata->gpio_on; retval =pwm_channel_alloc (pdata->pwm_channel, &pwmbl->pwmc);if (retval) - goto err_free_mem; +return retval;if (pwmbl->gpio_on !=-1 ) {
gpio_is_valid here
Quoted 22 lines
drivers/video/backlight/atmel-pwm-bl.c +2
-4retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on,"gpio_atmel_pwm_bl" ); -if (retval) { - pwmbl->gpio_on =-1 ; +if (retval) goto err_free_pwm; - }/* Turn display off by default. */ retval = gpio_direction_output(pwmbl->gpio_on,@@ -197,7 +190,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev) err_free_pwm:pwm_channel_free (&pwmbl->pwmc); -err_free_mem: +return retval; }Signature · 1 line
1.8.4
Re: [PATCH 4/9] backlight: atmel-pwm-bl: clean up probe error handling
Quoted 51 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 50 lines · Johan Hovold
Clean up probe error handling by checking parameters before any allocations and removing an obsolete error label. Also remove unnecessary reset of private gpio number.
Acked-by Jingoo Han <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/video/backlight/atmel-pwm-bl.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-)drivers/video/backlight/atmel-pwm-bl.c +9
-14@@ -126,40 +126,33 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)struct atmel_pwm_bl *pwmbl;int retval; + pdata =dev_get_platdata (&pdev->dev); +if (!pdata) +return -ENODEV ; + +if (pdata->pwm_compare_max < pdata->pwm_duty_max || + pdata->pwm_duty_min > pdata->pwm_duty_max || + pdata->pwm_frequency =0 ) +return -EINVAL ; + pwmbl =devm_kzalloc (&pdev->dev,sizeof (struct atmel_pwm_bl ),GFP_KERNEL );if (!pwmbl)return -ENOMEM ; pwmbl->pdev = pdev; - - pdata =dev_get_platdata (&pdev->dev); -if (!pdata) { - retval = -ENODEV ; - goto err_free_mem; - } - -if (pdata->pwm_compare_max < pdata->pwm_duty_max || - pdata->pwm_duty_min > pdata->pwm_duty_max || - pdata->pwm_frequency =0 ) { - retval = -EINVAL ; - goto err_free_mem; - } - pwmbl->pdata = pdata; pwmbl->gpio_on = pdata->gpio_on;
Quoted 7 lines
drivers/video/backlight/atmel-pwm-bl.c static int atmel_pwm_bl_probe(struct platform_device *pdev) · line 151
Quoted 6 lines
drivers/video/backlight/atmel-pwm-bl.c +1
-1retval =pwm_channel_alloc (pdata->pwm_channel, &pwmbl->pwmc);if (retval) - goto err_free_mem; +return retval;if (pwmbl->gpio_on !=-1 ) {
gpio_is_validhere
Again, this is unrelated to this patch and is fixed separately in patch 7/9.
Johan
Quoted 22 lines
Quoted 22 lines
drivers/video/backlight/atmel-pwm-bl.c +2
-4retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on,"gpio_atmel_pwm_bl" ); -if (retval) { - pwmbl->gpio_on =-1 ; +if (retval) goto err_free_pwm; - }/* Turn display off by default. */ retval = gpio_direction_output(pwmbl->gpio_on,@@ -197,7 +190,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev) err_free_pwm:pwm_channel_free (&pwmbl->pwmc); -err_free_mem: +return retval; }Signature · 1 line
1.8.4
PATCH 5/9 backlight: atmel-pwm-bl: clean up get_intensity
In reply to Johan HovoldClean up get_intensity to increase readability.
--- drivers/video/backlight/atmel-pwm-bl.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +6 -7
@@ -70,15 +70,14 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)static int atmel_pwm_bl_get_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd); +u32 cdty;u32 intensity; -if (pwmbl->pdata->pwm_active_low) { - intensity =pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ) - - pwmbl->pdata->pwm_duty_min; - }else { - intensity = pwmbl->pdata->pwm_duty_max - -pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); - } + cdty =pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); +if (pwmbl->pdata->pwm_active_low) + intensity = cdty - pwmbl->pdata->pwm_duty_min; +else + intensity = pwmbl->pdata->pwm_duty_max - cdty;return (u16 )intensity; }
Signature · 1 line
1.8.4
Re: [PATCH 5/9] backlight: atmel-pwm-bl: clean up get_intensity
Quoted 4 lines · Johan Hovold
Clean up
get_intensityto increase readability.Acked-by Jingoo Han <[email protected]>Signed-off-by Johan Hovold <[email protected]>
this ok
Quoted 33 lines
--- drivers/video/backlight/atmel-pwm-bl.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)drivers/video/backlight/atmel-pwm-bl.c +6
-7@@ -70,15 +70,14 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)static int atmel_pwm_bl_get_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd); +u32 cdty;u32 intensity; -if (pwmbl->pdata->pwm_active_low) { - intensity =pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ) - - pwmbl->pdata->pwm_duty_min; - }else { - intensity = pwmbl->pdata->pwm_duty_max - -pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); - } + cdty =pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); +if (pwmbl->pdata->pwm_active_low) + intensity = cdty - pwmbl->pdata->pwm_duty_min; +else + intensity = pwmbl->pdata->pwm_duty_max - cdty;return (u16 )intensity; }Signature · 1 line
1.8.4
PATCH 6/9 backlight: atmel-pwm-bl: remove unused include
In reply to Johan HovoldRemove unused include of clk.h.
--- drivers/video/backlight/atmel-pwm-bl.c | 1 - 1 file changed, 1 deletion(-)
drivers/video/backlight/atmel-pwm-bl.c +0 -1
@@ -12,7 +12,6 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/fb.h> -#include <linux/clk.h> #include <linux/gpio.h> #include <linux/backlight.h> #include <linux/atmel_pwm.h>
Signature · 1 line
1.8.4
PATCH 7/9 backlight: atmel-pwm-bl: use gpio_is_valid
In reply to Johan HovoldUse gpio_is_valid rather than open coding the more restrictive != -1 test.
--- drivers/video/backlight/atmel-pwm-bl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +4 -4
@@ -48,7 +48,7 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd) pwm_duty = pwmbl->pdata->pwm_duty_min;if (!intensity) { -if (pwmbl->gpio_on !=-1 ) { +if (gpio_is_valid (pwmbl->gpio_on)) {gpio_set_value (pwmbl->gpio_on,0 ^ pwmbl->pdata->on_active_low); }
@@ -57,7 +57,7 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd) }else {pwm_channel_enable (&pwmbl->pwmc);pwm_channel_writel (&pwmbl->pwmc,PWM_CUPD , pwm_duty); -if (pwmbl->gpio_on !=-1 ) { +if (gpio_is_valid (pwmbl->gpio_on)) {gpio_set_value (pwmbl->gpio_on,1 ^ pwmbl->pdata->on_active_low); }
@@ -146,7 +146,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)if (retval)return retval; -if (pwmbl->gpio_on !=-1 ) { +if (gpio_is_valid (pwmbl->gpio_on)) { retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on,"gpio_atmel_pwm_bl" );if (retval)
@@ -196,7 +196,7 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) {struct atmel_pwm_bl *pwmbl =platform_get_drvdata (pdev); -if (pwmbl->gpio_on !=-1 ) { +if (gpio_is_valid (pwmbl->gpio_on)) {gpio_set_value (pwmbl->gpio_on,0 ^ pwmbl->pdata->on_active_low); }
Signature · 1 line
1.8.4
PATCH 8/9 backlight: atmel-pwm-bl: refactor gpio_on handling
In reply to Johan HovoldAdd helper function to control the gpio_on signal.
--- drivers/video/backlight/atmel-pwm-bl.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +11 -12
@@ -26,6 +26,14 @@ struct atmel_pwm_bl {int gpio_on; }; +static void atmel_pwm_bl_set_gpio_on (struct atmel_pwm_bl *pwmbl,int on) +{ +if (!gpio_is_valid (pwmbl->gpio_on)) +return ; + +gpio_set_value (pwmbl->gpio_on, on ^ pwmbl->pdata->on_active_low); +} +static int atmel_pwm_bl_set_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd);
@@ -48,19 +56,13 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd) pwm_duty = pwmbl->pdata->pwm_duty_min;if (!intensity) { -if (gpio_is_valid (pwmbl->gpio_on)) { -gpio_set_value (pwmbl->gpio_on, -0 ^ pwmbl->pdata->on_active_low); - } +atmel_pwm_bl_set_gpio_on (pwmbl,0 );pwm_channel_writel (&pwmbl->pwmc,PWM_CUPD , pwm_duty);pwm_channel_disable (&pwmbl->pwmc); }else {pwm_channel_enable (&pwmbl->pwmc);pwm_channel_writel (&pwmbl->pwmc,PWM_CUPD , pwm_duty); -if (gpio_is_valid (pwmbl->gpio_on)) { -gpio_set_value (pwmbl->gpio_on, -1 ^ pwmbl->pdata->on_active_low); - } +atmel_pwm_bl_set_gpio_on (pwmbl,1 ); }return 0 ;
@@ -196,10 +198,7 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) {struct atmel_pwm_bl *pwmbl =platform_get_drvdata (pdev); -if (gpio_is_valid (pwmbl->gpio_on)) { -gpio_set_value (pwmbl->gpio_on, -0 ^ pwmbl->pdata->on_active_low); - } +atmel_pwm_bl_set_gpio_on (pwmbl,0 );pwm_channel_disable (&pwmbl->pwmc);pwm_channel_free (&pwmbl->pwmc);
Signature · 1 line
1.8.4
Re: [PATCH 8/9] backlight: atmel-pwm-bl: refactor gpio_on handling
Quoted 4 lines · Johan Hovold
Add helper function to control the
gpio_onsignal.Acked-by Jingoo Han <[email protected]>Signed-off-by Johan Hovold <[email protected]>
ok
Quoted 60 lines
--- drivers/video/backlight/atmel-pwm-bl.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)drivers/video/backlight/atmel-pwm-bl.c +11
-12@@ -26,6 +26,14 @@ struct atmel_pwm_bl {int gpio_on; }; +static void atmel_pwm_bl_set_gpio_on (struct atmel_pwm_bl *pwmbl,int on) +{ +if (!gpio_is_valid (pwmbl->gpio_on)) +return ; + +gpio_set_value (pwmbl->gpio_on, on ^ pwmbl->pdata->on_active_low); +} +static int atmel_pwm_bl_set_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd);@@ -48,19 +56,13 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd) pwm_duty = pwmbl->pdata->pwm_duty_min;if (!intensity) { -if (gpio_is_valid (pwmbl->gpio_on)) { -gpio_set_value (pwmbl->gpio_on, -0 ^ pwmbl->pdata->on_active_low); - } +atmel_pwm_bl_set_gpio_on (pwmbl,0 );pwm_channel_writel (&pwmbl->pwmc,PWM_CUPD , pwm_duty);pwm_channel_disable (&pwmbl->pwmc); }else {pwm_channel_enable (&pwmbl->pwmc);pwm_channel_writel (&pwmbl->pwmc,PWM_CUPD , pwm_duty); -if (gpio_is_valid (pwmbl->gpio_on)) { -gpio_set_value (pwmbl->gpio_on, -1 ^ pwmbl->pdata->on_active_low); - } +atmel_pwm_bl_set_gpio_on (pwmbl,1 ); }return 0 ;@@ -196,10 +198,7 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) {struct atmel_pwm_bl *pwmbl =platform_get_drvdata (pdev); -if (gpio_is_valid (pwmbl->gpio_on)) { -gpio_set_value (pwmbl->gpio_on, -0 ^ pwmbl->pdata->on_active_low); - } +atmel_pwm_bl_set_gpio_on (pwmbl,0 );pwm_channel_disable (&pwmbl->pwmc);pwm_channel_free (&pwmbl->pwmc);Signature · 1 line
1.8.4
PATCH 9/9 backlight: atmel-pwm-bl: use gpio_request_one
In reply to Johan HovoldUse devm_gpio_request_one rather than requesting and setting direction in two calls.
--- drivers/video/backlight/atmel-pwm-bl.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +8 -7
@@ -124,6 +124,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)const struct atmel_pwm_bl_platform_data *pdata;struct backlight_device *bldev;struct atmel_pwm_bl *pwmbl; +int flags;int retval; pdata =dev_get_platdata (&pdev->dev);
@@ -149,14 +150,14 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)return retval;if (gpio_is_valid (pwmbl->gpio_on)) { - retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on, -"gpio_atmel_pwm_bl" ); -if (retval) - goto err_free_pwm; -/* Turn display off by default. */ - retval =gpio_direction_output (pwmbl->gpio_on, -0 ^ pdata->on_active_low); +if (pdata->on_active_low) + flags =GPIOF_OUT_INIT_HIGH ; +else + flags =GPIOF_OUT_INIT_LOW ; + + retval =devm_gpio_request_one (&pdev->dev, pwmbl->gpio_on, + flags,"gpio_atmel_pwm_bl" );if (retval) goto err_free_pwm; }
Signature · 1 line
1.8.4
Re: [PATCH 9/9] backlight: atmel-pwm-bl: use gpio_request_one
Quoted 2 lines · Johan Hovold
Use
devm_gpio_request_onerather than requesting and setting direction in two calls.
this is the same I do not see any advantage
and as I said for ather backligth It's wrong to enable or disable it at probe as the bootloader might have already enable it for splash screen
Best Regards,
J.
Quoted 44 lines
Acked-by Jingoo Han <[email protected]>:wSigned-off-by Johan Hovold <[email protected]>--- drivers/video/backlight/atmel-pwm-bl.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)drivers/video/backlight/atmel-pwm-bl.c +8
-7@@ -124,6 +124,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)const struct atmel_pwm_bl_platform_data *pdata;struct backlight_device *bldev;struct atmel_pwm_bl *pwmbl; +int flags;int retval; pdata =dev_get_platdata (&pdev->dev);@@ -149,14 +150,14 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)return retval;if (gpio_is_valid (pwmbl->gpio_on)) { - retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on, -"gpio_atmel_pwm_bl" ); -if (retval) - goto err_free_pwm; -/* Turn display off by default. */ - retval =gpio_direction_output (pwmbl->gpio_on, -0 ^ pdata->on_active_low); +if (pdata->on_active_low) + flags =GPIOF_OUT_INIT_HIGH ; +else + flags =GPIOF_OUT_INIT_LOW ; + + retval =devm_gpio_request_one (&pdev->dev, pwmbl->gpio_on, + flags,"gpio_atmel_pwm_bl" );if (retval) goto err_free_pwm; }Signature · 1 line
1.8.4
Re: [PATCH 9/9] backlight: atmel-pwm-bl: use gpio_request_one
Quoted 5 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 2 lines · Johan Hovold
Use
devm_gpio_request_onerather than requesting and setting direction in two calls.this is the same I do not see any advantage
It removes one error path.
Quoted 2 lines
and as I said for ather backligth It's wrong to enable or disable it at probe as the bootloader might have already enable it for splash screen
I agree with you on that, and it's actually the reason for the below clean up. I use a second patch:
if (gpio_is_valid(pwmbl->gpio_on)) {
- /* Turn display off by default. */
- if (pdata->on_active_low)
+ /* Turn display off unless already enabled. */
+ if (pdata->gpio_on_enabled ^ pdata->on_active_low)
flags = GPIOF_OUT_INIT_HIGH;
else
flags = GPIOF_OUT_INIT_LOW;to make sure the driver does not temporarily disable the backlight at probe.
Decided not to submit it as part of this series when I realised that several other backlight drivers did the same, but perhaps I should?
Thanks,
Johan
Quoted 44 lines
Quoted 44 lines
Acked-by Jingoo Han <[email protected]>:wSigned-off-by Johan Hovold <[email protected]>--- drivers/video/backlight/atmel-pwm-bl.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)drivers/video/backlight/atmel-pwm-bl.c +8
-7@@ -124,6 +124,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)const struct atmel_pwm_bl_platform_data *pdata;struct backlight_device *bldev;struct atmel_pwm_bl *pwmbl; +int flags;int retval; pdata =dev_get_platdata (&pdev->dev);@@ -149,14 +150,14 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)return retval;if (gpio_is_valid (pwmbl->gpio_on)) { - retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on, -"gpio_atmel_pwm_bl" ); -if (retval) - goto err_free_pwm; -/* Turn display off by default. */ - retval =gpio_direction_output (pwmbl->gpio_on, -0 ^ pdata->on_active_low); +if (pdata->on_active_low) + flags =GPIOF_OUT_INIT_HIGH ; +else + flags =GPIOF_OUT_INIT_LOW ; + + retval =devm_gpio_request_one (&pdev->dev, pwmbl->gpio_on, + flags,"gpio_atmel_pwm_bl" );if (retval) goto err_free_pwm; }Signature · 1 line
1.8.4
Re: [PATCH 9/9] backlight: atmel-pwm-bl: use gpio_request_one
Quoted 24 lines · Johan Hovold
Quoted 5 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 2 lines · Johan Hovold
Use
devm_gpio_request_onerather than requesting and setting direction in two calls.this is the same I do not see any advantage
It removes one error path.
Quoted 2 lines
and as I said for ather backligth It's wrong to enable or disable it at probe as the bootloader might have already enable it for splash screen
I agree with you on that, and it's actually the reason for the below clean up. I use a second patch:
if (gpio_is_valid(pwmbl->gpio_on)) {(quoted diff) +2
-2- /* Turn display off by default. */ - if (pdata->on_active_low) + /* Turn display off unless already enabled. */ + if (pdata->gpio_on_enabled ^ pdata->on_active_low) flags = GPIOF_OUT_INIT_HIGH; else flags = GPIOF_OUT_INIT_LOW;
Quoted 5 lines
to make sure the driver does not temporarily disable the backlight at probe.
Decided not to submit it as part of this series when I realised that several other backlight drivers did the same, but perhaps I should?
I'm not happy with this idea to play with enable at probe time
we need to detect the current status if possible and only enable or disable when requiered
Best Regards,
J.
Quoted 48 lines
Thanks,
JohanQuoted 44 lines
Quoted 44 lines
Acked-by Jingoo Han <[email protected]>:wSigned-off-by Johan Hovold <[email protected]>--- drivers/video/backlight/atmel-pwm-bl.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)drivers/video/backlight/atmel-pwm-bl.c +8
-7@@ -124,6 +124,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)const struct atmel_pwm_bl_platform_data *pdata;struct backlight_device *bldev;struct atmel_pwm_bl *pwmbl; +int flags;int retval; pdata =dev_get_platdata (&pdev->dev);@@ -149,14 +150,14 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)return retval;if (gpio_is_valid (pwmbl->gpio_on)) { - retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on, -"gpio_atmel_pwm_bl" ); -if (retval) - goto err_free_pwm; -/* Turn display off by default. */ - retval =gpio_direction_output (pwmbl->gpio_on, -0 ^ pdata->on_active_low); +if (pdata->on_active_low) + flags =GPIOF_OUT_INIT_HIGH ; +else + flags =GPIOF_OUT_INIT_LOW ; + + retval =devm_gpio_request_one (&pdev->dev, pwmbl->gpio_on, + flags,"gpio_atmel_pwm_bl" );if (retval) goto err_free_pwm; }Signature · 1 line
1.8.4
v2 cover backlight: atmel-pwm-bl: fixes and clean ups
In reply to Johan HovoldThese patches fix a few issues and clean up the atmel-pwm-bl driver somewhat.
Acks from Jingoo Han retained on all patches but the slightly modified first patch.
Johan
v2:
- mask returned brightness rather than cast it to u16 (patch 1/9)
Johan Hovold (9):
backlight: atmel-pwm-bl: fix reported brightness
backlight: atmel-pwm-bl: fix gpio polarity in remove
backlight: atmel-pwm-bl: fix module autoload
backlight: atmel-pwm-bl: clean up probe error handling
backlight: atmel-pwm-bl: clean up get_intensity
backlight: atmel-pwm-bl: remove unused include
backlight: atmel-pwm-bl: use gpio_is_valid
backlight: atmel-pwm-bl: refactor gpio_on handling
backlight: atmel-pwm-bl: use gpio_request_one
drivers/video/backlight/atmel-pwm-bl.c | 86 ++++++++++++++++------------------ 1 file changed, 40 insertions(+), 46 deletions(-)
Signature · 1 line
1.8.4.2
PATCH v2 1/9 backlight: atmel-pwm-bl: fix reported brightness
The driver supports 16-bit brightness values, but the value returned from get_brightness was truncated to eight bits.
--- drivers/video/backlight/atmel-pwm-bl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +2 -2
@@ -70,7 +70,7 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)static int atmel_pwm_bl_get_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd); -u8 intensity; +u32 intensity;if (pwmbl->pdata->pwm_active_low) { intensity = pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY) -
@@ -80,7 +80,7 @@ static int atmel_pwm_bl_get_intensity(struct backlight_device *bd)pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); } -return intensity; +return intensity &0xffff ; }static int atmel_pwm_bl_init_pwm (struct atmel_pwm_bl *pwmbl)
Signature · 1 line
1.8.4.2
PATCH v2 2/9 backlight: atmel-pwm-bl: fix gpio polarity in remove
In reply to Johan HovoldMake sure to honour gpio polarity also at remove so that the backlight is actually disabled on boards with active-low enable pin.
--- drivers/video/backlight/atmel-pwm-bl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +4 -2
@@ -205,8 +205,10 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) {struct atmel_pwm_bl *pwmbl =platform_get_drvdata (pdev); -if (pwmbl->gpio_on !=-1 ) -gpio_set_value (pwmbl->gpio_on,0 ); +if (pwmbl->gpio_on !=-1 ) { +gpio_set_value (pwmbl->gpio_on, +0 ^ pwmbl->pdata->on_active_low); + }pwm_channel_disable (&pwmbl->pwmc);pwm_channel_free (&pwmbl->pwmc);
Signature · 1 line
1.8.4.2
PATCH v2 3/9 backlight: atmel-pwm-bl: fix module autoload
In reply to Johan HovoldAdd missing module alias which is needed for module autoloading.
--- drivers/video/backlight/atmel-pwm-bl.c | 1 + 1 file changed, 1 insertion(+)
drivers/video/backlight/atmel-pwm-bl.c +1 -0
@@ -229,3 +229,4 @@ module_platform_driver(atmel_pwm_bl_driver);MODULE_AUTHOR ("Hans-Christian egtvedt <[email protected]>" );MODULE_DESCRIPTION ("Atmel PWM backlight driver" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:atmel-pwm-bl" );
Signature · 1 line
1.8.4.2
PATCH v2 4/9 backlight: atmel-pwm-bl: clean up probe error handling
In reply to Johan HovoldClean up probe error handling by checking parameters before any allocations and removing an obsolete error label. Also remove unnecessary reset of private gpio number.
--- drivers/video/backlight/atmel-pwm-bl.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +12 -19
@@ -126,40 +126,33 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)struct atmel_pwm_bl *pwmbl;int retval; + pdata =dev_get_platdata (&pdev->dev); +if (!pdata) +return -ENODEV ; + +if (pdata->pwm_compare_max < pdata->pwm_duty_max || + pdata->pwm_duty_min > pdata->pwm_duty_max || + pdata->pwm_frequency =0 ) +return -EINVAL ; + pwmbl =devm_kzalloc (&pdev->dev,sizeof (struct atmel_pwm_bl ),GFP_KERNEL );if (!pwmbl)return -ENOMEM ; pwmbl->pdev = pdev; - - pdata =dev_get_platdata (&pdev->dev); -if (!pdata) { - retval = -ENODEV ; - goto err_free_mem; - } - -if (pdata->pwm_compare_max < pdata->pwm_duty_max || - pdata->pwm_duty_min > pdata->pwm_duty_max || - pdata->pwm_frequency =0 ) { - retval = -EINVAL ; - goto err_free_mem; - } - pwmbl->pdata = pdata; pwmbl->gpio_on = pdata->gpio_on; retval =pwm_channel_alloc (pdata->pwm_channel, &pwmbl->pwmc);if (retval) - goto err_free_mem; +return retval;if (pwmbl->gpio_on !=-1 ) { retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on,"gpio_atmel_pwm_bl" ); -if (retval) { - pwmbl->gpio_on =-1 ; +if (retval) goto err_free_pwm; - }/* Turn display off by default. */ retval = gpio_direction_output(pwmbl->gpio_on,
@@ -197,7 +190,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev) err_free_pwm:pwm_channel_free (&pwmbl->pwmc); -err_free_mem: +return retval; }
Signature · 1 line
1.8.4.2
PATCH v2 5/9 backlight: atmel-pwm-bl: clean up get_intensity
In reply to Johan HovoldClean up get_intensity to increase readability.
--- drivers/video/backlight/atmel-pwm-bl.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +6 -7
@@ -70,15 +70,14 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)static int atmel_pwm_bl_get_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd); +u32 cdty;u32 intensity; -if (pwmbl->pdata->pwm_active_low) { - intensity =pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ) - - pwmbl->pdata->pwm_duty_min; - }else { - intensity = pwmbl->pdata->pwm_duty_max - -pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); - } + cdty =pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); +if (pwmbl->pdata->pwm_active_low) + intensity = cdty - pwmbl->pdata->pwm_duty_min; +else + intensity = pwmbl->pdata->pwm_duty_max - cdty;return intensity &0xffff ; }
Signature · 1 line
1.8.4.2
PATCH v2 6/9 backlight: atmel-pwm-bl: remove unused include
In reply to Johan HovoldRemove unused include of clk.h.
--- drivers/video/backlight/atmel-pwm-bl.c | 1 - 1 file changed, 1 deletion(-)
drivers/video/backlight/atmel-pwm-bl.c +0 -1
@@ -12,7 +12,6 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/fb.h> -#include <linux/clk.h> #include <linux/gpio.h> #include <linux/backlight.h> #include <linux/atmel_pwm.h>
Signature · 1 line
1.8.4.2
PATCH v2 7/9 backlight: atmel-pwm-bl: use gpio_is_valid
In reply to Johan HovoldUse gpio_is_valid rather than open coding the more restrictive != -1 test.
--- drivers/video/backlight/atmel-pwm-bl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +4 -4
@@ -48,7 +48,7 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd) pwm_duty = pwmbl->pdata->pwm_duty_min;if (!intensity) { -if (pwmbl->gpio_on !=-1 ) { +if (gpio_is_valid (pwmbl->gpio_on)) {gpio_set_value (pwmbl->gpio_on,0 ^ pwmbl->pdata->on_active_low); }
@@ -57,7 +57,7 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd) }else {pwm_channel_enable (&pwmbl->pwmc);pwm_channel_writel (&pwmbl->pwmc,PWM_CUPD , pwm_duty); -if (pwmbl->gpio_on !=-1 ) { +if (gpio_is_valid (pwmbl->gpio_on)) {gpio_set_value (pwmbl->gpio_on,1 ^ pwmbl->pdata->on_active_low); }
@@ -146,7 +146,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)if (retval)return retval; -if (pwmbl->gpio_on !=-1 ) { +if (gpio_is_valid (pwmbl->gpio_on)) { retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on,"gpio_atmel_pwm_bl" );if (retval)
@@ -196,7 +196,7 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) {struct atmel_pwm_bl *pwmbl =platform_get_drvdata (pdev); -if (pwmbl->gpio_on !=-1 ) { +if (gpio_is_valid (pwmbl->gpio_on)) {gpio_set_value (pwmbl->gpio_on,0 ^ pwmbl->pdata->on_active_low); }
Signature · 1 line
1.8.4.2
PATCH v2 8/9 backlight: atmel-pwm-bl: refactor gpio_on handling
In reply to Johan HovoldAdd helper function to control the gpio_on signal.
--- drivers/video/backlight/atmel-pwm-bl.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +11 -12
@@ -26,6 +26,14 @@ struct atmel_pwm_bl {int gpio_on; }; +static void atmel_pwm_bl_set_gpio_on (struct atmel_pwm_bl *pwmbl,int on) +{ +if (!gpio_is_valid (pwmbl->gpio_on)) +return ; + +gpio_set_value (pwmbl->gpio_on, on ^ pwmbl->pdata->on_active_low); +} +static int atmel_pwm_bl_set_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd);
@@ -48,19 +56,13 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd) pwm_duty = pwmbl->pdata->pwm_duty_min;if (!intensity) { -if (gpio_is_valid (pwmbl->gpio_on)) { -gpio_set_value (pwmbl->gpio_on, -0 ^ pwmbl->pdata->on_active_low); - } +atmel_pwm_bl_set_gpio_on (pwmbl,0 );pwm_channel_writel (&pwmbl->pwmc,PWM_CUPD , pwm_duty);pwm_channel_disable (&pwmbl->pwmc); }else {pwm_channel_enable (&pwmbl->pwmc);pwm_channel_writel (&pwmbl->pwmc,PWM_CUPD , pwm_duty); -if (gpio_is_valid (pwmbl->gpio_on)) { -gpio_set_value (pwmbl->gpio_on, -1 ^ pwmbl->pdata->on_active_low); - } +atmel_pwm_bl_set_gpio_on (pwmbl,1 ); }return 0 ;
@@ -196,10 +198,7 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) {struct atmel_pwm_bl *pwmbl =platform_get_drvdata (pdev); -if (gpio_is_valid (pwmbl->gpio_on)) { -gpio_set_value (pwmbl->gpio_on, -0 ^ pwmbl->pdata->on_active_low); - } +atmel_pwm_bl_set_gpio_on (pwmbl,0 );pwm_channel_disable (&pwmbl->pwmc);pwm_channel_free (&pwmbl->pwmc);
Signature · 1 line
1.8.4.2
PATCH v2 9/9 backlight: atmel-pwm-bl: use gpio_request_one
In reply to Johan HovoldUse devm_gpio_request_one rather than requesting and setting direction in two calls.
--- drivers/video/backlight/atmel-pwm-bl.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +8 -7
@@ -124,6 +124,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)const struct atmel_pwm_bl_platform_data *pdata;struct backlight_device *bldev;struct atmel_pwm_bl *pwmbl; +int flags;int retval; pdata =dev_get_platdata (&pdev->dev);
@@ -149,14 +150,14 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)return retval;if (gpio_is_valid (pwmbl->gpio_on)) { - retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on, -"gpio_atmel_pwm_bl" ); -if (retval) - goto err_free_pwm; -/* Turn display off by default. */ - retval =gpio_direction_output (pwmbl->gpio_on, -0 ^ pdata->on_active_low); +if (pdata->on_active_low) + flags =GPIOF_OUT_INIT_HIGH ; +else + flags =GPIOF_OUT_INIT_LOW ; + + retval =devm_gpio_request_one (&pdev->dev, pwmbl->gpio_on, + flags,"gpio_atmel_pwm_bl" );if (retval) goto err_free_pwm; }
Signature · 1 line
1.8.4.2
v3 cover backlight: atmel-pwm-bl: fixes and clean ups
In reply to Johan HovoldThese patches fix a few issues and clean up the atmel-pwm-bl driver somewhat.
Acks from Jingoo Han retained on all patches but the slightly modified first and final patch.
Johan
v2:
- mask returned brightness rather than cast it to u16 (patch 1/9)
v3
- use unsigned long for gpio flags (patch 9/9)
Johan Hovold (9):
backlight: atmel-pwm-bl: fix reported brightness
backlight: atmel-pwm-bl: fix gpio polarity in remove
backlight: atmel-pwm-bl: fix module autoload
backlight: atmel-pwm-bl: clean up probe error handling
backlight: atmel-pwm-bl: clean up get_intensity
backlight: atmel-pwm-bl: remove unused include
backlight: atmel-pwm-bl: use gpio_is_valid
backlight: atmel-pwm-bl: refactor gpio_on handling
backlight: atmel-pwm-bl: use gpio_request_one
drivers/video/backlight/atmel-pwm-bl.c | 86 ++++++++++++++++------------------ 1 file changed, 40 insertions(+), 46 deletions(-)
Signature · 1 line
1.8.4.2
PATCH v3 1/9 backlight: atmel-pwm-bl: fix reported brightness
The driver supports 16-bit brightness values, but the value returned from get_brightness was truncated to eight bits.
--- drivers/video/backlight/atmel-pwm-bl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +2 -2
@@ -70,7 +70,7 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)static int atmel_pwm_bl_get_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd); -u8 intensity; +u32 intensity;if (pwmbl->pdata->pwm_active_low) { intensity = pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY) -
@@ -80,7 +80,7 @@ static int atmel_pwm_bl_get_intensity(struct backlight_device *bd)pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); } -return intensity; +return intensity &0xffff ; }static int atmel_pwm_bl_init_pwm (struct atmel_pwm_bl *pwmbl)
Signature · 1 line
1.8.4.2
PATCH v3 2/9 backlight: atmel-pwm-bl: fix gpio polarity in remove
In reply to Johan HovoldMake sure to honour gpio polarity also at remove so that the backlight is actually disabled on boards with active-low enable pin.
--- drivers/video/backlight/atmel-pwm-bl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +4 -2
@@ -205,8 +205,10 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) {struct atmel_pwm_bl *pwmbl =platform_get_drvdata (pdev); -if (pwmbl->gpio_on !=-1 ) -gpio_set_value (pwmbl->gpio_on,0 ); +if (pwmbl->gpio_on !=-1 ) { +gpio_set_value (pwmbl->gpio_on, +0 ^ pwmbl->pdata->on_active_low); + }pwm_channel_disable (&pwmbl->pwmc);pwm_channel_free (&pwmbl->pwmc);
Signature · 1 line
1.8.4.2
PATCH v3 3/9 backlight: atmel-pwm-bl: fix module autoload
In reply to Johan HovoldAdd missing module alias which is needed for module autoloading.
--- drivers/video/backlight/atmel-pwm-bl.c | 1 + 1 file changed, 1 insertion(+)
drivers/video/backlight/atmel-pwm-bl.c +1 -0
@@ -229,3 +229,4 @@ module_platform_driver(atmel_pwm_bl_driver);MODULE_AUTHOR ("Hans-Christian egtvedt <[email protected]>" );MODULE_DESCRIPTION ("Atmel PWM backlight driver" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:atmel-pwm-bl" );
Signature · 1 line
1.8.4.2
PATCH v3 4/9 backlight: atmel-pwm-bl: clean up probe error handling
In reply to Johan HovoldClean up probe error handling by checking parameters before any allocations and removing an obsolete error label. Also remove unnecessary reset of private gpio number.
--- drivers/video/backlight/atmel-pwm-bl.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +12 -19
@@ -126,40 +126,33 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)struct atmel_pwm_bl *pwmbl;int retval; + pdata =dev_get_platdata (&pdev->dev); +if (!pdata) +return -ENODEV ; + +if (pdata->pwm_compare_max < pdata->pwm_duty_max || + pdata->pwm_duty_min > pdata->pwm_duty_max || + pdata->pwm_frequency =0 ) +return -EINVAL ; + pwmbl =devm_kzalloc (&pdev->dev,sizeof (struct atmel_pwm_bl ),GFP_KERNEL );if (!pwmbl)return -ENOMEM ; pwmbl->pdev = pdev; - - pdata =dev_get_platdata (&pdev->dev); -if (!pdata) { - retval = -ENODEV ; - goto err_free_mem; - } - -if (pdata->pwm_compare_max < pdata->pwm_duty_max || - pdata->pwm_duty_min > pdata->pwm_duty_max || - pdata->pwm_frequency =0 ) { - retval = -EINVAL ; - goto err_free_mem; - } - pwmbl->pdata = pdata; pwmbl->gpio_on = pdata->gpio_on; retval =pwm_channel_alloc (pdata->pwm_channel, &pwmbl->pwmc);if (retval) - goto err_free_mem; +return retval;if (pwmbl->gpio_on !=-1 ) { retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on,"gpio_atmel_pwm_bl" ); -if (retval) { - pwmbl->gpio_on =-1 ; +if (retval) goto err_free_pwm; - }/* Turn display off by default. */ retval = gpio_direction_output(pwmbl->gpio_on,
@@ -197,7 +190,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev) err_free_pwm:pwm_channel_free (&pwmbl->pwmc); -err_free_mem: +return retval; }
Signature · 1 line
1.8.4.2
PATCH v3 5/9 backlight: atmel-pwm-bl: clean up get_intensity
In reply to Johan HovoldClean up get_intensity to increase readability.
--- drivers/video/backlight/atmel-pwm-bl.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +6 -7
@@ -70,15 +70,14 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)static int atmel_pwm_bl_get_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd); +u32 cdty;u32 intensity; -if (pwmbl->pdata->pwm_active_low) { - intensity =pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ) - - pwmbl->pdata->pwm_duty_min; - }else { - intensity = pwmbl->pdata->pwm_duty_max - -pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); - } + cdty =pwm_channel_readl (&pwmbl->pwmc,PWM_CDTY ); +if (pwmbl->pdata->pwm_active_low) + intensity = cdty - pwmbl->pdata->pwm_duty_min; +else + intensity = pwmbl->pdata->pwm_duty_max - cdty;return intensity &0xffff ; }
Signature · 1 line
1.8.4.2
PATCH v3 6/9 backlight: atmel-pwm-bl: remove unused include
In reply to Johan HovoldRemove unused include of clk.h.
--- drivers/video/backlight/atmel-pwm-bl.c | 1 - 1 file changed, 1 deletion(-)
drivers/video/backlight/atmel-pwm-bl.c +0 -1
@@ -12,7 +12,6 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/fb.h> -#include <linux/clk.h> #include <linux/gpio.h> #include <linux/backlight.h> #include <linux/atmel_pwm.h>
Signature · 1 line
1.8.4.2
PATCH v3 7/9 backlight: atmel-pwm-bl: use gpio_is_valid
In reply to Johan HovoldUse gpio_is_valid rather than open coding the more restrictive != -1 test.
--- drivers/video/backlight/atmel-pwm-bl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +4 -4
@@ -48,7 +48,7 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd) pwm_duty = pwmbl->pdata->pwm_duty_min;if (!intensity) { -if (pwmbl->gpio_on !=-1 ) { +if (gpio_is_valid (pwmbl->gpio_on)) {gpio_set_value (pwmbl->gpio_on,0 ^ pwmbl->pdata->on_active_low); }
@@ -57,7 +57,7 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd) }else {pwm_channel_enable (&pwmbl->pwmc);pwm_channel_writel (&pwmbl->pwmc,PWM_CUPD , pwm_duty); -if (pwmbl->gpio_on !=-1 ) { +if (gpio_is_valid (pwmbl->gpio_on)) {gpio_set_value (pwmbl->gpio_on,1 ^ pwmbl->pdata->on_active_low); }
@@ -146,7 +146,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)if (retval)return retval; -if (pwmbl->gpio_on !=-1 ) { +if (gpio_is_valid (pwmbl->gpio_on)) { retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on,"gpio_atmel_pwm_bl" );if (retval)
@@ -196,7 +196,7 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) {struct atmel_pwm_bl *pwmbl =platform_get_drvdata (pdev); -if (pwmbl->gpio_on !=-1 ) { +if (gpio_is_valid (pwmbl->gpio_on)) {gpio_set_value (pwmbl->gpio_on,0 ^ pwmbl->pdata->on_active_low); }
Signature · 1 line
1.8.4.2
PATCH v3 8/9 backlight: atmel-pwm-bl: refactor gpio_on handling
In reply to Johan HovoldAdd helper function to control the gpio_on signal.
--- drivers/video/backlight/atmel-pwm-bl.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +11 -12
@@ -26,6 +26,14 @@ struct atmel_pwm_bl {int gpio_on; }; +static void atmel_pwm_bl_set_gpio_on (struct atmel_pwm_bl *pwmbl,int on) +{ +if (!gpio_is_valid (pwmbl->gpio_on)) +return ; + +gpio_set_value (pwmbl->gpio_on, on ^ pwmbl->pdata->on_active_low); +} +static int atmel_pwm_bl_set_intensity (struct backlight_device *bd) {struct atmel_pwm_bl *pwmbl =bl_get_data (bd);
@@ -48,19 +56,13 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd) pwm_duty = pwmbl->pdata->pwm_duty_min;if (!intensity) { -if (gpio_is_valid (pwmbl->gpio_on)) { -gpio_set_value (pwmbl->gpio_on, -0 ^ pwmbl->pdata->on_active_low); - } +atmel_pwm_bl_set_gpio_on (pwmbl,0 );pwm_channel_writel (&pwmbl->pwmc,PWM_CUPD , pwm_duty);pwm_channel_disable (&pwmbl->pwmc); }else {pwm_channel_enable (&pwmbl->pwmc);pwm_channel_writel (&pwmbl->pwmc,PWM_CUPD , pwm_duty); -if (gpio_is_valid (pwmbl->gpio_on)) { -gpio_set_value (pwmbl->gpio_on, -1 ^ pwmbl->pdata->on_active_low); - } +atmel_pwm_bl_set_gpio_on (pwmbl,1 ); }return 0 ;
@@ -196,10 +198,7 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) {struct atmel_pwm_bl *pwmbl =platform_get_drvdata (pdev); -if (gpio_is_valid (pwmbl->gpio_on)) { -gpio_set_value (pwmbl->gpio_on, -0 ^ pwmbl->pdata->on_active_low); - } +atmel_pwm_bl_set_gpio_on (pwmbl,0 );pwm_channel_disable (&pwmbl->pwmc);pwm_channel_free (&pwmbl->pwmc);
Signature · 1 line
1.8.4.2
PATCH v3 9/9 backlight: atmel-pwm-bl: use gpio_request_one
In reply to Johan HovoldUse devm_gpio_request_one rather than requesting and setting direction in two calls.
--- drivers/video/backlight/atmel-pwm-bl.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/video/backlight/atmel-pwm-bl.c +8 -7
@@ -124,6 +124,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)const struct atmel_pwm_bl_platform_data *pdata;struct backlight_device *bldev;struct atmel_pwm_bl *pwmbl; +unsigned long flags;int retval; pdata =dev_get_platdata (&pdev->dev);
@@ -149,14 +150,14 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)return retval;if (gpio_is_valid (pwmbl->gpio_on)) { - retval =devm_gpio_request (&pdev->dev, pwmbl->gpio_on, -"gpio_atmel_pwm_bl" ); -if (retval) - goto err_free_pwm; -/* Turn display off by default. */ - retval =gpio_direction_output (pwmbl->gpio_on, -0 ^ pdata->on_active_low); +if (pdata->on_active_low) + flags =GPIOF_OUT_INIT_HIGH ; +else + flags =GPIOF_OUT_INIT_LOW ; + + retval =devm_gpio_request_one (&pdev->dev, pwmbl->gpio_on, + flags,"gpio_atmel_pwm_bl" );if (retval) goto err_free_pwm; }
Signature · 1 line
1.8.4.2