From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934814AbcATBoy (ORCPT ); Tue, 19 Jan 2016 20:44:54 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:54024 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933985AbcATBof (ORCPT ); Tue, 19 Jan 2016 20:44:35 -0500 Date: Tue, 19 Jan 2016 17:44:21 -0800 From: Darren Hart To: Linus Torvalds Cc: LKML Subject: [GIT PULL] platform-drivers-x86 for 4.5-1 Message-ID: <20160120014421.GA14777@malice.jf.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, There is a merge conflict with this pull-request and a change to dell-wmi.c already in your tree: 61679c725553 "dell-wmi: Use acpi_video_handles_brightness_key_presses()" For your reference, I have resolved this in the for-next-4.5-1-rebase branch in the same repository. Thanks, Darren Hart Intel Open Source Technology Center The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec: Linux 4.4-rc1 (2015-11-15 17:00:27 -0800) are available in the git repository at: git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git tags/platform-drivers-x86-v4.5-1 for you to fetch changes up to 4bef0a27e414f79e0200f33ab23adeb07965272e: surface pro 4: fix compare_const_fl.cocci warnings (2016-01-19 17:35:52 -0800) ---------------------------------------------------------------- platform-drivers-x86 for 4.5-1 Add intel punit and telemetry driver for APL SoCs. Add intel-hid driver for various laptop hotkey support. Add asus-wireless radio control driver. Keyboard backlight support/improvements for ThinkPads, Vaio, and Toshiba. Several hotkey related fixes and improvements for dell and toshiba. Fix oops on dual GPU Macs in apple-gmux. A few new device IDs and quirks. Various minor config related build issues and cleanups. surface pro 4: - fix compare_const_fl.cocci warnings - Add support for Surface Pro 4 Buttons platform/x86: - Add Intel Telemetry Debugfs interfaces - Add Intel telemetry platform device - Add Intel telemetry platform driver - Add Intel Telemetry Core Driver - add NULL check for input parameters - add Intel P-Unit mailbox IPC driver - update acpi resource structure for Punit thinkpad_acpi: - Add support for keyboard backlight dell-wmi: - Process only one event on devices with interface version 0 - Check if Dell WMI descriptor structure is valid - Improve unknown hotkey handling - Use a C99-style array for bios_to_linux_keycode tc1100-wmi: - fix build warning when CONFIG_PM not enabled asus-wireless: - Add ACPI HID ATK4001 - Add Asus Wireless Radio Control driver asus-wmi: - drop to_platform_driver macro intel-hid: - new hid event driver for hotkeys sony-laptop: - Keyboard backlight control for some Vaio Fit models ideapad-laptop: - Add Lenovo ideapad Y700-17ISK to no_hw_rfkill dmi list apple-gmux: - Assign apple_gmux_data before registering toshiba_acpi: - Add rfkill dependency to ACPI_TOSHIBA entry - Fix keyboard backlight sysfs entries not being updated - Add WWAN RFKill support - Add support for WWAN devices - Fix blank screen at boot if transflective backlight is supported - Propagate the hotkey value via genetlink toshiba_bluetooth: - Add missing newline in toshiba_bluetooth_present function ---------------------------------------------------------------- Alex Hung (1): intel-hid: new hid event driver for hotkeys Andy Lutomirski (2): dell_wmi: Use a C99-style array for bios_to_linux_keycode dell-wmi: Improve unknown hotkey handling Azael Avalos (7): toshiba_bluetooth: Add missing newline in toshiba_bluetooth_present function toshiba_acpi: Propagate the hotkey value via genetlink toshiba_acpi: Fix blank screen at boot if transflective backlight is supported toshiba_acpi: Add support for WWAN devices toshiba_acpi: Add WWAN RFKill support toshiba_acpi: Fix keyboard backlight sysfs entries not being updated platform/x86: Add rfkill dependency to ACPI_TOSHIBA entry Colin Ian King (1): tc1100-wmi: fix build warning when CONFIG_PM not enabled Geliang Tang (1): asus-wmi: drop to_platform_driver macro Josh Boyer (1): ideapad-laptop: Add Lenovo ideapad Y700-17ISK to no_hw_rfkill dmi list João Paulo Rechi Vita (2): platform/x86: Add Asus Wireless Radio Control driver asus-wireless: Add ACPI HID ATK4001 Julia Lawall (1): surface pro 4: fix compare_const_fl.cocci warnings Matthew Garrett (1): apple-gmux: Assign apple_gmux_data before registering Mattia Dongili (1): Keyboard backlight control for some Vaio Fit models Pali Rohár (3): dell-wmi: Check if Dell WMI descriptor structure is valid dell-wmi: Process only one event on devices with interface version 0 thinkpad_acpi: Add support for keyboard backlight Qipeng Zha (3): intel_pmc_ipc: update acpi resource structure for Punit platform:x86: add Intel P-Unit mailbox IPC driver intel_punit_ipc: add NULL check for input parameters Souvik Kumar Chakravarty (4): platform/x86: Add Intel Telemetry Core Driver platform:x86: Add Intel telemetry platform driver platform:x86: Add Intel telemetry platform device platform:x86: Add Intel Telemetry Debugfs interfaces Weng Xuetian (1): surface pro 4: Add support for Surface Pro 4 Buttons MAINTAINERS | 25 +- arch/x86/include/asm/intel_punit_ipc.h | 101 ++ arch/x86/include/asm/intel_telemetry.h | 147 +++ drivers/platform/x86/Kconfig | 48 +- drivers/platform/x86/Makefile | 6 + drivers/platform/x86/apple-gmux.c | 10 +- drivers/platform/x86/asus-wireless.c | 84 ++ drivers/platform/x86/asus-wmi.c | 3 - drivers/platform/x86/dell-wmi.c | 181 +++- drivers/platform/x86/ideapad-laptop.c | 7 + drivers/platform/x86/intel-hid.c | 289 ++++++ drivers/platform/x86/intel_pmc_ipc.c | 214 ++++- drivers/platform/x86/intel_punit_ipc.c | 342 +++++++ drivers/platform/x86/intel_telemetry_core.c | 464 +++++++++ drivers/platform/x86/intel_telemetry_debugfs.c | 1030 ++++++++++++++++++++ drivers/platform/x86/intel_telemetry_pltdrv.c | 1206 ++++++++++++++++++++++++ drivers/platform/x86/sony-laptop.c | 65 +- drivers/platform/x86/surfacepro3_button.c | 12 +- drivers/platform/x86/tc1100-wmi.c | 2 + drivers/platform/x86/thinkpad_acpi.c | 206 ++++ drivers/platform/x86/toshiba_acpi.c | 246 ++++- drivers/platform/x86/toshiba_bluetooth.c | 2 +- 22 files changed, 4579 insertions(+), 111 deletions(-) create mode 100644 arch/x86/include/asm/intel_punit_ipc.h create mode 100644 arch/x86/include/asm/intel_telemetry.h create mode 100644 drivers/platform/x86/asus-wireless.c create mode 100644 drivers/platform/x86/intel-hid.c create mode 100644 drivers/platform/x86/intel_punit_ipc.c create mode 100644 drivers/platform/x86/intel_telemetry_core.c create mode 100644 drivers/platform/x86/intel_telemetry_debugfs.c create mode 100644 drivers/platform/x86/intel_telemetry_pltdrv.c -- Darren Hart Intel Open Source Technology Center