diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-16 15:21:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-16 15:21:40 -0500 |
| commit | 0bde7294e2ada03d0f1cc61cec51274081d9a9cf (patch) | |
| tree | b1cf62a298b566d9bcc87d9f572f506b98809d66 /arch/unicore32 | |
| parent | 449bf8d03c5b94f00cc014ff601c2fe2eebb5a6e (diff) | |
| parent | 1b3f25ce991d528bd0d825b3f14a45904037a382 (diff) | |
Merge tag 'pwm/for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
Pull pwm changes from Thierry Reding:
"Mostly bug fixes and clean up. There is a new driver, which is
actually moving a custom PWM driver from drivers/misc.
The majority of the patches are enhancements to the device tree
support in the pwm-backlight driver. Backlights can now additionally
be powered using a regulator and enabled using a GPIO in addition to
just the PWM input"
* tag 'pwm/for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (30 commits)
Documentation/pwm: Update supported SoC name for pwm-samsung
pwm: samsung: Fix kernel warning while unexporting a channel
MAINTAINERS: Move PWM subsystem tree to kernel.org
Documentation/pwm: Fix trivial typos
pwm-backlight: Remove unused variable
pwm_backlight: avoid short blank screen while doing hibernation
pwm-backlight: Fix brightness adjustment
pwm: add ep93xx PWM support
pwm-backlight: Allow for non-increasing brightness levels
pwm-backlight: Add power supply support
pwm-backlight: Use new enable_gpio field
unicore32: Initialize PWM backlight enable_gpio field
ARM: shmobile: Initialize PWM backlight enable_gpio field
ARM: SAMSUNG: Initialize PWM backlight enable_gpio field
ARM: pxa: Initialize PWM backlight enable_gpio field
ARM: OMAP: Initialize PWM backlight enable_gpio field
pwm-backlight: Add optional enable GPIO
pwm-backlight: Track enable state
pwm-backlight: Refactor backlight power on/off
pwm-backlight: Improve readability
...
Diffstat (limited to 'arch/unicore32')
| -rw-r--r-- | arch/unicore32/kernel/puv3-nb0916.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/unicore32/kernel/puv3-nb0916.c b/arch/unicore32/kernel/puv3-nb0916.c index 181108b8ecce..0c6618e71897 100644 --- a/arch/unicore32/kernel/puv3-nb0916.c +++ b/arch/unicore32/kernel/puv3-nb0916.c | |||
| @@ -54,6 +54,7 @@ static struct platform_pwm_backlight_data nb0916_backlight_data = { | |||
| 54 | .max_brightness = 100, | 54 | .max_brightness = 100, |
| 55 | .dft_brightness = 100, | 55 | .dft_brightness = 100, |
| 56 | .pwm_period_ns = 70 * 1024, | 56 | .pwm_period_ns = 70 * 1024, |
| 57 | .enable_gpio = -1, | ||
| 57 | }; | 58 | }; |
| 58 | 59 | ||
| 59 | static struct gpio_keys_button nb0916_gpio_keys[] = { | 60 | static struct gpio_keys_button nb0916_gpio_keys[] = { |