Commit a3827639 authored by Thierry Reding's avatar Thierry Reding Committed by Robert Jarzmik

ARM: pxa: z2: Use PWM lookup table

Use a PWM lookup table to provide the PWM to the pwm-backlight device.
The driver has a legacy code path that is required only because boards
still use the legacy method of requesting PWMs by global ID. Replacing
these usages allows that legacy fallback to be removed.

Cc: Daniel Mack <daniel@zonque.org>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
parent 5a4412d4
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/pwm.h>
#include <linux/pwm_backlight.h> #include <linux/pwm_backlight.h>
#include <linux/z2_battery.h> #include <linux/z2_battery.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
...@@ -199,21 +200,24 @@ static inline void z2_nor_init(void) {} ...@@ -199,21 +200,24 @@ static inline void z2_nor_init(void) {}
* Backlight * Backlight
******************************************************************************/ ******************************************************************************/
#if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE) #if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE)
static struct pwm_lookup z2_pwm_lookup[] = {
PWM_LOOKUP("pxa27x-pwm.1", 0, "pwm-backlight.0", NULL, 1260320,
PWM_POLARITY_NORMAL),
PWM_LOOKUP("pxa27x-pwm.0", 1, "pwm-backlight.1", NULL, 1260320,
PWM_POLARITY_NORMAL),
};
static struct platform_pwm_backlight_data z2_backlight_data[] = { static struct platform_pwm_backlight_data z2_backlight_data[] = {
[0] = { [0] = {
/* Keypad Backlight */ /* Keypad Backlight */
.pwm_id = 1,
.max_brightness = 1023, .max_brightness = 1023,
.dft_brightness = 0, .dft_brightness = 0,
.pwm_period_ns = 1260320,
.enable_gpio = -1, .enable_gpio = -1,
}, },
[1] = { [1] = {
/* LCD Backlight */ /* LCD Backlight */
.pwm_id = 2,
.max_brightness = 1023, .max_brightness = 1023,
.dft_brightness = 512, .dft_brightness = 512,
.pwm_period_ns = 1260320,
.enable_gpio = -1, .enable_gpio = -1,
}, },
}; };
...@@ -236,6 +240,7 @@ static struct platform_device z2_backlight_devices[2] = { ...@@ -236,6 +240,7 @@ static struct platform_device z2_backlight_devices[2] = {
}; };
static void __init z2_pwm_init(void) static void __init z2_pwm_init(void)
{ {
pwm_add_table(z2_pwm_lookup, ARRAY_SIZE(z2_pwm_lookup));
platform_device_register(&z2_backlight_devices[0]); platform_device_register(&z2_backlight_devices[0]);
platform_device_register(&z2_backlight_devices[1]); platform_device_register(&z2_backlight_devices[1]);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment