Commit 61e5191c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 

Pull x86 platform driver updates from Matthew Garrett:
 "Some significant updates to samsung-laptop, additional hardware
  support for Toshibas, misc updates to various hardware and a new
  backlight driver for some Apple machines."

Fix up trivial conflicts: geode Geos update happening next to net5501
support, and MSIC thermal platform support added twice.

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (77 commits)
  acer-wmi: add quirk table for video backlight vendor mode
  drivers/platform/x86/amilo-rfkill.c::amilo_rfkill_probe() avoid NULL deref
  samsung-laptop: unregister ACPI video module for some well known laptops
  acer-wmi: No wifi rfkill on Sony machines
  thinkpad-acpi: recognize Lenovo as version string in newer V-series BIOS
  asus-wmi: don't update power and brightness when using scalar
  eeepc-wmi: split et2012 specific hacks
  eeepc-wmi: refine quirks handling
  asus-nb-wmi: set panel_power correctly
  asus-wmi: move WAPF variable into quirks_entry
  asus-wmi: store backlight power status for AIO machine
  asus-wmi: add scalar board brightness adj. support
  samsung-laptop: cleanup return type: mode_t vs umode_t
  drivers, samsung-laptop: fix usage of isalnum
  drivers, samsung-laptop: fix initialization of sabi_data in sabi_set_commandb
  asus-wmi: on/off bit is not set when reading the value
  eeepc-wmi: add extra keymaps for EP121
  asus-nb-wmi: ignore useless keys
  acer-wmi: support Lenovo ideapad S205 Brazos wifi switch
  acer-wmi: fix out of input parameter size when set
  ...
parents d2a2fc18 86924de2

Documentation/ABI/testing/sysfs-driver-samsung-laptop

+18 −0
Original line number Diff line number Diff line
@@ -17,3 +17,21 @@ Description: Some Samsung laptops have different "performance levels" 
		Specifically, not all support the "overclock" option,

		and it's still unknown if this value even changes

		anything, other than making the user feel a bit better.



What:		/sys/devices/platform/samsung/battery_life_extender

Date:		December 1, 2011

KernelVersion:	3.3

Contact:	Corentin Chary <corentin.chary@gmail.com>

Description:	Max battery charge level can be modified, battery cycle

		life can be extended by reducing the max battery charge

		level.

		0 means normal battery mode (100% charge)

		1 means battery life extender mode (80% charge)



What:		/sys/devices/platform/samsung/usb_charge

Date:		December 1, 2011

KernelVersion:	3.3

Contact:	Corentin Chary <corentin.chary@gmail.com>

Description:	Use your USB ports to charge devices, even

		when your laptop is powered off.

		1 means enabled, 0 means disabled.

Documentation/laptops/asus-laptop.txt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ Status 
Usage

-----



  Try "modprobe asus_acpi". Check your dmesg (simply type dmesg). You should

  Try "modprobe asus-laptop". Check your dmesg (simply type dmesg). You should

  see some lines like this :



      Asus Laptop Extras version 0.42

Documentation/laptops/sony-laptop.txt

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ subsystem. See the logs of acpid or /proc/acpi/event and 
devices are created by the driver. Additionally, loading the driver with the

debug option will report all events in the kernel log.



The "scancodes" passed to the input system (that can be remapped with udev)

are indexes to the table "sony_laptop_input_keycode_map" in the sony-laptop.c

module.  For example the "FN/E" key combination (EJECTCD on some models)

generates the scancode 20 (0x14).



Backlight control:

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

If your laptop model supports it, you will find sysfs files in the

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -5776,6 +5776,12 @@ F: drivers/media/common/saa7146* 
F:	drivers/media/video/*7146*

F:	include/media/*7146*



SAMSUNG LAPTOP DRIVER

M:	Corentin Chary <corentincj@iksaif.net>

L:	platform-driver-x86@vger.kernel.org

S:	Maintained

F:	drivers/platform/x86/samsung-laptop.c



SAMSUNG AUDIO (ASoC) DRIVERS

M:	Sangbeom Kim <sbkim73@samsung.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

arch/x86/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -2125,6 +2125,13 @@ config NET5501 
	---help---

	  This option enables system support for the Soekris Engineering net5501.



config GEOS

	bool "Traverse Technologies GEOS System Support (LEDS, GPIO, etc)"

	select GPIOLIB

	depends on DMI

	---help---

	  This option enables system support for the Traverse Technologies GEOS.



endif # X86_32



config AMD_NB

CRA Git | Maintained and supported by SUSTech CRA and CCSE