Pull LED updates from Jacek Anaszewski: "In this merge window we'd like to announce a change on the list of LED subsystem maintainers - Bryan Wu decided to step back and handed over the maintainership to me (Jacek Anaszewski), which entailed an update of LED subsystem git tree URL. Besides the changes in MAINTAINERS we have: - optimizations and improvements to existing LED class drivers - improvements to the common LEDs DT documentation - modifications of kirkwood-* dts files, to be in sync with patches for leds-ns2 driver, that move LEDs mode mapping outside of the driver" * tag 'leds_for_4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds: leds: Export OF module alias information in missing drivers leds:lp55xx: use the private data instead of updating I2C device platform data leds: syscon: Correct check for syscon_node_to_regmap() errors leds: leds-fsg: Use devm_led_classdev_register MAINTAINERS: Change LED subsystem git tree URL leds/led-class: Add missing put_device() ARM: Kirkwood: add modes-map property to ns2-leds nodes leds: tlc591xx: Remove redundant I2C_FUNC_SMBUS_BYTE_DATA functionality check leds: leds-ns2: depends on MACH_ARMADA_370 leds: leds-ns2: handle can_sleep GPIOs leds: leds-ns2: move LED modes mapping outside of the driver leds: lp8860: Constify reg_default tables leds: Drop owner assignment from i2c_driver leds: Allow compile test of LEDS_AAT1290 and LEDS_KTD2692 if !GPIOLIB leds: Allow compile test of GPIO consumers if !GPIOLIB DT: leds: Improve description of flash LEDs related properties
Showing the changes to include/linux/platform_data (1 of 30 files). Show all
Unified · Split
| @@ -9,11 +9,25 @@ · 8 unmodified lines | ||
| 9 | 9 | #ifndef __LEDS_KIRKWOOD_NS2_H |
| 10 | 10 | #define __LEDS_KIRKWOOD_NS2_H |
| 11 | 11 | |
| 12 | +enum ns2_led_modes { | |
| 13 | + NS_V2_LED_OFF, | |
| 14 | + NS_V2_LED_ON, | |
| 15 | + NS_V2_LED_SATA, | |
| 16 | +}; | |
| 17 | + | |
| 18 | +struct ns2_led_modval { | |
| 19 | + enum ns2_led_modes mode; | |
| 20 | + int cmd_level; | |
| 21 | + int slow_level; | |
| 22 | +}; | |
| 23 | + | |
| 12 | 24 | struct ns2_led { |
| 13 | 25 | const char *name; |
| 14 | 26 | const char *default_trigger; |
| 15 | 27 | unsigned cmd; |
| 16 | 28 | unsigned slow; |
| 29 | + int num_modes; | |
| 30 | + struct ns2_led_modval *modval; | |
| 17 | 31 | }; |
| 18 | 32 | |
| 19 | 33 | struct ns2_led_platform_data { |