Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 607e11ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'leds_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds 

Pull LED updates from Jacek Anaszewski:
 "New LED class driver:
   - LED driver for TI LP3952 6-Channel Color LED

  LED core improvements:
   - Only descend into leds directory when CONFIG_NEW_LEDS is set
   - Add no-op gpio_led_register_device when LED subsystem is disabled
   - MAINTAINERS: Add file patterns for led device tree bindings

  LED Trigger core improvements:
   - return error if invalid trigger name is provided via sysfs

  LED class drivers improvements
   - is31fl32xx: define complete i2c_device_id table
   - is31fl32xx: fix typo in id and match table names
   - leds-gpio: Set of_node for created LED devices
   - pca9532: Add device tree support

  Conversion of IDE trigger to common disk trigger:
   - leds: convert IDE trigger to common disk trigger
   - leds: documentation: 'ide-disk' to 'disk-activity'
   - unicore32: use the new LED disk activity trigger
   - parisc: use the new LED disk activity trigger
   - mips: use the new LED disk activity trigger
   - arm: use the new LED disk activity trigger
   - powerpc: use the new LED disk activity trigger"

* tag 'leds_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
  leds: is31fl32xx: define complete i2c_device_id table
  leds: is31fl32xx: fix typo in id and match table names
  leds: LED driver for TI LP3952 6-Channel Color LED
  leds: leds-gpio: Set of_node for created LED devices
  leds: triggers: return error if invalid trigger name is provided via sysfs
  leds: Only descend into leds directory when CONFIG_NEW_LEDS is set
  leds: Add no-op gpio_led_register_device when LED subsystem is disabled
  unicore32: use the new LED disk activity trigger
  parisc: use the new LED disk activity trigger
  mips: use the new LED disk activity trigger
  arm: use the new LED disk activity trigger
  powerpc: use the new LED disk activity trigger
  leds: documentation: 'ide-disk' to 'disk-activity'
  leds: convert IDE trigger to common disk trigger
  leds: pca9532: Add device tree support
  MAINTAINERS: Add file patterns for led device tree bindings
parents 78d51aee 5706c01f

Documentation/devicetree/bindings/leds/common.txt

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ Optional properties for child nodes: 
     "default-on" - LED will turn on (but for leds-gpio see "default-state"

		    property in Documentation/devicetree/bindings/gpio/led.txt)

     "heartbeat" - LED "double" flashes at a load average based rate

     "ide-disk" - LED indicates disk activity

     "disk-activity" - LED indicates disk activity

     "ide-disk" - LED indicates IDE disk activity (deprecated),

                  in new implementations use "disk-activity"

     "timer" - LED flashes at a fixed, configurable rate



- led-max-microamp : Maximum LED supply current in microamperes. This property

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

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ Examples: 
leds {

	compatible = "gpio-leds";

	hdd {

		label = "IDE Activity";

		label = "Disk Activity";

		gpios = <&mcu_pio 0 GPIO_ACTIVE_LOW>;

		linux,default-trigger = "ide-disk";

		linux,default-trigger = "disk-activity";

	};



	fault {

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

0 → 100644
+39 −0
Original line number Diff line number Diff line 
*NXP - pca9532 PWM LED Driver



The PCA9532 family is SMBus I/O expander optimized for dimming LEDs.

The PWM support 256 steps.



Required properties:

	- compatible:

		"nxp,pca9530"

		"nxp,pca9531"

		"nxp,pca9532"

		"nxp,pca9533"

	- reg -  I2C slave address



Each led is represented as a sub-node of the nxp,pca9530.



Optional sub-node properties:

	- label: see Documentation/devicetree/bindings/leds/common.txt

	- type: Output configuration, see dt-bindings/leds/leds-pca9532.h (default NONE)

	- linux,default-trigger: see Documentation/devicetree/bindings/leds/common.txt



Example:

  #include <dt-bindings/leds/leds-pca9532.h>



  leds: pca9530@60 {

    compatible = "nxp,pca9530";

    reg = <0x60>;



    red-power {

      label = "pca:red:power";

      type = <PCA9532_TYPE_LED>;

    };

    green-power {

      label = "pca:green:power";

      type = <PCA9532_TYPE_LED>;

    };

  };



For more product information please see the link below:

http://nxp.com/documents/data_sheet/PCA9532.pdf

Documentation/laptops/asus-laptop.txt

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ LEDs 
    echo 1 >  /sys/class/leds/asus::mail/brightness

  will switch the mail LED on.

  You can also know if they are on/off by reading their content and use

  kernel triggers like ide-disk or heartbeat.

  kernel triggers like disk-activity or heartbeat.



Backlight

---------

Documentation/leds/leds-class.txt

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ brightness support so will just be turned on for non-zero brightness settings. 
The class also introduces the optional concept of an LED trigger. A trigger

is a kernel based source of led events. Triggers can either be simple or

complex. A simple trigger isn't configurable and is designed to slot into

existing subsystems with minimal additional code. Examples are the ide-disk,

existing subsystems with minimal additional code. Examples are the disk-activity,

nand-disk and sharpsl-charge triggers. With led triggers disabled, the code

optimises away.