Commit f80fa182 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull LED driver updates from Jacek Anaszewski:
 "Three new LED class drivers and some minor fixes and improvementes to
  the leds-gpio driver, LED Trigger core and documentation"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
  leds: triggers: Check return value of kobject_uevent_env()
  leds: triggers: Return from led_trigger_set() if there is nothing to do
  leds: gpio: fix and simplify error handling in gpio_leds_create
  leds: gpio: switch to managed version of led_classdev_register
  leds: gpio: fix and simplify reading property "label"
  leds: gpio: simplify gpio_leds_create
  leds: gpio: add helper cdev_to_gpio_led_data
  leds: gpio: fix an unhandled error case in create_gpio_led
  leds: gpio: introduce gpio_blink_set_t
  leds: add driver for Mellanox systems LEDs
  Documentation: move oneshot trigger attributes documentation to ABI
  leds: centralize definition of "default-state" property
  leds: add PM8058 LEDs driver
  leds: pm8058: add device tree bindings
  leds: do not overflow sysfs buffer in led_trigger_show
  leds: make triggers explicitly non-modular
  DT: leds: Add bindings for ISSI is31fl319x
  leds: is31fl319x: 1/3/6/9-channel light effect led driver
parents 21f54dda 6f3bad96

Documentation/ABI/testing/sysfs-class-led

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ Description: 
		of led events.

		You can change triggers in a similar manner to the way an IO

		scheduler is chosen. Trigger specific parameters can appear in

		/sys/class/leds/<led> once a given trigger is selected.

		/sys/class/leds/<led> once a given trigger is selected. For

		their documentation see sysfs-class-led-trigger-*.



What:		/sys/class/leds/<led>/inverted

Date:		January 2011

Documentation/ABI/testing/sysfs-class-led-trigger-oneshot

0 → 100644
+36 −0
Original line number Diff line number Diff line 
What:		/sys/class/leds/<led>/delay_on

Date:		Jun 2012

KernelVersion:	3.6

Contact:	linux-leds@vger.kernel.org

Description:

		Specifies for how many milliseconds the LED has to stay at

		LED_FULL brightness after it has been armed.

		Defaults to 100 ms.



What:		/sys/class/leds/<led>/delay_off

Date:		Jun 2012

KernelVersion:	3.6

Contact:	linux-leds@vger.kernel.org

Description:

		Specifies for how many milliseconds the LED has to stay at

		LED_OFF brightness after it has been armed.

		Defaults to 100 ms.



What:		/sys/class/leds/<led>/invert

Date:		Jun 2012

KernelVersion:	3.6

Contact:	linux-leds@vger.kernel.org

Description:

		Reverse the blink logic. If set to 0 (default) blink on for

		delay_on ms, then blink off for delay_off ms, leaving the LED

		normally off. If set to 1, blink off for delay_off ms, then

		blink on for delay_on ms, leaving the LED normally on.

		Setting this value also immediately changes the LED state.



What:		/sys/class/leds/<led>/shot

Date:		Jun 2012

KernelVersion:	3.6

Contact:	linux-leds@vger.kernel.org

Description:

		Write any non-empty string to signal an events, this starts a

		blink sequence if not already running.

Documentation/devicetree/bindings/leds/common.txt

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ Optional properties for child nodes: 
	  a device, i.e. no other LED class device can be assigned the same

	  label.



- default-state : The initial state of the LED. Valid values are "on", "off",

  and "keep". If the LED is already on or off and the default-state property is

  set the to same value, then no glitch should be produced where the LED

  momentarily turns off (or on). The "keep" setting will keep the LED at

  whatever its current state is, without producing a glitch.  The default is

  off if this property is not present.



- linux,default-trigger :  This parameter, if present, is a

    string defining the trigger assigned to the LED.  Current triggers are:

     "backlight" - LED will act as a back-light, controlled by the framebuffer

Documentation/devicetree/bindings/leds/leds-bcm6328.txt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ LED sub-node optional properties: 
    - active-low : Boolean, makes LED active low.

      Default : false

    - default-state : see

      Documentation/devicetree/bindings/leds/leds-gpio.txt

      Documentation/devicetree/bindings/leds/common.txt

    - linux,default-trigger : see

      Documentation/devicetree/bindings/leds/common.txt

Documentation/devicetree/bindings/leds/leds-bcm6358.txt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ LED sub-node optional properties: 
  - active-low : Boolean, makes LED active low.

    Default : false

  - default-state : see

    Documentation/devicetree/bindings/leds/leds-gpio.txt

    Documentation/devicetree/bindings/leds/common.txt

  - linux,default-trigger : see

    Documentation/devicetree/bindings/leds/common.txt

CRA Git | Maintained and supported by SUSTech CRA and CCSE