diff options
author | Simon Horman <horms+renesas@verge.net.au> | 2015-11-24 06:00:02 +0300 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2015-11-24 06:00:02 +0300 |
commit | 998f468f34f41905051556a9897dbc204b1b75b4 (patch) | |
tree | 75e402d58ccdcf516daf6a0fa8f54e33cf841787 /arch/arm/mach-pxa/ezx.c | |
parent | d537543b3948bc3bc9dede248fa455493e055457 (diff) | |
parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
download | linux-998f468f34f41905051556a9897dbc204b1b75b4.tar.xz |
Merge tag 'v4.4-rc1' into HEAD
Linux 4.4-rc1
Diffstat (limited to 'arch/arm/mach-pxa/ezx.c')
-rw-r--r-- | arch/arm/mach-pxa/ezx.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c index ab93441e596e..9a9c15bfcd34 100644 --- a/arch/arm/mach-pxa/ezx.c +++ b/arch/arm/mach-pxa/ezx.c @@ -15,6 +15,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/delay.h> +#include <linux/pwm.h> #include <linux/pwm_backlight.h> #include <linux/input.h> #include <linux/gpio.h> @@ -49,11 +50,14 @@ #define GPIO19_GEN1_CAM_RST 19 #define GPIO28_GEN2_CAM_RST 28 +static struct pwm_lookup ezx_pwm_lookup[] = { + PWM_LOOKUP("pxa27x-pwm.0", 0, "pwm-backlight.0", NULL, 78700, + PWM_POLARITY_NORMAL), +}; + static struct platform_pwm_backlight_data ezx_backlight_data = { - .pwm_id = 0, .max_brightness = 1023, .dft_brightness = 1023, - .pwm_period_ns = 78770, .enable_gpio = -1, }; @@ -817,6 +821,7 @@ static void __init a780_init(void) platform_device_register(&a780_camera); } + pwm_add_table(ezx_pwm_lookup, ARRAY_SIZE(ezx_pwm_lookup)); platform_add_devices(ARRAY_AND_SIZE(ezx_devices)); platform_add_devices(ARRAY_AND_SIZE(a780_devices)); } |