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

Commit 43c40df2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull LED updates from Bryan Wu:
 "This cycle we got:
   - a fix of attribute-creation race for the whole leds subsystem
   - new drivers (HID:GT683R, leds-ipaq-micro)
   - other fixing and clean up"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (23 commits)
  leds: ipaq-micro: fix sparse non static symbol warning
  leds: add driver for the iPAQ micro
  Documentation: dts: tcs6507: Fix wrong statement about #gpio-cells
  leds: convert blink timer to workqueue
  leds:pca963x: Update for PCA9635 and correct statement about MODE2 OUTDRV default
  leds:pca963x: Always initialize MODE2 register
  leds:pca963x: Add support for PCA9635 LED driver chip
  HID: gt683r: move mode attribute to led-class devices
  HID: gt683r: fix race condition
  HID: add support for MSI GT683R led panels
  leds: lp55xx-common: fix attribute-creation race
  leds: lp55xx-common: fix sysfs entry leak
  input: lm8323: fix attribute-creation race
  leds: wm831x-status: fix attribute-creation race
  leds: ss4200: fix attribute-creation race
  leds: ns2: fix attribute-creation race
  leds: netxbig: fix attribute-creation race
  leds: max8997: fix attribute-creation race
  leds: lm3642: fix attribute-creation race
  leds: lm355x: fix attribute-creation race
  ...
parents 7385d6fd e661c897

Documentation/ABI/testing/sysfs-class-leds-gt683r

0 → 100644
+16 −0
Original line number Diff line number Diff line 
What:		/sys/class/leds/<led>/gt683r/mode

Date:		Jun 2014

KernelVersion:	3.17

Contact:	Janne Kanniainen <janne.kanniainen@gmail.com>

Description:

		Set the mode of LEDs. You should notice that changing the mode

		of one LED will update the mode of its two sibling devices as

		well.



		0 - normal

		1 - audio

		2 - breathing



		Normal: LEDs are fully on when enabled

		Audio:  LEDs brightness depends on sound level

		Breathing: LEDs brightness varies at human breathing rate
 
 No newline at end of file

Documentation/devicetree/bindings/leds/pca963x.txt

+5 −4
Original line number Diff line number Diff line 
LEDs connected to pca9632, pca9633 or pca9634



Required properties:

- compatible : should be : "nxp,pca9632", "nxp,pca9633" or "nxp,pca9634"

- compatible : should be : "nxp,pca9632", "nxp,pca9633", "nxp,pca9634" or "nxp,pca9635"



Optional properties:

- nxp,totem-pole : use totem pole (push-pull) instead of default open-drain

- nxp,totem-pole : use totem pole (push-pull) instead of open-drain (pca9632 defaults

  to open-drain, newer chips to totem pole)

- nxp,hw-blink : use hardware blinking instead of software blinking



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



LED sub-node properties:

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

- reg : number of LED line (could be from 0 to 3  in pca9632 or pca9633

		or 0 to 7 in pca9634)

- reg : number of LED line (could be from 0 to 3 in pca9632 or pca9633,

		0 to 7 in pca9634, or 0 to 15 in pca9635)

- linux,default-trigger : (optional)

   see Documentation/devicetree/bindings/leds/common.txt

Documentation/devicetree/bindings/leds/tca6507.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Required properties: 


Optional properties:

- gpio-controller: allows lines to be used as output-only GPIOs.

- #gpio-cells: if present, must be 0.

- #gpio-cells: if present, must not be 0.



Each led is represented as a sub-node of the ti,tca6507 device.

drivers/hid/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -261,6 +261,20 @@ config HOLTEK_FF 
	  Say Y here if you have a Holtek On Line Grip based game controller

	  and want to have force feedback support for it.



config HID_GT683R

	tristate "MSI GT68xR LED support"

	depends on LEDS_CLASS && USB_HID

	---help---

	Say Y here if you want to enable support for the three MSI GT68xR LEDs



	This driver support following modes:

	  - Normal: LEDs are fully on when enabled

	  - Audio:  LEDs brightness depends on sound level

	  - Breathing: LEDs brightness varies at human breathing rate



	Currently the following devices are know to be supported:

	  - MSI GT683R



config HID_HUION

	tristate "Huion tablets"

	depends on USB_HID

drivers/hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ obj-$(CONFIG_HID_EMS_FF) += hid-emsff.o 
obj-$(CONFIG_HID_ELECOM)	+= hid-elecom.o

obj-$(CONFIG_HID_ELO)		+= hid-elo.o

obj-$(CONFIG_HID_EZKEY)		+= hid-ezkey.o

obj-$(CONFIG_HID_GT683R)	+= hid-gt683r.o

obj-$(CONFIG_HID_GYRATION)	+= hid-gyration.o

obj-$(CONFIG_HID_HOLTEK)	+= hid-holtek-kbd.o

obj-$(CONFIG_HID_HOLTEK)	+= hid-holtek-mouse.o