[PATCH 19/20] Move OakTrail driver to the intel/ directory to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
---
 drivers/platform/x86/Kconfig                      |  9 ---------
 drivers/platform/x86/Makefile                     |  3 ---
 drivers/platform/x86/intel/Kconfig                |  1 +
 drivers/platform/x86/intel/Makefile               |  2 +-
 drivers/platform/x86/intel/oaktrail/Kconfig       | 15 +++++++++++++++
 drivers/platform/x86/intel/oaktrail/Makefile      |  6 ++++++
 .../x86/{ => intel/oaktrail}/intel_oaktrail.c     |  0
 7 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 drivers/platform/x86/intel/oaktrail/Kconfig
 create mode 100644 drivers/platform/x86/intel/oaktrail/Makefile
 rename drivers/platform/x86/{ => intel/oaktrail}/intel_oaktrail.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 50ded236a841..2426f8feb41f 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -634,15 +634,6 @@ source "drivers/platform/x86/intel/Kconfig"
 
 
 
-config INTEL_OAKTRAIL
-	tristate "Intel Oaktrail Platform Extras"
-	depends on ACPI
-	depends on ACPI_VIDEO || ACPI_VIDEO = n
-	depends on RFKILL && BACKLIGHT_CLASS_DEVICE && ACPI
-	help
-	  Intel Oaktrail platform need this driver to provide interfaces to
-	  enable/disable the Camera, WiFi, BT etc. devices. If in doubt, say Y
-	  here; it will only load on supported platforms.
 
 config INTEL_VBTN
 	tristate "INTEL VIRTUAL BUTTON"
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index ea5f5dd3f78a..d3992588408a 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -66,9 +66,6 @@ obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
 # Intel
 obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)		+= intel/
 
-
-
-obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
 obj-$(CONFIG_INTEL_VBTN)		+= intel-vbtn.o
 
 # MSI
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 59c9b602c784..afc0f70c45ac 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -37,6 +37,7 @@ source "drivers/platform/x86/intel/turbo_max_3/Kconfig"
 source "drivers/platform/x86/intel/uncore_freq/Kconfig"
 source "drivers/platform/x86/intel/int0002/Kconfig"
 source "drivers/platform/x86/intel/menlow/Kconfig"
+source "drivers/platform/x86/intel/oaktrail/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index b2326554bd84..6acf5db0e847 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -13,7 +13,7 @@ obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)	+= wmi/
 obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)	+= wmi/
 obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= int0002/
 obj-$(CONFIG_INTEL_MENLOW)		+= menlow/
-
+obj-$(CONFIG_INTEL_OAKTRAIL)		+= oaktrail/
 
 # Intel PMIC / PMC / P-Unit devices
 obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+= bxtwc/
diff --git a/drivers/platform/x86/intel/oaktrail/Kconfig b/drivers/platform/x86/intel/oaktrail/Kconfig
new file mode 100644
index 000000000000..6063fd4e19ca
--- /dev/null
+++ b/drivers/platform/x86/intel/oaktrail/Kconfig
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_OAKTRAIL
+	tristate "Intel Oaktrail Platform Extras"
+	depends on ACPI
+	depends on ACPI_VIDEO || ACPI_VIDEO = n
+	depends on RFKILL && BACKLIGHT_CLASS_DEVICE && ACPI
+	help
+	  Intel Oaktrail platform need this driver to provide interfaces to
+	  enable/disable the Camera, WiFi, BT etc. devices. If in doubt, say Y
+	  here; it will only load on supported platforms.
+
diff --git a/drivers/platform/x86/intel/oaktrail/Makefile b/drivers/platform/x86/intel/oaktrail/Makefile
new file mode 100644
index 000000000000..dc2a7e850153
--- /dev/null
+++ b/drivers/platform/x86/intel/oaktrail/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel/oaktrail/intel_oaktrail.c
similarity index 100%
rename from drivers/platform/x86/intel_oaktrail.c
rename to drivers/platform/x86/intel/oaktrail/intel_oaktrail.c
-- 
2.31.1