From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B45A5C432BE for ; Thu, 19 Aug 2021 16:38:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A2901610A0 for ; Thu, 19 Aug 2021 16:38:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232294AbhHSQjW (ORCPT ); Thu, 19 Aug 2021 12:39:22 -0400 Received: from mga07.intel.com ([134.134.136.100]:1924 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230260AbhHSQim (ORCPT ); Thu, 19 Aug 2021 12:38:42 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10081"; a="280332712" X-IronPort-AV: E=Sophos;i="5.84,335,1620716400"; d="scan'208";a="280332712" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2021 09:38:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,335,1620716400"; d="scan'208";a="681847603" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 19 Aug 2021 09:38:01 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 3D7EB707; Thu, 19 Aug 2021 19:37:53 +0300 (EEST) From: Andy Shevchenko To: Hans de Goede , Andy Shevchenko , Kate Hsuan , Srinivas Pandruvada , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, Dell.Client.Kernel@dell.com Cc: Mark Gross , Alex Hung , Rajneesh Bhardwaj , David E Box , Zha Qipeng , Mika Westerberg , "David E. Box" , AceLan Kao , Jithu Joseph , Maurice Ma Subject: [PATCH v4 15/21] platform/x86: intel-hid: Move to intel sub-directory Date: Thu, 19 Aug 2021 19:37:29 +0300 Message-Id: <20210819163735.81803-16-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210819163735.81803-1-andriy.shevchenko@linux.intel.com> References: <20210819163735.81803-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kate Hsuan Move Intel HID driver to intel sub-directory to improve readability. Signed-off-by: Kate Hsuan Reviewed-by: Hans de Goede Signed-off-by: Andy Shevchenko --- MAINTAINERS | 2 +- drivers/platform/x86/Kconfig | 13 ------------- drivers/platform/x86/Makefile | 1 - drivers/platform/x86/intel/Kconfig | 13 +++++++++++++ drivers/platform/x86/intel/Makefile | 4 ++++ drivers/platform/x86/{intel-hid.c => intel/hid.c} | 2 +- 6 files changed, 19 insertions(+), 16 deletions(-) rename drivers/platform/x86/{intel-hid.c => intel/hid.c} (99%) diff --git a/MAINTAINERS b/MAINTAINERS index ce79ad253afe..5d25d0d9f1a6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9321,7 +9321,7 @@ INTEL HID EVENT DRIVER M: Alex Hung L: platform-driver-x86@vger.kernel.org S: Maintained -F: drivers/platform/x86/intel-hid.c +F: drivers/platform/x86/intel/hid.c INTEL I/OAT DMA DRIVER M: Dave Jiang diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index feca8ae551a1..7f3912c16338 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -668,19 +668,6 @@ config THINKPAD_LMI source "drivers/platform/x86/intel/Kconfig" -config INTEL_HID_EVENT - tristate "INTEL HID Event" - depends on ACPI - depends on INPUT - depends on I2C - select INPUT_SPARSEKMAP - help - This driver provides support for the Intel HID Event hotkey interface. - Some laptops require this driver for hotkey support. - - To compile this driver as a module, choose M here: the module will - be called intel_hid. - config INTEL_INT0002_VGPIO tristate "Intel ACPI INT0002 Virtual GPIO driver" depends on GPIOLIB && ACPI && PM_SLEEP diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 1f3e48a1721f..2a8f03f89273 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -71,7 +71,6 @@ obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o # Intel obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/ -obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig index 351640511eee..b97061e85a3d 100644 --- a/drivers/platform/x86/intel/Kconfig +++ b/drivers/platform/x86/intel/Kconfig @@ -26,6 +26,19 @@ source "drivers/platform/x86/intel/scu/Kconfig" source "drivers/platform/x86/intel/speed_select_if/Kconfig" source "drivers/platform/x86/intel/telemetry/Kconfig" +config INTEL_HID_EVENT + tristate "Intel HID Event" + depends on ACPI + depends on INPUT + depends on I2C + select INPUT_SPARSEKMAP + help + This driver provides support for the Intel HID Event hotkey interface. + Some laptops require this driver for hotkey support. + + To compile this driver as a module, choose M here: the module will + be called intel_hid. + config INTEL_BXTWC_PMIC_TMU tristate "Intel Broxton Whiskey Cove TMU Driver" depends on INTEL_SOC_PMIC_BXTWC diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile index e5ea0e8ba516..8bfa9fb0a528 100644 --- a/drivers/platform/x86/intel/Makefile +++ b/drivers/platform/x86/intel/Makefile @@ -14,6 +14,10 @@ obj-$(CONFIG_INTEL_SCU) += scu/ obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/ obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/ +# Intel input drivers +intel-hid-y := hid.o +obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o + # Intel PMIC / PMC / P-Unit drivers intel_bxtwc_tmu-y := bxtwc_tmu.o obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel/hid.c similarity index 99% rename from drivers/platform/x86/intel-hid.c rename to drivers/platform/x86/intel/hid.c index 2e4e97a626a5..a33a5826e81a 100644 --- a/drivers/platform/x86/intel-hid.c +++ b/drivers/platform/x86/intel/hid.c @@ -14,7 +14,7 @@ #include #include #include -#include "dual_accel_detect.h" +#include "../dual_accel_detect.h" /* When NOT in tablet mode, VGBS returns with the flag 0x40 */ #define TABLET_MODE_FLAG BIT(6) -- 2.32.0