platform/x86: intel-hid: Move to intel sub-directory

Move Intel HID driver to intel sub-directory to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210820110458.73018-16-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 429b8b5c528398757973d8973dbabcc6beb36e7b..5339b210d6a5bd68cf58678dea07392cf7d7667c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9321,7 +9321,7 @@ INTEL HID EVENT DRIVER
 M:     Alex Hung <alex.hung@canonical.com>
 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 <dave.jiang@intel.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 6de0d374ba16013921dfe5926db03dd9076a3da1..6659b1036945a5d8df8ed84ed43f95878f7cb8a7 100644 (file)
--- 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 dccd7ecaae6ad0c8f81dc85c25f69b2ff522af4d..1062773e8f41917cf4276cac723f8afc45fd3847 100644 (file)
--- 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 9d0bc76a89488cb3390e0a35747e1bbfac597dd7..eb6ac7e52cd6f2f5f89a1c08b222e8f251054ce1 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -25,6 +25,19 @@ source "drivers/platform/x86/intel/pmt/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 080589b3082d631494fcbba31ec63ff3062b5ace..d0b5ef290bcdee3f45553eb3c51f67b069368b43 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -13,6 +13,10 @@ obj-$(CONFIG_INTEL_PMT_CLASS)                += pmt/
 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 2e4e97a626a51273e9a2163a3a2eb23256f94ca5..a33a5826e81a144d42f133c48deb3fc70c54efcc 100644 (file)
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel/hid.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/suspend.h>
-#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)