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

Move Intel Oaktrail 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-18-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 92d119b5dd612927ffe10927074155bfac4ae930..7f54db30cf5addb3f39819d304b766155f9c11b7 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -668,16 +668,6 @@ config THINKPAD_LMI
 
 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"
        depends on ACPI

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 52522f2841ddd1455db1c3175b5e9edd54fa7814..836fbab61f47b3036fcab1ffd5476f8dbff8cf08 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_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 cb953301fdd0c06cddb06f743d7e41affc4748e8..3c7fd0bd39f1add0dca6a2832e154fd65ac62ee8 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -57,6 +57,16 @@ config INTEL_INT0002_VGPIO
          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
+       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_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 e8cb36353428666ffd8283983843aca728455b7c..f27d91464cc9dd8dd45fa23d9d201a1eaa8326dd 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -20,6 +20,8 @@ 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_oaktrail-y                       := oaktrail.o
+obj-$(CONFIG_INTEL_OAKTRAIL)           += intel_oaktrail.o
 
 # Intel PMIC / PMC / P-Unit drivers
 intel_bxtwc_tmu-y                      := bxtwc_tmu.o

diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel/oaktrail.c
similarity index 100%
rename from drivers/platform/x86/intel_oaktrail.c
rename to drivers/platform/x86/intel/oaktrail.c