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

Move Intel AtomISP v2 drivers 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-15-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index cf29f71..429b8b5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9212,13 +9212,13 @@ INTEL ATOMISP2 DUMMY / POWER-MANAGEMENT DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     drivers/platform/x86/intel_atomisp2_pm.c
+F:     drivers/platform/x86/intel/atomisp2/pm.c
 
 INTEL ATOMISP2 LED DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     drivers/platform/x86/intel_atomisp2_led.c
+F:     drivers/platform/x86/intel/atomisp2/led.c
 
 INTEL BIOS SAR INT1092 DRIVER
 M:     Shravan S <s.shravan@intel.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 935116e..6de0d37 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -668,40 +668,6 @@ config THINKPAD_LMI
 
 source "drivers/platform/x86/intel/Kconfig"
 
-config INTEL_ATOMISP2_LED
-       tristate "Intel AtomISP2 camera LED driver"
-       depends on GPIOLIB && LEDS_GPIO
-       help
-         Many Bay Trail and Cherry Trail devices come with a camera attached
-         to Intel's Image Signal Processor. Linux currently does not have a
-         driver for these, so they do not work as a camera. Some of these
-         camera's have a LED which is controlled through a GPIO.
-
-         Some of these devices have a firmware issue where the LED gets turned
-         on at boot. This driver will turn the LED off at boot and also allows
-         controlling the LED (repurposing it) through the sysfs LED interface.
-
-         Which GPIO is attached to the LED is usually not described in the
-         ACPI tables, so this driver contains per-system info about the GPIO
-         inside the driver, this means that this driver only works on systems
-         the driver knows about.
-
-         To compile this driver as a module, choose M here: the module
-         will be called intel_atomisp2_led.
-
-config INTEL_ATOMISP2_PM
-       tristate "Intel AtomISP2 dummy / power-management driver"
-       depends on PCI && IOSF_MBI && PM
-       depends on !INTEL_ATOMISP
-       help
-         Power-management driver for Intel's Image Signal Processor found on
-         Bay Trail and Cherry Trail devices. This dummy driver's sole purpose
-         is to turn the ISP off (put it in D3) to save power and to allow
-         entering of S0ix modes.
-
-         To compile this driver as a module, choose M here: the module
-         will be called intel_atomisp2_pm.
-
 config INTEL_HID_EVENT
        tristate "INTEL HID Event"
        depends on ACPI

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index dd3f1e6..dccd7ec 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -71,8 +71,6 @@ obj-$(CONFIG_THINKPAD_LMI)    += think-lmi.o
 # Intel
 obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)               += intel/
 
-obj-$(CONFIG_INTEL_ATOMISP2_LED)       += intel_atomisp2_led.o
-obj-$(CONFIG_INTEL_ATOMISP2_PM)                += intel_atomisp2_pm.o
 obj-$(CONFIG_INTEL_HID_EVENT)          += intel-hid.o
 obj-$(CONFIG_INTEL_INT0002_VGPIO)      += intel_int0002_vgpio.o
 obj-$(CONFIG_INTEL_OAKTRAIL)           += intel_oaktrail.o

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 2622653..9d0bc76 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -16,6 +16,7 @@ menuconfig X86_PLATFORM_DRIVERS_INTEL
 
 if X86_PLATFORM_DRIVERS_INTEL
 
+source "drivers/platform/x86/intel/atomisp2/Kconfig"
 source "drivers/platform/x86/intel/int1092/Kconfig"
 source "drivers/platform/x86/intel/int33fe/Kconfig"
 source "drivers/platform/x86/intel/int3472/Kconfig"

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index f5ac4a5..080589b 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -4,6 +4,7 @@
 # Intel x86 Platform-Specific Drivers
 #
 
+obj-$(CONFIG_INTEL_ATOMISP2_PDX86)     += atomisp2/
 obj-$(CONFIG_INTEL_SAR_INT1092)                += int1092/
 obj-$(CONFIG_INTEL_CHT_INT33FE)                += int33fe/
 obj-$(CONFIG_INTEL_SKL_INT3472)                += int3472/

diff --git a/drivers/platform/x86/intel/atomisp2/Kconfig b/drivers/platform/x86/intel/atomisp2/Kconfig
new file mode 100644 (file)
index 0000000..35dd2be
--- /dev/null
+++ b/drivers/platform/x86/intel/atomisp2/Kconfig
@@ -0,0 +1,43 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_ATOMISP2_PDX86
+       bool
+
+config INTEL_ATOMISP2_LED
+       tristate "Intel AtomISP v2 camera LED driver"
+       depends on GPIOLIB && LEDS_GPIO
+       select INTEL_ATOMISP2_PDX86
+       help
+         Many Bay Trail and Cherry Trail devices come with a camera attached
+         to Intel's Image Signal Processor. Linux currently does not have a
+         driver for these, so they do not work as a camera. Some of these
+         camera's have a LED which is controlled through a GPIO.
+
+         Some of these devices have a firmware issue where the LED gets turned
+         on at boot. This driver will turn the LED off at boot and also allows
+         controlling the LED (repurposing it) through the sysfs LED interface.
+
+         Which GPIO is attached to the LED is usually not described in the
+         ACPI tables, so this driver contains per-system info about the GPIO
+         inside the driver, this means that this driver only works on systems
+         the driver knows about.
+
+         To compile this driver as a module, choose M here: the module
+         will be called intel_atomisp2_led.
+
+config INTEL_ATOMISP2_PM
+       tristate "Intel AtomISP v2 dummy / power-management driver"
+       depends on PCI && IOSF_MBI && PM
+       depends on !INTEL_ATOMISP
+       select INTEL_ATOMISP2_PDX86
+       help
+         Power-management driver for Intel's Image Signal Processor found on
+         Bay Trail and Cherry Trail devices. This dummy driver's sole purpose
+         is to turn the ISP off (put it in D3) to save power and to allow
+         entering of S0ix modes.
+
+         To compile this driver as a module, choose M here: the module
+         will be called intel_atomisp2_pm.

diff --git a/drivers/platform/x86/intel/atomisp2/Makefile b/drivers/platform/x86/intel/atomisp2/Makefile
new file mode 100644 (file)
index 0000000..96b1e87
--- /dev/null
+++ b/drivers/platform/x86/intel/atomisp2/Makefile
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+intel_atomisp2_led-y                   := led.o
+obj-$(CONFIG_INTEL_ATOMISP2_LED)       += intel_atomisp2_led.o
+intel_atomisp2_pm-y                    += pm.o
+obj-$(CONFIG_INTEL_ATOMISP2_PM)                += intel_atomisp2_pm.o

diff --git a/drivers/platform/x86/intel_atomisp2_led.c b/drivers/platform/x86/intel/atomisp2/led.c
similarity index 100%
rename from drivers/platform/x86/intel_atomisp2_led.c
rename to drivers/platform/x86/intel/atomisp2/led.c

diff --git a/drivers/platform/x86/intel_atomisp2_pm.c b/drivers/platform/x86/intel/atomisp2/pm.c
similarity index 100%
rename from drivers/platform/x86/intel_atomisp2_pm.c
rename to drivers/platform/x86/intel/atomisp2/pm.c