Merge tag 'leds-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel...

Pull LED updates from Pavel Machek:
 "Besides the usual fixes and new drivers, we are changing CLASS_FLASH
  to return success to make it easier to work with V4L2 stuff disabled,
  and we are getting rid of enum that should have been plain integer
  long time ago. I'm slightly nervous about potential warnings, but it
  needed to be fixed at some point"

* tag 'leds-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds:
  leds: lp50xx: Get rid of redundant explicit casting
  leds: lp50xx: Update headers block to reflect reality
  leds: lp50xx: Get rid of redundant check in lp50xx_enable_disable()
  leds: lp50xx: Reduce level of dereferences
  leds: lp50xx: Switch to new style i2c-driver probe function
  leds: lp50xx: Don't spam logs when probe is deferred
  leds: apu: extend support for PC Engines APU1 with newer firmware
  leds: flash: Fix multicolor no-ops registration by return 0
  leds: flash: Add flash registration with undefined CONFIG_LEDS_CLASS_FLASH
  leds: lgm: Add LED controller driver for LGM SoC
  dt-bindings: leds: Add bindings for Intel LGM SoC
  leds: led-core: Get rid of enum led_brightness
  leds: gpio: Set max brightness to 1
  leds: lm3533: Switch to using the new API kobj_to_dev()
  leds: ss4200: simplify the return expression of register_nasgpio_led()
  leds: Use DEVICE_ATTR_{RW, RO, WO} macros

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/leds/Makefile
index 156c0b4e60d95db595bc806780e11efc0c5e3050,de47e79ecb1f4890690319bccaeeef52b206973a..2a698df9da57bd73568b144f733b192268f28080
--- 1/drivers/leds/Makefile
--- 2/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@@ -103,8 -103,8 +103,11 @@@ obj-$(CONFIG_LEDS_SPI_BYTE)               += leds-sp
  # LED Userspace Drivers
  obj-$(CONFIG_LEDS_USER)                       += uleds.o
  
 +# Flash and Torch LED Drivers
 +obj-$(CONFIG_LEDS_CLASS_FLASH)                += flash/
 +
  # LED Triggers
  obj-$(CONFIG_LEDS_TRIGGERS)           += trigger/
+ 
+ # LED Blink
+ obj-$(CONFIG_LEDS_BLINK)                += blink/

diff --cc drivers/leds/leds-lm3533.c
Simple merge