Commit 53448a53 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v3.19-2' of... 

Merge tag 'platform-drivers-x86-v3.19-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull platform driver fix from Darren Hart:
 "Revert keyboard backlight sysfs support and documentation.

  The support for the dell-laptop keyboard backlight was flawed and the
  fix:

        https://lkml.org/lkml/2015/1/14/539

  was more invasive that I felt comfortable sending at RC5.

  This series reverts the support for the dell-laptop keyboard backlight
  as well as the documentation for the newly created sysfs attributes.

  We'll get this implemented correctly for 3.20"

* tag 'platform-drivers-x86-v3.19-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  Revert "platform: x86: dell-laptop: Add support for keyboard backlight"
  Revert "Documentation: Add entry for dell-laptop sysfs interface"
parents 55069592 b78695a7

Documentation/ABI/testing/sysfs-platform-dell-laptop

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
What:		/sys/class/leds/dell::kbd_backlight/als_setting

Date:		December 2014

KernelVersion:	3.19

Contact:	Gabriele Mazzotta <gabriele.mzt@gmail.com>,

		Pali Rohár <pali.rohar@gmail.com>

Description:

		This file allows to control the automatic keyboard

		illumination mode on some systems that have an ambient

		light sensor. Write 1 to this file to enable the auto

		mode, 0 to disable it.



What:		/sys/class/leds/dell::kbd_backlight/start_triggers

Date:		December 2014

KernelVersion:	3.19

Contact:	Gabriele Mazzotta <gabriele.mzt@gmail.com>,

		Pali Rohár <pali.rohar@gmail.com>

Description:

		This file allows to control the input triggers that

		turn on the keyboard backlight illumination that is

		disabled because of inactivity.

		Read the file to see the triggers available. The ones

		enabled are preceded by '+', those disabled by '-'.



		To enable a trigger, write its name preceded by '+' to

		this file. To disable a trigger, write its name preceded

		by '-' instead.



		For example, to enable the keyboard as trigger run:

		    echo +keyboard > /sys/class/leds/dell::kbd_backlight/start_triggers

		To disable it:

		    echo -keyboard > /sys/class/leds/dell::kbd_backlight/start_triggers



		Note that not all the available triggers can be configured.



What:		/sys/class/leds/dell::kbd_backlight/stop_timeout

Date:		December 2014

KernelVersion:	3.19

Contact:	Gabriele Mazzotta <gabriele.mzt@gmail.com>,

		Pali Rohár <pali.rohar@gmail.com>

Description:

		This file allows to specify the interval after which the

		keyboard illumination is disabled because of inactivity.

		The timeouts are expressed in seconds, minutes, hours and

		days, for which the symbols are 's', 'm', 'h' and 'd'

		respectively.



		To configure the timeout, write to this file a value along

		with any the above units. If no unit is specified, the value

		is assumed to be expressed in seconds.



		For example, to set the timeout to 10 minutes run:

		    echo 10m > /sys/class/leds/dell::kbd_backlight/stop_timeout



		Note that when this file is read, the returned value might be

		expressed in a different unit than the one used when the timeout

		was set.



		Also note that only some timeouts are supported and that

		some systems might fall back to a specific timeout in case

		an invalid timeout is written to this file.

drivers/platform/x86/dell-laptop.c

+6 −1049

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE