diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 19:39:03 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 19:39:03 (GMT) |
| commit | e28870f9b3e92cd3570925089c6bb789c2603bc4 (patch) | |
| tree | f0a2c91abd0af5579fde082840995bd7cc5e1876 /include | |
| parent | c1b30e4d9466000c0e287e9245d4397da4d7d2f9 (diff) | |
| parent | 3d6969a641d01cc9b6aa199a6f01eb1802522baf (diff) | |
| download | linux-e28870f9b3e92cd3570925089c6bb789c2603bc4.tar.xz | |
Merge tag 'backlight-for-linus-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
- Clean-up leaky resources; pwm_bl
- Simplify Device Tree initialisation; lp855x_bl
- Add Regulator support; lp855x
- Remove Bryan from the Maintainer list -- new baby, no time :)
* tag 'backlight-for-linus-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
MAINTAINERS: Remove my name from Backlight subsystem
backlight: lp855x: Add supply regulator to lp855x
backlight: lp855x: Refactor DT parsing code
backlight: pwm: Clean-up pwm requested using legacy API
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/lp855x.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/platform_data/lp855x.h b/include/linux/platform_data/lp855x.h index 1b2ba24..9c7fd1e 100644 --- a/include/linux/platform_data/lp855x.h +++ b/include/linux/platform_data/lp855x.h @@ -136,6 +136,7 @@ struct lp855x_rom_data { Only valid when mode is PWM_BASED. * @size_program : total size of lp855x_rom_data * @rom_data : list of new eeprom/eprom registers + * @supply : regulator that supplies 3V input */ struct lp855x_platform_data { const char *name; @@ -144,6 +145,7 @@ struct lp855x_platform_data { unsigned int period_ns; int size_program; struct lp855x_rom_data *rom_data; + struct regulator *supply; }; #endif |