[PATCH v3 16/20] platform/x86: intel_int0002_vgpio: Move to intel sub-directory

From: Kate Hsuan <hpa@redhat.com>
To: Alex Hung <alex.hung@canonical.com>,
	Hans de Goede <hdegoede@redhat.com>,
	Mark Gross <mgross@linux.intel.com>,
	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
	AceLan Kao <acelan.kao@canonical.com>,
	Jithu Joseph <jithu.joseph@intel.com>,
	Maurice Ma <maurice.ma@intel.com>,
	Sujith Thomas <sujith.thomas@intel.com>,
	Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>,
	Zha Qipeng <qipeng.zha@intel.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	"David E . Box" <david.e.box@linux.intel.com>,
	linux-kernel@vger.kernel.org, Dell.Client.Kernel@dell.com
Cc: platform-driver-x86@vger.kernel.org, Kate Hsuan <hpa@redhat.com>
Subject: [PATCH v3 16/20] platform/x86: intel_int0002_vgpio: Move to intel sub-directory
Date: Thu, 19 Aug 2021 11:29:57 +0800	[thread overview]
Message-ID: <20210819033001.20136-17-hpa@redhat.com> (raw)
In-Reply-To: <20210819033001.20136-1-hpa@redhat.com>

Move intel_int0002_vgpio to intel sub-directory to improve
readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                  | 19 -------------------
 drivers/platform/x86/Makefile                 |  1 -
 drivers/platform/x86/intel/Kconfig            | 19 +++++++++++++++++++
 drivers/platform/x86/intel/Makefile           |  6 ++++--
 .../int0002_vgpio.c}                          |  0
 5 files changed, 23 insertions(+), 22 deletions(-)
 rename drivers/platform/x86/{intel_int0002_vgpio.c => intel/int0002_vgpio.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 70cd67703f8f..90eb653131ab 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -667,25 +667,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 62494618f890..1bbcc2900a84 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -72,7 +72,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 2241d47dbee7..fe9f84357eaf 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -34,6 +34,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 BXT Whiskey Cove TMU Driver"
 	depends on REGMAP
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index ade6dddd0306..f52288b3edc2 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -9,8 +9,10 @@ obj-$(CONFIG_INTEL_SKL_INT3472)		+= int3472/
 obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
 obj-$(CONFIG_INTEL_ATOMISP2_LED)       += atomisp2/
 obj-$(CONFIG_INTEL_ATOMISP2_PM)                += atomisp2/
-intel-hid-y                            := hid.o
-obj-$(CONFIG_INTEL_HID_EVENT)          += intel-hid.o
+intel-hid-y				:= hid.o
+obj-$(CONFIG_INTEL_HID_EVENT)		+= intel-hid.o
+intel_int0002_vgpio-y			:= int0002_vgpio.o
+obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= intel_int0002_vgpio.o
 
 # Intel PMIC / PMC / P-Unit devices
 intel_bxtwc_tmu-y			:= 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
-- 
2.31.1

