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

Commit 3af6e98f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.3-1' of... 

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

Pull x86 platform driver updates from Darren Hart:
 "Significant work on toshiba_acpi, including new hardware support,
  refactoring, and cleanups.  Extend device support for asus, ideapad,
  and acer systems.  New surface pro 3 buttons driver.  Misc minor
  cleanups for thinkpad and hp-wireless.

  acer-wmi:
   - No rfkill on HP Omen 15 wifi

  thinkpad_acpi:
   - Remove side effects from vdbg_printk -> no_printk macro

  surface pro 3:
   - Add support driver for Surface Pro 3 buttons

  hp-wireless:
   - remove unneeded goto/label in hpwl_init

  ideapad-laptop:
   - add alternative representation for Yoga 2 to DMI table
   - Add Lenovo Yoga 3 14 to no_hw_rfkill dmi list

  asus-laptop:
   - Add key found on Asus F3M

  MAINTAINERS:
   - Remove Toshiba Linux mailing list address

  toshiba_acpi:
   - Bump driver version to 0.23
   - Remove unnecessary checks and returns in HCI/SCI functions
   - Refactor *{get, set} functions return value
   - Remove "*not supported" feature prints
   - Change *available functions return type
   - Add set_fan_status function
   - Change some variables to avoid warnings from ninja-check
   - Reorder toshiba_acpi_alt_keymap entries
   - Remove unused wireless defines
   - Transflective backlight updates
   - Avoid registering input device on WMI event laptops
   - Add /dev/toshiba_acpi device
   - Adapt /proc/acpi/toshiba/keys to TOS1900 devices"

* tag 'platform-drivers-x86-v4.3-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (21 commits)
  acer-wmi: No rfkill on HP Omen 15 wifi
  thinkpad_acpi: Remove side effects from vdbg_printk -> no_printk macro
  surface pro 3: Add support driver for Surface Pro 3 buttons
  hp-wireless: remove unneeded goto/label in hpwl_init
  ideapad-laptop: add alternative representation for Yoga 2 to DMI table
  asus-laptop: Add key found on Asus F3M
  MAINTAINERS: Remove Toshiba Linux mailing list address
  ideapad-laptop: Add Lenovo Yoga 3 14 to no_hw_rfkill dmi list
  toshiba_acpi: Bump driver version to 0.23
  toshiba_acpi: Remove unnecessary checks and returns in HCI/SCI functions
  toshiba_acpi: Refactor *{get, set} functions return value
  toshiba_acpi: Remove "*not supported" feature prints
  toshiba_acpi: Change *available functions return type
  toshiba_acpi: Add set_fan_status function
  toshiba_acpi: Change some variables to avoid warnings from ninja-check
  toshiba_acpi: Reorder toshiba_acpi_alt_keymap entries
  toshiba_acpi: Remove unused wireless defines
  toshiba_acpi: Transflective backlight updates
  toshiba_acpi: Avoid registering input device on WMI event laptops
  toshiba_acpi: Add /dev/toshiba_acpi device
  ...
parents acceba59 628b3198

Documentation/ioctl/ioctl-number.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -265,7 +265,7 @@ Code Seq#(hex) Include File Comments 
's'	all	linux/cdk.h

's'	all	linux/cdk.h

't'	00-7F	linux/ppp-ioctl.h

't'	00-7F	linux/ppp-ioctl.h

't'	80-8F	linux/isdn_ppp.h

't'	80-8F	linux/isdn_ppp.h

't'	90	linux/toshiba.h

't'	90-91	linux/toshiba.h		toshiba and toshiba_acpi SMM

'u'	00-1F	linux/smb_fs.h		gone

'u'	00-1F	linux/smb_fs.h		gone

'u'	20-3F	linux/uvcvideo.h	USB video class host driver

'u'	20-3F	linux/uvcvideo.h	USB video class host driver

'v'	00-1F	linux/ext2_fs.h		conflict!

'v'	00-1F	linux/ext2_fs.h		conflict!

MAINTAINERS

+6 −1
Original line number Original line Diff line number Diff line
@@ -6847,6 +6847,12 @@ T: git git://git.monstr.eu/linux-2.6-microblaze.git 
S:	Supported

S:	Supported

F:	arch/microblaze/

F:	arch/microblaze/





MICROSOFT SURFACE PRO 3 BUTTON DRIVER

M:	Chen Yu <yu.c.chen@intel.com>

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

S:	Supported

F:	drivers/platform/x86/surfacepro3_button.c



MICROTEK X6 SCANNER

MICROTEK X6 SCANNER

M:	Oliver Neukum <oliver@neukum.org>

M:	Oliver Neukum <oliver@neukum.org>

S:	Maintained

S:	Maintained
@@ -10489,7 +10495,6 @@ F: drivers/platform/x86/toshiba_haps.c 




TOSHIBA SMM DRIVER

TOSHIBA SMM DRIVER

M:	Jonathan Buzzard <jonathan@buzzard.org.uk>

M:	Jonathan Buzzard <jonathan@buzzard.org.uk>

L:	tlinux-users@tce.toshiba-dme.co.jp

W:	http://www.buzzard.org.uk/toshiba/

W:	http://www.buzzard.org.uk/toshiba/

S:	Maintained

S:	Maintained

F:	drivers/char/toshiba.c

F:	drivers/char/toshiba.c

drivers/platform/x86/Kconfig

+5 −0
Original line number Original line Diff line number Diff line
@@ -919,4 +919,9 @@ config INTEL_PMC_IPC 
	The PMC is an ARC processor which defines IPC commands for communication

	The PMC is an ARC processor which defines IPC commands for communication

	with other entities in the CPU.

	with other entities in the CPU.





config SURFACE_PRO3_BUTTON

	tristate "Power/home/volume buttons driver for Microsoft Surface Pro 3 tablet"

	depends on ACPI && INPUT

	---help---

	  This driver handles the power/home/volume buttons on the Microsoft Surface Pro 3 tablet.

endif # X86_PLATFORM_DEVICES
 
endif # X86_PLATFORM_DEVICES

drivers/platform/x86/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -60,3 +60,4 @@ obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o 
obj-$(CONFIG_PVPANIC)           += pvpanic.o

obj-$(CONFIG_PVPANIC)           += pvpanic.o

obj-$(CONFIG_ALIENWARE_WMI)	+= alienware-wmi.o

obj-$(CONFIG_ALIENWARE_WMI)	+= alienware-wmi.o

obj-$(CONFIG_INTEL_PMC_IPC)	+= intel_pmc_ipc.o

obj-$(CONFIG_INTEL_PMC_IPC)	+= intel_pmc_ipc.o

obj-$(CONFIG_SURFACE_PRO3_BUTTON)	+= surfacepro3_button.o

drivers/platform/x86/acer-wmi.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -807,6 +807,7 @@ static const struct acpi_device_id norfkill_ids[] __initconst = { 
	{ "IBM0068", 0},

	{ "IBM0068", 0},

	{ "LEN0068", 0},

	{ "LEN0068", 0},

	{ "SNY5001", 0},	/* sony-laptop in charge */

	{ "SNY5001", 0},	/* sony-laptop in charge */

	{ "HPQ6601", 0},

	{ "", 0},

	{ "", 0},

};

};