Merge tag 'platform-drivers-x86-v4.1-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver updates from Darren Hart:
 "This series includes significant updates to the toshiba_acpi driver
  and the reintroduction of the dell-laptop keyboard backlight additions
  I had to revert previously.  Also included are various fixes for
  typos, warnings, correctness, and minor bugs.

  Specifics:

  dell-laptop:
     - add support for keyboard backlight.

  toshiba_acpi:
     - adaptive keyboard, hotkey, USB sleep and charge, and backlight
       updates.  Update sysfs documentation.

  toshiba_bluetooth:
     - fix enabling/disabling loop on recent devices

  apple-gmux:
     - lock iGP IO to protect from vgaarb changes

  other:
     - Fix typos, clear gcc warnings, clarify pr_* messages, correct
       return types, update MAINTAINERS"

* tag 'platform-drivers-x86-v4.1-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (25 commits)
  toshiba_acpi: Do not register vendor backlight when acpi_video bl is available
  MAINTAINERS: Add me on list of Dell laptop drivers
  platform: x86: dell-laptop: Add support for keyboard backlight
  Documentation/ABI: Update sysfs-driver-toshiba_acpi entry
  toshiba_acpi: Fix pr_* messages from USB Sleep Functions
  toshiba_acpi: Update and fix USB Sleep and Charge modes
  wmi: Use bool function return values of true/false not 1/0
  toshiba_bluetooth: Fix enabling/disabling loop on recent devices
  toshiba_bluetooth: Clean up *_add function and disable BT device at removal
  toshiba_bluetooth: Add three new functions to the driver
  toshiba_acpi: Fix the enabling of the Special Functions
  toshiba_acpi: Use the Hotkey Event Type function for keymap choosing
  toshiba_acpi: Add Hotkey Event Type function and definitions
  x86/wmi: delete unused wmi_data_lock mutex causing gcc warning
  apple-gmux: lock iGP IO to protect from vgaarb changes
  MAINTAINERS: Add missing Toshiba devices and add myself as maintainer
  toshiba_acpi: Update events in toshiba_acpi_notify
  intel-oaktrail: Fix trivial typo in comment
  thinkpad_acpi: off by one in adaptive_keyboard_hotkey_notify_hotkey()
  thinkpad_acpi: signedness bugs getting current_mode
  ...

3 files changed, 167 insertions, 13 deletions

diff --git a/Documentation/ABI/testing/sysfs-driver-toshiba_acpi b/Documentation/ABI/testing/sysfs-driver-toshiba_acpi
index ca9c71a531c5..eed922ef42e5 100644
--- a/Documentation/ABI/testing/sysfs-driver-toshiba_acpi
+++ b/Documentation/ABI/testing/sysfs-driver-toshiba_acpi
@@ -8,9 +8,11 @@ Description:	This file controls the keyboard backlight operation mode, valid
                         * 0x2  -> AUTO (also called TIMER)
                         * 0x8  -> ON
                         * 0x10 -> OFF
-                Note that the kernel 3.16 onwards this file accepts all listed
+                Note that from kernel 3.16 onwards this file accepts all listed
                 parameters, kernel 3.15 only accepts the first two (FN-Z and
                 AUTO).
+                Also note that toggling this value on type 1 devices, requires
+                a reboot for changes to take effect.
 Users:          KToshiba
 
 What:           /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_backlight_timeout
@@ -67,15 +69,72 @@ Description:	This file shows the current keyboard backlight type,
                         * 2 -> Type 2, supporting modes TIMER, ON and OFF
 Users:          KToshiba
 
+What:           /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_sleep_charge
+Date:           January 23, 2015
+KernelVersion:  4.0
+Contact:        Azael Avalos <coproscefalo@gmail.com>
+Description:    This file controls the USB Sleep & Charge charging mode, which
+                can be:
+                        * 0 -> Disabled         (0x00)
+                        * 1 -> Alternate        (0x09)
+                        * 2 -> Auto             (0x21)
+                        * 3 -> Typical          (0x11)
+                Note that from kernel 4.1 onwards this file accepts all listed
+                values, kernel 4.0 only supports the first three.
+                Note that this feature only works when connected to power, if
+                you want to use it under battery, see the entry named
+                "sleep_functions_on_battery"
+Users:          KToshiba
+
+What:           /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/sleep_functions_on_battery
+Date:           January 23, 2015
+KernelVersion:  4.0
+Contact:        Azael Avalos <coproscefalo@gmail.com>
+Description:    This file controls the USB Sleep Functions under battery, and
+                set the level at which point they will be disabled, accepted
+                values can be:
+                        * 0     -> Disabled
+                        * 1-100 -> Battery level to disable sleep functions
+                Currently it prints two values, the first one indicates if the
+                feature is enabled or disabled, while the second one shows the
+                current battery level set.
+                Note that when the value is set to disabled, the sleep function
+                will only work when connected to power.
+Users:          KToshiba
+
+What:           /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_rapid_charge
+Date:           January 23, 2015
+KernelVersion:  4.0
+Contact:        Azael Avalos <coproscefalo@gmail.com>
+Description:    This file controls the USB Rapid Charge state, which can be:
+                        * 0 -> Disabled
+                        * 1 -> Enabled
+                Note that toggling this value requires a reboot for changes to
+                take effect.
+Users:          KToshiba
+
+What:           /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_sleep_music
+Date:           January 23, 2015
+KernelVersion:  4.0
+Contact:        Azael Avalos <coproscefalo@gmail.com>
+Description:    This file controls the Sleep & Music state, which values can be:
+                        * 0 -> Disabled
+                        * 1 -> Enabled
+                Note that this feature only works when connected to power, if
+                you want to use it under battery, see the entry named
+                "sleep_functions_on_battery"
+Users:          KToshiba
+
 What:           /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/version
