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

Commit 85724ede authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull LED updates from Jacek Anaszewski:
 "New drivers:

   - add LED support for MT6323 PMIC

   - add LED support for Motorola CPCAP PMIC

  New features and improvements:

   - add LED trigger for all CPUs aggregated which is useful on tiny
     boards with more CPU cores than LED pins

   - add OF variants of LED registering functions as a preparation for
     adding generic support for Device Tree parsing

   - dell-led improvements and cleanups, followed by moving it to the
     x86 platform driver subsystem which is a more appropriate place for
     it

   - extend pca9532 Device Tree support by adding the LEDs
     'default-state' property

   - extend pca963x Device Tree support by adding nxp,inverted-out
     property for inverting the polarity of the output

   - remove ACPI support for lp3952 since it relied on a non-official
     ACPI IDs"

* tag 'leds_for_4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
  leds: pca9532: Extend pca9532 device tree support
  leds: cpcap: new driver
  mfd: cpcap: Add missing include dependencies
  leds: lp3952: Use 'if (ret)' pattern
  leds: lp3952: Remove ACPI support for lp3952
  leds: mt6323: Fix an off by one bug in probe
  dt-bindings: leds: Add document bindings for leds-mt6323
  leds: Add LED support for MT6323 PMIC
  leds: gpio: use OF variant of LED registering function
  leds: core: add OF variants of LED registering functions
  platform/x86: dell-wmi-led: fix coding style issues
  dell-led: move driver to drivers/platform/x86/dell-wmi-led.c
  dell-led: remove code related to mic mute LED
  platform/x86: dell-laptop: import dell_micmute_led_set() from drivers/leds/dell-led.c
  ALSA: hda - rename dell_led_set_func to dell_micmute_led_set_func
  ALSA: hda - use dell_micmute_led_set() instead of dell_app_wmi_led_set()
  dell-led: remove GUID check from dell_micmute_led_set()
  leds/trigger/cpu: Add LED trigger for all CPUs aggregated
parents 477d7cae 28c5fe99

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

0 → 100644
+29 −0
Original line number Diff line number Diff line 
Motorola CPCAP PMIC LEDs

------------------------



This module is part of the CPCAP. For more details about the whole

chip see Documentation/devicetree/bindings/mfd/motorola-cpcap.txt.



Requires node properties:

- compatible: should be one of

   * "motorola,cpcap-led-mdl"		(Main Display Lighting)

   * "motorola,cpcap-led-kl"		(Keyboard Lighting)

   * "motorola,cpcap-led-adl"		(Aux Display Lighting)

   * "motorola,cpcap-led-red"		(Red Triode)

   * "motorola,cpcap-led-green"		(Green Triode)

   * "motorola,cpcap-led-blue"		(Blue Triode)

   * "motorola,cpcap-led-cf"		(Camera Flash)

   * "motorola,cpcap-led-bt"		(Bluetooth)

   * "motorola,cpcap-led-cp"		(Camera Privacy LED)

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

- vdd-supply: A phandle to the regulator powering the LED



Example:



&cpcap {

	cpcap_led_red: red-led {

		compatible = "motorola,cpcap-led-red";

		label = "cpcap:red";

		vdd-supply = <&sw5>;

	};

};

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

0 → 100644
+60 −0
Original line number Diff line number Diff line 
Device Tree Bindings for LED support on MT6323 PMIC



MT6323 LED controller is subfunction provided by MT6323 PMIC, so the LED

controllers are defined as the subnode of the function node provided by MT6323

PMIC controller that is being defined as one kind of Muti-Function Device (MFD)

using shared bus called PMIC wrapper for each subfunction to access remote

MT6323 PMIC hardware.



For MT6323 MFD bindings see:

Documentation/devicetree/bindings/mfd/mt6397.txt

For MediaTek PMIC wrapper bindings see:

Documentation/devicetree/bindings/soc/mediatek/pwrap.txt



Required properties:

- compatible : Must be "mediatek,mt6323-led"

- address-cells : Must be 1

- size-cells : Must be 0



Each led is represented as a child node of the mediatek,mt6323-led that

describes the initial behavior for each LED physically and currently only four

LED child nodes can be supported.



Required properties for the LED child node:

- reg : LED channel number (0..3)



Optional properties for the LED child node:

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

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

- default-state: See Documentation/devicetree/bindings/leds/common.txt



Example:



	mt6323: pmic {

		compatible = "mediatek,mt6323";



		...



		mt6323led: leds {

			compatible = "mediatek,mt6323-led";

			#address-cells = <1>;

			#size-cells = <0>;



			led@0 {

				reg = <0>;

				label = "LED0";

				linux,default-trigger = "timer";

				default-state = "on";

			};

			led@1 {

				reg = <1>;

				label = "LED1";

				default-state = "off";

			};

			led@2 {

				reg = <2>;

				label = "LED2";

				default-state = "on";

			};

		};

	};

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

