Commit 2e7babfa authored Nov 22, 2013 by Linus Torvalds

platform-drivers-x86

Pull x86 platform driver updates from Matthew Garrett:
 "A moderate diffstat, but it's almost entirely just moving the
  chromebook driver into its own directory in order to ease ARM support,
  adding back rfkill support to the one Dell laptop model where it's
  expected to work, updates to the Intel IPC driver for hardware I've
  never actually seen and the usual set of small fixes"

[ This actually came in before the merge window closed, and I had just
  missed it because it didn't match my git pull email pattern.  - Linus ]

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (24 commits)
  x86, wmi fix modalias_show return values
  ipc: Added support for IPC interrupt mode
  ipc: Handle error conditions in ipc command
  ipc: Enabled ipc support for additional intel platforms
  ipc: Added platform data structure
  thinkpad_acpi: Fix build error when CONFIG_SND_MAX_CARDS > 32
  platform: add chrome platform directory
  hp-wmi: detect "2009 BIOS or later" flag by WMI 0x0d for wireless cmd
  dell-wmi: Add KEY_MICMUTE to bios_to_linux_keycode
  platform:x86: Remove OOM message after input_allocate_device
  sony-laptop: fixe typos in sony_laptop_input_keycode_map
  sony-laptop: warn on multiple KBD backlight handles
  dell-laptop: Only enable rfkill functionality on laptops with a hw killswitch
  dell-laptop: Add a force_rfkill module parameter
  dell-laptop: Wait less long before updating rfkill after an rfkill keypress
  dell-laptop: Do not skip setting blocked bit rfkill_set while hw-blocked
  dell-laptop: Sync current block state to BIOS on hw switch change
  dell-laptop: Allow changing the sw_state while the radio is blocked by hw
  dell-laptop: Don't read-back sw_state on machines with a hardware switch
  dell-laptop: Don't set sw_state from the query callback
  ...

parents 6ce4eac1 a80e1053

MAINTAINERS

+5 −0

Original line number	Diff line number	Diff line
		@@ -2142,6 +2142,11 @@ L: linux-usb@vger.kernel.org
		S: Maintained
		F: drivers/usb/chipidea/

		CHROME HARDWARE PLATFORM SUPPORT
		M: Olof Johansson <olof@lixom.net>
		S: Maintained
		F: drivers/platform/chrome/

		CISCO VIC ETHERNET NIC DRIVER
		M: Christian Benvenuti <benve@cisco.com>
		M: Sujith Sankar <ssujith@cisco.com>

drivers/platform/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,3 +5,4 @@ if GOLDFISH
		source "drivers/platform/goldfish/Kconfig"
		endif

		source "drivers/platform/chrome/Kconfig"

drivers/platform/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,3 +5,4 @@
		obj-$(CONFIG_X86) += x86/
		obj-$(CONFIG_OLPC) += olpc/
		obj-$(CONFIG_GOLDFISH) += goldfish/
		obj-$(CONFIG_CHROME_PLATFORMS) += chrome/

drivers/platform/chrome/Kconfig

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		#
		# Platform support for Chrome OS hardware (Chromebooks and Chromeboxes)
		#

		menuconfig CHROME_PLATFORMS
		bool "Platform support for Chrome hardware"
		depends on X86
		---help---
		Say Y here to get to see options for platform support for
		various Chromebooks and Chromeboxes. This option alone does
		not add any kernel code.

		If you say N, all options in this submenu will be skipped and disabled.

		if CHROME_PLATFORMS

		config CHROMEOS_LAPTOP
		tristate "Chrome OS Laptop"
		depends on I2C
		depends on DMI
		---help---
		This driver instantiates i2c and smbus devices such as
		light sensors and touchpads.

		If you have a supported Chromebook, choose Y or M here.
		The module will be called chromeos_laptop.

		endif # CHROMEOS_PLATFORMS

drivers/platform/chrome/Makefile

0 → 100644

+2 −0

Original line number	Diff line number	Diff line

		obj-$(CONFIG_CHROMEOS_LAPTOP) += chromeos_laptop.o

Admin message