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

Move Intel vGPIO (INT0002) 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-17-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 6659b1036945a5d8df8ed84ed43f95878f7cb8a7..92d119b5dd612927ffe10927074155bfac4ae930 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -668,25 +668,6 @@ config THINKPAD_LMI
 
 source "drivers/platform/x86/intel/Kconfig"
 
-config INTEL_INT0002_VGPIO
-       tristate "Intel ACPI INT0002 Virtual GPIO driver"
-       depends on GPIOLIB && ACPI && PM_SLEEP
-       select GPIOLIB_IRQCHIP
-       help
-         Some peripherals on Bay Trail and Cherry Trail platforms signal a
-         Power Management Event (PME) to the Power Management Controller (PMC)
-         to wakeup the system. When this happens software needs to explicitly
-         clear the PME bus 0 status bit in the GPE0a_STS register to avoid an
-         IRQ storm on IRQ 9.
-
-         This is modelled in ACPI through the INT0002 ACPI device, which is
-         called a "Virtual GPIO controller" in ACPI because it defines the
-         event handler to call when the PME triggers through _AEI and _L02
-         methods as would be done for a real GPIO interrupt in ACPI.
-
-         To compile this driver as a module, choose M here: the module will
-         be called intel_int0002_vgpio.
-
 config INTEL_OAKTRAIL
        tristate "Intel Oaktrail Platform Extras"
        depends on ACPI

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 1062773e8f41917cf4276cac723f8afc45fd3847..52522f2841ddd1455db1c3175b5e9edd54fa7814 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_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 eb6ac7e52cd6f2f5f89a1c08b222e8f251054ce1..cb953301fdd0c06cddb06f743d7e41affc4748e8 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -38,6 +38,25 @@ config INTEL_HID_EVENT
          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
+       select GPIOLIB_IRQCHIP
+       help
+         Some peripherals on Bay Trail and Cherry Trail platforms signal a
+         Power Management Event (PME) to the Power Management Controller (PMC)
+         to wakeup the system. When this happens software needs to explicitly
+         clear the PME bus 0 status bit in the GPE0a_STS register to avoid an
+         IRQ storm on IRQ 9.
+
+         This is modelled in ACPI through the INT0002 ACPI device, which is
+         called a "Virtual GPIO controller" in ACPI because it defines the
+         event handler to call when the PME triggers through _AEI and _L02
+         methods as would be done for a real GPIO interrupt in ACPI.
+
+         To compile this driver as a module, choose M here: the module will
+         be called intel_int0002_vgpio.
+
 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 d0b5ef290bcdee3f45553eb3c51f67b069368b43..e8cb36353428666ffd8283983843aca728455b7c 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -17,6 +17,10 @@ obj-$(CONFIG_INTEL_TELEMETRY)                += telemetry/
 intel-hid-y                            := hid.o
 obj-$(CONFIG_INTEL_HID_EVENT)          += intel-hid.o
 
+# Intel miscellaneous drivers
+intel_int0002_vgpio-y                  := int0002_vgpio.o
+obj-$(CONFIG_INTEL_INT0002_VGPIO)      += intel_int0002_vgpio.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_int0002_vgpio.c b/drivers/platform/x86/intel/int0002_vgpio.c
similarity index 100%
rename from drivers/platform/x86/intel_int0002_vgpio.c
rename to drivers/platform/x86/intel/int0002_vgpio.c