platform/x86: intel_cht_int33fe: Move to its own subfolder

Since we have started collecting Intel x86 specific drivers in their own
folder, move intel_cht_int33fe to its own subfolder there.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210618125516.53510-8-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 79d095c..7d385c3 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -687,30 +687,6 @@ config INTEL_ATOMISP2_PM
          To compile this driver as a module, choose M here: the module
          will be called intel_atomisp2_pm.
 
-config INTEL_CHT_INT33FE
-       tristate "Intel Cherry Trail ACPI INT33FE Driver"
-       depends on X86 && ACPI && I2C && REGULATOR
-       depends on CHARGER_BQ24190=y || (CHARGER_BQ24190=m && m)
-       depends on USB_ROLES_INTEL_XHCI=y || (USB_ROLES_INTEL_XHCI=m && m)
-       depends on TYPEC_MUX_PI3USB30532=y || (TYPEC_MUX_PI3USB30532=m && m)
-       help
-         This driver add support for the INT33FE ACPI device found on
-         some Intel Cherry Trail devices.
-
-         There are two kinds of INT33FE ACPI device possible: for hardware
-         with USB Type-C and Micro-B connectors. This driver supports both.
-
-         The INT33FE ACPI device has a CRS table with I2cSerialBusV2
-         resources for Fuel Gauge Controller and (in the Type-C variant)
-         FUSB302 USB Type-C Controller and PI3USB30532 USB switch.
-         This driver instantiates i2c-clients for these, so that standard
-         i2c drivers for these chips can bind to the them.
-
-         If you enable this driver it is advised to also select
-         CONFIG_BATTERY_BQ27XXX=m or CONFIG_BATTERY_BQ27XXX_I2C=m for Micro-B
-         device and CONFIG_TYPEC_FUSB302=m and CONFIG_BATTERY_MAX17042=m
-         for Type-C device.
-
 config INTEL_HID_EVENT
        tristate "INTEL HID Event"
        depends on ACPI

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index e03b59c..7ee369a 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -70,10 +70,6 @@ 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_CHT_INT33FE)                += intel_cht_int33fe.o
-intel_cht_int33fe-objs                 := intel_cht_int33fe_common.o \
-                                          intel_cht_int33fe_typec.o \
-                                          intel_cht_int33fe_microb.o
 obj-$(CONFIG_INTEL_HID_EVENT)          += intel-hid.o
 obj-$(CONFIG_INTEL_INT0002_VGPIO)      += intel_int0002_vgpio.o
 obj-$(CONFIG_INTEL_MENLOW)             += intel_menlow.o

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 33f2dab..f2eef33 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/int33fe/Kconfig"
 source "drivers/platform/x86/intel/int3472/Kconfig"
 
 endif # X86_PLATFORM_DRIVERS_INTEL

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 3ac795d..0653055 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -4,4 +4,5 @@
 # Intel x86 Platform-Specific Drivers
 #
 
+obj-$(CONFIG_INTEL_CHT_INT33FE)                += int33fe/
 obj-$(CONFIG_INTEL_SKL_INT3472)                += int3472/

diff --git a/drivers/platform/x86/intel/int33fe/Kconfig b/drivers/platform/x86/intel/int33fe/Kconfig
new file mode 100644 (file)
index 0000000..2f7329a
--- /dev/null
+++ b/drivers/platform/x86/intel/int33fe/Kconfig
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config INTEL_CHT_INT33FE
+       tristate "Intel Cherry Trail ACPI INT33FE Driver"
+       depends on X86 && ACPI && I2C && REGULATOR
+       depends on CHARGER_BQ24190=y || (CHARGER_BQ24190=m && m)
+       depends on USB_ROLES_INTEL_XHCI=y || (USB_ROLES_INTEL_XHCI=m && m)
+       depends on TYPEC_MUX_PI3USB30532=y || (TYPEC_MUX_PI3USB30532=m && m)
+       help
+         This driver add support for the INT33FE ACPI device found on
+         some Intel Cherry Trail devices.
+
+         There are two kinds of INT33FE ACPI device possible: for hardware
+         with USB Type-C and Micro-B connectors. This driver supports both.
+
+         The INT33FE ACPI device has a CRS table with I2cSerialBusV2
+         resources for Fuel Gauge Controller and (in the Type-C variant)
+         FUSB302 USB Type-C Controller and PI3USB30532 USB switch.
+         This driver instantiates i2c-clients for these, so that standard
+         i2c drivers for these chips can bind to the them.
+
+         If you enable this driver it is advised to also select
+         CONFIG_BATTERY_BQ27XXX=m or CONFIG_BATTERY_BQ27XXX_I2C=m for Micro-B
+         device and CONFIG_TYPEC_FUSB302=m and CONFIG_BATTERY_MAX17042=m
+         for Type-C device.

diff --git a/drivers/platform/x86/intel/int33fe/Makefile b/drivers/platform/x86/intel/int33fe/Makefile
new file mode 100644 (file)
index 0000000..cc11183
--- /dev/null
+++ b/drivers/platform/x86/intel/int33fe/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_INTEL_CHT_INT33FE)                += intel_cht_int33fe.o
+intel_cht_int33fe-objs                 := intel_cht_int33fe_common.o \
+                                          intel_cht_int33fe_typec.o \
+                                          intel_cht_int33fe_microb.o

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

diff --git a/drivers/platform/x86/intel_cht_int33fe_common.h b/drivers/platform/x86/intel/int33fe/intel_cht_int33fe_common.h
similarity index 100%
rename from drivers/platform/x86/intel_cht_int33fe_common.h
rename to drivers/platform/x86/intel/int33fe/intel_cht_int33fe_common.h

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

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