-Date:           February, 2015
-KernelVersion:  3.20
+Date:           February 12, 2015
+KernelVersion:  4.0
 Contact:        Azael Avalos <coproscefalo@gmail.com>
 Description:    This file shows the current version of the driver
+Users:          KToshiba
 
 What:           /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/fan
-Date:           February, 2015
-KernelVersion:  3.20
+Date:           February 12, 2015
+KernelVersion:  4.0
 Contact:        Azael Avalos <coproscefalo@gmail.com>
 Description:    This file controls the state of the internal fan, valid
                 values are:
@@ -83,8 +142,8 @@ Description:	This file controls the state of the internal fan, valid
                         * 1 -> ON
 
 What:           /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_function_keys
-Date:           February, 2015
-KernelVersion:  3.20
+Date:           February 12, 2015
+KernelVersion:  4.0
 Contact:        Azael Avalos <coproscefalo@gmail.com>
 Description:    This file controls the Special Functions (hotkeys) operation
                 mode, valid values are:
@@ -94,21 +153,29 @@ Description:	This file controls the Special Functions (hotkeys) operation
                 and the hotkeys are accessed via FN-F{1-12}.
                 In the "Special Functions" mode, the F{1-12} keys trigger the
                 hotkey and the F{1-12} keys are accessed via FN-F{1-12}.
+                Note that toggling this value requires a reboot for changes to
+                take effect.
+Users:          KToshiba
 
 What:           /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/panel_power_on
-Date:           February, 2015
-KernelVersion:  3.20
+Date:           February 12, 2015
+KernelVersion:  4.0
 Contact:        Azael Avalos <coproscefalo@gmail.com>
 Description:    This file controls whether the laptop should turn ON whenever
                 the LID is opened, valid values are:
                         * 0 -> Disabled
                         * 1 -> Enabled
+                Note that toggling this value requires a reboot for changes to
+                take effect.
+Users:          KToshiba
 
 What:           /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_three
-Date:           February, 2015
-KernelVersion:  3.20
+Date:           February 12, 2015
+KernelVersion:  4.0
 Contact:        Azael Avalos <coproscefalo@gmail.com>
-Description:    This file controls whether the USB 3 functionality, valid
-                values are:
+Description:    This file controls the USB 3 functionality, valid values are:
                         * 0 -> Disabled (Acts as a regular USB 2)
                         * 1 -> Enabled (Full USB 3 functionality)
+                Note that toggling this value requires a reboot for changes to
+                take effect.
+Users:          KToshiba
diff --git a/Documentation/ABI/testing/sysfs-platform-dell-laptop b/Documentation/ABI/testing/sysfs-platform-dell-laptop
new file mode 100644
index 000000000000..8c6a0b8e1131
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-platform-dell-laptop
@@ -0,0 +1,69 @@
+What:           /sys/class/leds/dell::kbd_backlight/als_enabled
+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/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 specifiy the on/off threshold value,
+                as reported by the ambient light sensor.
+
+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.
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index fc04c14de4bb..72a150d8f3df 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
@@ -1355,6 +1355,24 @@ Sysfs notes:
         rfkill controller switch "tpacpi_uwb_sw": refer to
         Documentation/rfkill.txt for details.
 
+Adaptive keyboard
+-----------------
+
+sysfs device attribute: adaptive_kbd_mode
+
+This sysfs attribute controls the keyboard "face" that will be shown on the
+Lenovo X1 Carbon 2nd gen (2014)'s adaptive keyboard. The value can be read
+and set.
+
+1 = Home mode
+2 = Web-browser mode
+3 = Web-conference mode
+4 = Function mode
+5 = Layflat mode
+
+For more details about which buttons will appear depending on the mode, please
+review the laptop's user guide:
+http://www.lenovo.com/shop/americas/content/user_guides/x1carbon_2_ug_en.pdf
 
 Multiple Commands, Module Parameters
 ------------------------------------