platform/x86: x86-android-tablets: Move into its own subdir

Move the x86-android-tablets code into its own subdir, this is
a preparation patch for splitting the somewhat large file into
multiple smaller files.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230301092331.7038-3-hdegoede@redhat.com

diff --git a/MAINTAINERS b/MAINTAINERS
index 8d5bc223f3053bf83c8a5aeaa6900ceafe111179..7b08a58506e3d331a8683578718eff88debb2ed0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -22688,7 +22688,7 @@ M:      Hans de Goede <hdegoede@redhat.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
-F:     drivers/platform/x86/x86-android-tablets.c
+F:     drivers/platform/x86/x86-android-tablets/
 
 X86 PLATFORM DRIVERS
 M:     Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 4a01b315e0a91ed5c6517407b4eb6250a42809b3..46d9e3130ebbefe9c8a66c915b57f4c4eea37b9f 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -978,22 +978,7 @@ config TOUCHSCREEN_DMI
          the OS-image for the device. This option supplies the missing info.
          Enable this for x86 tablets with Silead or Chipone touchscreens.
 
-config X86_ANDROID_TABLETS
-       tristate "X86 Android tablet support"
-       depends on I2C && SPI && SERIAL_DEV_BUS && ACPI && EFI && GPIOLIB
-       help
-         X86 tablets which ship with Android as (part of) the factory image
-         typically have various problems with their DSDTs. The factory kernels
-         shipped on these devices typically have device addresses and GPIOs
-         hardcoded in the kernel, rather than specified in their DSDT.
-
-         With the DSDT containing a random collection of devices which may or
-         may not actually be present. This driver contains various fixes for
-         such tablets, including instantiating kernel devices for devices which
-         are missing from the DSDT.
-
-         If you have a x86 Android tablet say Y or M here, for a generic x86
-         distro config say M here.
+source "drivers/platform/x86/x86-android-tablets/Kconfig"
 
 config FW_ATTR_CLASS
        tristate

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 1d3d1b02541b946d527fac89a3796fac28aad783..0d9cc9af6ba799755d652e33fb7c71988733559e 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -112,7 +112,7 @@ obj-$(CONFIG_SERIAL_MULTI_INSTANTIATE)      += serial-multi-instantiate.o
 obj-$(CONFIG_MLX_PLATFORM)             += mlx-platform.o
 obj-$(CONFIG_TOUCHSCREEN_DMI)          += touchscreen_dmi.o
 obj-$(CONFIG_WIRELESS_HOTKEY)          += wireless-hotkey.o
-obj-$(CONFIG_X86_ANDROID_TABLETS)      += x86-android-tablets.o
+obj-$(CONFIG_X86_ANDROID_TABLETS)      += x86-android-tablets/
 
 # Intel uncore drivers
 obj-$(CONFIG_INTEL_IPS)                                += intel_ips.o

diff --git a/drivers/platform/x86/x86-android-tablets/Kconfig b/drivers/platform/x86/x86-android-tablets/Kconfig
new file mode 100644 (file)
index 0000000..2b3daca
--- /dev/null
+++ b/drivers/platform/x86/x86-android-tablets/Kconfig
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# X86 Android tablet support Kconfig
+#
+
+config X86_ANDROID_TABLETS
+       tristate "X86 Android tablet support"
+       depends on I2C && SPI && SERIAL_DEV_BUS && ACPI && EFI && GPIOLIB
+       help
+         X86 tablets which ship with Android as (part of) the factory image
+         typically have various problems with their DSDTs. The factory kernels
+         shipped on these devices typically have device addresses and GPIOs
+         hardcoded in the kernel, rather than specified in their DSDT.
+
+         With the DSDT containing a random collection of devices which may or
+         may not actually be present. This driver contains various fixes for
+         such tablets, including instantiating kernel devices for devices which
+         are missing from the DSDT.
+
+         If you have a x86 Android tablet say Y or M here, for a generic x86
+         distro config say M here.

diff --git a/drivers/platform/x86/x86-android-tablets/Makefile b/drivers/platform/x86/x86-android-tablets/Makefile
new file mode 100644 (file)
index 0000000..52a0d6d
--- /dev/null
+++ b/drivers/platform/x86/x86-android-tablets/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# X86 Android tablet support Makefile
+#
+
+obj-$(CONFIG_X86_ANDROID_TABLETS) += x86-android-tablets.o
+
+x86-android-tablets-y := x86-android-tablets-main.o

diff --git a/drivers/platform/x86/x86-android-tablets.c b/drivers/platform/x86/x86-android-tablets/x86-android-tablets-main.c
similarity index 99%
rename from drivers/platform/x86/x86-android-tablets.c
rename to drivers/platform/x86/x86-android-tablets/x86-android-tablets-main.c
index 8405e1c58d520eff15b35799ac04083c7476aedb..08cc5e15846044142333e38cbee1140f515a80f4 100644 (file)
--- a/drivers/platform/x86/x86-android-tablets.c
+++ b/drivers/platform/x86/x86-android-tablets/x86-android-tablets-main.c
@@ -34,8 +34,8 @@
 #include <linux/spi/spi.h>
 #include <linux/string.h>
 /* For gpio_get_desc() which is EXPORT_SYMBOL_GPL() */
-#include "../../gpio/gpiolib.h"
-#include "../../gpio/gpiolib-acpi.h"
+#include "../../../gpio/gpiolib.h"
+#include "../../../gpio/gpiolib-acpi.h"
 
 /*
  * Helper code to get Linux IRQ numbers given a description of the IRQ source