platform/x86: x86-android-tablets: convert EDT devices to GPIO references

Now that gpiolib supports software nodes to describe GPIOs, switch the
driver away from using GPIO lookup tables for EDT touchscreens to using
PROPERTY_ENTRY_GPIO() to keep all touchscreen properties together.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Tested-by: Hans de Goede <hansg@kernel.org>
Reviewed-by: Hans de Goede <hansg@kernel.org>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Hans de Goede <hansg@kernel.org>
Link: https://patch.msgid.link/20250920200713.20193-6-hansg@kernel.org
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/x86-android-tablets/other.c b/drivers/platform/x86/x86-android-tablets/other.c
index 95c5001004a1ea219c4e546491f64fdfa1f1a362..0f3cc0ea877ee7c1322fe037c1ea787367358fb8 100644 (file)
--- a/drivers/platform/x86/x86-android-tablets/other.c
+++ b/drivers/platform/x86/x86-android-tablets/other.c
@@ -436,6 +436,17 @@ static const struct software_node nextbook_ares8a_accel_node = {
        .properties = nextbook_ares8a_accel_props,
 };
 
+static const struct property_entry nextbook_ares8a_ft5416_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 800),
+       PROPERTY_ENTRY_U32("touchscreen-size-y", 1280),
+       PROPERTY_ENTRY_GPIO("reset-gpios", &cherryview_gpiochip_nodes[1], 25, GPIO_ACTIVE_LOW),
+       { }
+};
+
+static const struct software_node nextbook_ares8a_ft5416_node = {
+       .properties = nextbook_ares8a_ft5416_props,
+};
+
 static const struct x86_i2c_client_info nextbook_ares8a_i2c_clients[] __initconst = {
        {
                /* Freescale MMA8653FC accelerometer */
@@ -452,7 +463,7 @@ static const struct x86_i2c_client_info nextbook_ares8a_i2c_clients[] __initcons
                        .type = "edt-ft5x06",
                        .addr = 0x38,
                        .dev_name = "ft5416",
-                       .swnode = &nextbook_ares8_touchscreen_node,
+                       .swnode = &nextbook_ares8a_ft5416_node,
                },
                .adapter_path = "\\_SB_.PCI0.I2C6",
                .irq_data = {
@@ -466,23 +477,10 @@ static const struct x86_i2c_client_info nextbook_ares8a_i2c_clients[] __initcons
        },
 };
 
-static struct gpiod_lookup_table nextbook_ares8a_ft5416_gpios = {
-       .dev_id = "i2c-ft5416",
-       .table = {
-               GPIO_LOOKUP("INT33FF:01", 25, "reset", GPIO_ACTIVE_LOW),
-               { }
-       },
-};
-
-static struct gpiod_lookup_table * const nextbook_ares8a_gpios[] = {
-       &nextbook_ares8a_ft5416_gpios,
-       NULL
-};
-
 const struct x86_dev_info nextbook_ares8a_info __initconst = {
        .i2c_client_info = nextbook_ares8a_i2c_clients,
        .i2c_client_count = ARRAY_SIZE(nextbook_ares8a_i2c_clients),
-       .gpiod_lookup_tables = nextbook_ares8a_gpios,
+       .gpiochip_type = X86_GPIOCHIP_CHERRYVIEW,
 };
 
 /*