Pull LED updates from Jacek Anaszewski: "LED core fixes and improvements: - avoid races with workqueue - Kconfig: pedantic cleanup - small fixes for Flash class description leds-lt3593: - remove unneeded assignment in lt3593_led_probe - drop pdata handling code leds-blinkm: - clean up double assignment to data->i2c_addr leds-pca955x, leds-pca963x: - revert ACPI support, as it turned out that there is no evidence of officially registered ACPI IDs for these devices. - make use of device property API leds-as3645a: - switch to fwnode property API LED related addition to ACPI documentation: - document how to refer to LEDs from remote nodes LED related fix to ALSA line6/toneport driver: - avoid polluting led_* namespace And lm3532 driver relocation from MFD to LED subsystem, accompanied by various improvements and optimizations; it entails also a change in omap4-droid4-xt894.dts: - leds: lm3532: Introduce the lm3532 LED driver - mfd: ti-lmu: Remove LM3532 backlight driver references - ARM: dts: omap4-droid4: Update backlight dt properties - dt: lm3532: Add lm3532 dt doc and update ti_lmu doc" * tag 'leds-for-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds: leds: avoid races with workqueue ALSA: line6: Avoid polluting led_* namespace leds: lm3532: Introduce the lm3532 LED driver mfd: ti-lmu: Remove LM3532 backlight driver references ARM: dts: omap4-droid4: Update backlight dt properties dt: lm3532: Add lm3532 dt doc and update ti_lmu doc leds: Small fixes for Flash class description leds: blinkm: clean up double assignment to data->i2c_addr leds: pca963x: Make use of device property API leds: pca955x: Make use of device property API leds: lt3593: Remove unneeded assignment in lt3593_led_probe leds: lt3593: drop pdata handling code leds: pca955x: Revert "Add ACPI support" leds: pca963x: Revert "Add ACPI support" drivers: leds: Kconfig: pedantic cleanups ACPI: Document how to refer to LEDs from remote nodes leds: as3645a: Switch to fwnode property API
Showing the changes to include/linux (2 of 18 files). Show all
Unified · Split
| @@ -15,50 +15,6 @@ · 14 unmodified lines | |||
| 15 | 15 | ||
| 16 | #include <linux/bitops.h> | 16 | #include <linux/bitops.h> |
| 17 | 17 | ||
| 18 | /* LM3532 */ | ||
| 19 | #define LM3532_REG_OUTPUT_CFG 0x10 | ||
| 20 | #define LM3532_ILED1_CFG_MASK 0x03 | ||
| 21 | #define LM3532_ILED2_CFG_MASK 0x0C | ||
| 22 | #define LM3532_ILED3_CFG_MASK 0x30 | ||
| 23 | #define LM3532_ILED1_CFG_SHIFT 0 | ||
| 24 | #define LM3532_ILED2_CFG_SHIFT 2 | ||
| 25 | #define LM3532_ILED3_CFG_SHIFT 4 | ||
| 26 | |||
| 27 | #define LM3532_REG_RAMPUP 0x12 | ||
| 28 | #define LM3532_REG_RAMPDN LM3532_REG_RAMPUP | ||
| 29 | #define LM3532_RAMPUP_MASK 0x07 | ||
| 30 | #define LM3532_RAMPUP_SHIFT 0 | ||
| 31 | #define LM3532_RAMPDN_MASK 0x38 | ||
| 32 | #define LM3532_RAMPDN_SHIFT 3 | ||
| 33 | |||
| 34 | #define LM3532_REG_ENABLE 0x1D | ||
| 35 | |||
| 36 | #define LM3532_REG_PWM_A_CFG 0x13 | ||
| 37 | #define LM3532_PWM_A_MASK 0x05 /* zone 0 */ | ||
| 38 | #define LM3532_PWM_ZONE_0 BIT(2) | ||
| 39 | |||
| 40 | #define LM3532_REG_PWM_B_CFG 0x14 | ||
| 41 | #define LM3532_PWM_B_MASK 0x09 /* zone 1 */ | ||
| 42 | #define LM3532_PWM_ZONE_1 BIT(3) | ||
| 43 | |||
| 44 | #define LM3532_REG_PWM_C_CFG 0x15 | ||
| 45 | #define LM3532_PWM_C_MASK 0x11 /* zone 2 */ | ||
| 46 | #define LM3532_PWM_ZONE_2 BIT(4) | ||
| 47 | |||
| 48 | #define LM3532_REG_ZONE_CFG_A 0x16 | ||
| 49 | #define LM3532_REG_ZONE_CFG_B 0x18 | ||
| 50 | #define LM3532_REG_ZONE_CFG_C 0x1A | ||
| 51 | #define LM3532_ZONE_MASK (BIT(2) | BIT(3) | BIT(4)) | ||
| 52 | #define LM3532_ZONE_0 0 | ||
| 53 | #define LM3532_ZONE_1 BIT(2) | ||
| 54 | #define LM3532_ZONE_2 BIT(3) | ||
| 55 | |||
| 56 | #define LM3532_REG_BRT_A 0x70 /* zone 0 */ | ||
| 57 | #define LM3532_REG_BRT_B 0x76 /* zone 1 */ | ||
| 58 | #define LM3532_REG_BRT_C 0x7C /* zone 2 */ | ||
| 59 | |||
| 60 | #define LM3532_MAX_REG 0x7E | ||
| 61 | |||
| 62 | /* LM3631 */ | 18 | /* LM3631 */ |
| 63 | #define LM3631_REG_DEVCTRL 0x00 | 19 | #define LM3631_REG_DEVCTRL 0x00 |
| 64 | #define LM3631_LCD_EN_MASK BIT(1) | 20 | #define LM3631_LCD_EN_MASK BIT(1) |
| @@ -22,7 +22,6 @@ · 21 unmodified lines | |||
| 22 | #define LMU_EVENT_MONITOR_DONE 0x01 | 22 | #define LMU_EVENT_MONITOR_DONE 0x01 |
| 23 | 23 | ||
| 24 | enum ti_lmu_id { | 24 | enum ti_lmu_id { |
| 25 | LM3532, | ||
| 26 | LM3631, | 25 | LM3631, |
| 27 | LM3632, | 26 | LM3632, |
| 28 | LM3633, | 27 | LM3633, |