+10 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 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

	- default-state: see Documentation/devicetree/bindings/leds/common.txt

	  This property is only valid for sub-nodes of type <PCA9532_TYPE_LED>.



Example:

  #include <dt-bindings/leds/leds-pca9532.h>
@@ -33,6 +35,14 @@ Example: 
      label = "pca:green:power";

      type = <PCA9532_TYPE_LED>;

    };

    kernel-booting {

      type = <PCA9532_TYPE_LED>;

      default-state = "on";

    };

    sys-stat {

      type = <PCA9532_TYPE_LED>;

      default-state = "keep"; // don't touch, was set by U-Boot

    };

  };



For more product information please see the link below:

drivers/leds/Kconfig

+17 −10
Original line number Diff line number Diff line
@@ -76,6 +76,15 @@ config LEDS_BCM6358 
	  This option enables support for LEDs connected to the BCM6358

	  LED HW controller accessed via MMIO registers.



config LEDS_CPCAP

	tristate "LED Support for Motorola CPCAP"

	depends on LEDS_CLASS

	depends on MFD_CPCAP

	depends on OF

	help

	  This option enables support for LEDs offered by Motorola's

	  CPCAP PMIC.



config LEDS_LM3530

	tristate "LCD Backlight driver for LM3530"

	depends on LEDS_CLASS
@@ -126,6 +135,14 @@ config LEDS_MIKROTIK_RB532 
	  This option enables support for the so called "User LED" of

	  Mikrotik's Routerboard 532.



config LEDS_MT6323

	tristate "LED Support for Mediatek MT6323 PMIC"

	depends on LEDS_CLASS

	depends on MFD_MT6397

	help

	  This option enables support for on-chip LED drivers found on

	  Mediatek MT6323 PMIC.



config LEDS_S3C24XX

	tristate "LED Support for Samsung S3C24XX GPIO LEDs"

	depends on LEDS_CLASS
@@ -241,7 +258,6 @@ config LEDS_LP3952 
	tristate "LED Support for TI LP3952 2 channel LED driver"

	depends on LEDS_CLASS

	depends on I2C

	depends on ACPI

	depends on GPIOLIB

	select REGMAP_I2C

	help
@@ -463,15 +479,6 @@ config LEDS_ADP5520 
	  To compile this driver as a module, choose M here: the module will

	  be called leds-adp5520.



config LEDS_DELL_NETBOOKS

	tristate "External LED on Dell Business Netbooks"

	depends on LEDS_CLASS

	depends on X86 && ACPI_WMI

	depends on DELL_SMBIOS

	help

	  This adds support for the Latitude 2100 and similar

	  notebooks that have an external LED.



config LEDS_MC13783

	tristate "LED Support for MC13XXX PMIC"

	depends on LEDS_CLASS

drivers/leds/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-$(CONFIG_LEDS_AAT1290) += leds-aat1290.o 
obj-$(CONFIG_LEDS_BCM6328)		+= leds-bcm6328.o

obj-$(CONFIG_LEDS_BCM6358)		+= leds-bcm6358.o

obj-$(CONFIG_LEDS_BD2802)		+= leds-bd2802.o

obj-$(CONFIG_LEDS_CPCAP)		+= leds-cpcap.o

obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o

obj-$(CONFIG_LEDS_LM3530)		+= leds-lm3530.o

obj-$(CONFIG_LEDS_LM3533)		+= leds-lm3533.o
@@ -52,7 +53,6 @@ obj-$(CONFIG_LEDS_REGULATOR) += leds-regulator.o 
obj-$(CONFIG_LEDS_INTEL_SS4200)		+= leds-ss4200.o

obj-$(CONFIG_LEDS_LT3593)		+= leds-lt3593.o

obj-$(CONFIG_LEDS_ADP5520)		+= leds-adp5520.o

obj-$(CONFIG_LEDS_DELL_NETBOOKS)	+= dell-led.o

obj-$(CONFIG_LEDS_MC13783)		+= leds-mc13783.o

obj-$(CONFIG_LEDS_NS2)			+= leds-ns2.o

obj-$(CONFIG_LEDS_NETXBIG)		+= leds-netxbig.o
@@ -72,6 +72,7 @@ obj-$(CONFIG_LEDS_IS31FL32XX) += leds-is31fl32xx.o 
obj-$(CONFIG_LEDS_PM8058)		+= leds-pm8058.o

obj-$(CONFIG_LEDS_MLXCPLD)		+= leds-mlxcpld.o

obj-$(CONFIG_LEDS_NIC78BX)		+= leds-nic78bx.o

obj-$(CONFIG_LEDS_MT6323)		+= leds-mt6323.o



# LED SPI Drivers

obj-$(CONFIG_LEDS_DAC124S085)		+= leds-dac124s085.o