Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

Pull LED subsystem updates from Bryan Wu:
 "In this cycle, we merged some fix and update for LED Flash class
  driver.  Then the core code of LED Flash class driver is in the kernel
  now.  Moreover, we also got some bug fixes, code cleanup and new
  drivers for LED controllers"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: Don't treat the LED name as a format string
  leds: Use log level warn instead of info when telling about a name clash
  leds/led-class: Handle LEDs with the same name
  leds: lp8860: Fix typo in MODULE_DESCRIPTION in leds-lp8860.c
  leds: lp8501: Fix typo in MODULE_DESCRIPTION in leds-lp8501.c
  DT: leds: Add uniqueness requirement for 'label' property.
  dt-binding: leds: Add common LED DT bindings macros
  leds: add Qualcomm PM8941 WLED driver
  leds: add DT binding for Qualcomm PM8941 WLED block
  leds: pca963x: Add missing initialiation of struct led_info.flags
  leds: flash: Fix the size of sysfs_groups array
  Documentation: leds: Add description of LED Flash class extension
  leds: flash: document sysfs interface
  leds: flash: Remove synchronized flash strobe feature
  leds: Introduce devres helper for led_classdev_register
  leds: lp8860: make use of devm_gpiod_get_optional
  leds: Let the binding document example for leds-gpio follow the gpio bindings
  leds: flash: remove stray include directive
  leds: leds-pwm: drop one pwm_get_period() call

1 files changed, 80 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-class-led-flash b/Documentation/ABI/testing/sysfs-class-led-flash
new file mode 100644
index 000000000000..220a0270b47b
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-led-flash
@@ -0,0 +1,80 @@
+What:           /sys/class/leds/<led>/flash_brightness
+Date:           March 2015
+KernelVersion:  4.0
+Contact:        Jacek Anaszewski <j.anaszewski@samsung.com>
+Description:    read/write
+                Set the brightness of this LED in the flash strobe mode, in
+                microamperes. The file is created only for the flash LED devices
+                that support setting flash brightness.
+
+                The value is between 0 and
+                /sys/class/leds/<led>/max_flash_brightness.
+
+What:           /sys/class/leds/<led>/max_flash_brightness
+Date:           March 2015
+KernelVersion:  4.0
+Contact:        Jacek Anaszewski <j.anaszewski@samsung.com>
+Description:    read only
+                Maximum brightness level for this LED in the flash strobe mode,
+                in microamperes.
+
+What:           /sys/class/leds/<led>/flash_timeout
+Date:           March 2015
+KernelVersion:  4.0
+Contact:        Jacek Anaszewski <j.anaszewski@samsung.com>
+Description:    read/write
+                Hardware timeout for flash, in microseconds. The flash strobe
+                is stopped after this period of time has passed from the start
+                of the strobe. The file is created only for the flash LED
+                devices that support setting flash timeout.
+
+What:           /sys/class/leds/<led>/max_flash_timeout
+Date:           March 2015
+KernelVersion:  4.0
+Contact:        Jacek Anaszewski <j.anaszewski@samsung.com>
+Description:    read only
+                Maximum flash timeout for this LED, in microseconds.
+
+What:           /sys/class/leds/<led>/flash_strobe
+Date:           March 2015
+KernelVersion:  4.0
+Contact:        Jacek Anaszewski <j.anaszewski@samsung.com>
+Description:    read/write
+                Flash strobe state. When written with 1 it triggers flash strobe
+                and when written with 0 it turns the flash off.
+
+                On read 1 means that flash is currently strobing and 0 means
+                that flash is off.
+
+What:           /sys/class/leds/<led>/flash_fault
+Date:           March 2015
+KernelVersion:  4.0
+Contact:        Jacek Anaszewski <j.anaszewski@samsung.com>
+Description:    read only
+                Space separated list of flash faults that may have occurred.
+                Flash faults are re-read after strobing the flash. Possible
+                flash faults:
+
+                * led-over-voltage - flash controller voltage to the flash LED
+                        has exceeded the limit specific to the flash controller
+                * flash-timeout-exceeded - the flash strobe was still on when
+                        the timeout set by the user has expired; not all flash
+                        controllers may set this in all such conditions
+                * controller-over-temperature - the flash controller has
+                        overheated
+                * controller-short-circuit - the short circuit protection
+                        of the flash controller has been triggered
+                * led-power-supply-over-current - current in the LED power
+                        supply has exceeded the limit specific to the flash
+                        controller
+                * indicator-led-fault - the flash controller has detected
+                        a short or open circuit condition on the indicator LED
+                * led-under-voltage - flash controller voltage to the flash
+                        LED has been below the minimum limit specific to
+                        the flash
+                * controller-under-voltage - the input voltage of the flash
+                        controller is below the limit under which strobing the
+                        flash at full current will not be possible;
+                        the condition persists until this flag is no longer set
+                * led-over-temperature - the temperature of the LED has exceeded
+                        its allowed upper limit