diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-05-19 22:42:42 +0200 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2014-05-21 11:19:45 +0200 |
| commit | 16fc3352ea58b481f879f8d965b98208ccc279c2 (patch) | |
| tree | 59c61a8dfd8b83b2f0cdc7831633ec2db0f285d6 | |
| parent | 81225bed32739752df61b5821bbf3f9be70e434d (diff) | |
| download | op-kernel-dev-16fc3352ea58b481f879f8d965b98208ccc279c2.zip op-kernel-dev-16fc3352ea58b481f879f8d965b98208ccc279c2.tar.gz | |
pwm-backlight: retrieve configured PWM period
The PWM core is now able to initialize the PWM period from a lookup
table defined by board files. Use it if available and fallback to the
value supplied in pwm_period_ns.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
| -rw-r--r-- | drivers/video/backlight/pwm_bl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index cc49347..38ca88b 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -296,12 +296,15 @@ static int pwm_backlight_probe(struct platform_device *pdev) /* * The DT case will set the pwm_period_ns field to 0 and store the * period, parsed from the DT, in the PWM device. For the non-DT case, - * set the period from platform data. + * set the period from platform data if it has not already been set + * via the PWM lookup table. */ - if (data->pwm_period_ns > 0) + pb->period = pwm_get_period(pb->pwm); + if (!pb->period && (data->pwm_period_ns > 0)) { + pb->period = data->pwm_period_ns; pwm_set_period(pb->pwm, data->pwm_period_ns); + } - pb->period = pwm_get_period(pb->pwm); pb->lth_brightness = data->lth_brightness * (pb->period / pb->scale); memset(&props, 0, sizeof(struct backlight_properties)); |
