Move intel-hid to intel sub-directory to improve
readability. Also, add CFLAGS to tweak the including path
of dual_accel_detect.
Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
---
drivers/platform/x86/Kconfig | 13 -------------
drivers/platform/x86/Makefile | 1 -
drivers/platform/x86/intel/Kconfig | 13 +++++++++++++
drivers/platform/x86/intel/Makefile | 5 ++++-
drivers/platform/x86/{intel-hid.c => intel/hid.c} | 0
5 files changed, 17 insertions(+), 15 deletions(-)
rename drivers/platform/x86/{intel-hid.c => intel/hid.c} (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index ac4ec4e2534a..84865e1cf043 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -667,19 +667,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 b5327b6f774a..734a6c266025 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_MENLOW) += intel_menlow.o
obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 443554133f20..4ca7bec080e7 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -21,6 +21,19 @@ source "drivers/platform/x86/intel/int3472/Kconfig"
source "drivers/platform/x86/intel/pmt/Kconfig"
source "drivers/platform/x86/intel/atomisp2/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 BXT Whiskey Cove TMU Driver"
depends on REGMAP
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index fd2d274f294f..e47e6ac4b5eb 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -9,6 +9,9 @@ obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/
obj-$(CONFIG_INTEL_PMT_CLASS) += pmt/
obj-$(CONFIG_INTEL_ATOMISP2_LED) += atomisp2/
obj-$(CONFIG_INTEL_ATOMISP2_PM) += atomisp2/
+CFLAGS_hid.o := -I./drivers/platform/x86
+intel-hid-y := hid.o
+obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o
# Intel PMIC / PMC / P-Unit devices
intel_bxtwc_tmu-y := bxtwc_tmu.o
@@ -39,4 +42,4 @@ intel_turbo_max_3-y := turbo_max_3.o
obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o
intel-uncore-frequency-y := uncore-frequency.o
obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o
-obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/
\ No newline at end of file
+obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel/hid.c
similarity index 100%
rename from drivers/platform/x86/intel-hid.c
rename to drivers/platform/x86/intel/hid.c
--
2.31.1
