]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
platform/x86: x86-android-tablets: convert HiDeep devices to GPIO references
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 20 Sep 2025 20:06:56 +0000 (22:06 +0200)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Fri, 26 Sep 2025 11:26:16 +0000 (14:26 +0300)
Now that gpiolib supports software nodes to describe GPIOs, switch the
driver away from using GPIO lookup tables for HiDeep 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-4-hansg@kernel.org
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/x86-android-tablets/lenovo.c

index f8d261d3728406e40c1cd399e932507f32830829..49388266201be9ffa36bcfe804f6cd148202e708 100644 (file)
@@ -97,6 +97,7 @@ static const struct property_entry lenovo_yb1_x90_hideep_ts_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1920),
        PROPERTY_ENTRY_U32("touchscreen-max-pressure", 16384),
        PROPERTY_ENTRY_BOOL("hideep,force-native-protocol"),
+       PROPERTY_ENTRY_GPIO("reset-gpios", &cherryview_gpiochip_nodes[0], 7, GPIO_ACTIVE_LOW),
        { }
 };
 
@@ -211,19 +212,6 @@ static const struct x86_gpio_button lenovo_yb1_x90_lid __initconst = {
        .pin = 19,
 };
 
-static struct gpiod_lookup_table lenovo_yb1_x90_hideep_gpios = {
-       .dev_id = "i2c-hideep_ts",
-       .table = {
-               GPIO_LOOKUP("INT33FF:00", 7, "reset", GPIO_ACTIVE_LOW),
-               { }
-       },
-};
-
-static struct gpiod_lookup_table * const lenovo_yb1_x90_gpios[] = {
-       &lenovo_yb1_x90_hideep_gpios,
-       NULL
-};
-
 static int __init lenovo_yb1_x90_init(struct device *dev)
 {
        /* Enable the regulators used by the touchscreens */
@@ -252,7 +240,6 @@ const struct x86_dev_info lenovo_yogabook_x90_info __initconst = {
        .serdev_count = ARRAY_SIZE(lenovo_yb1_x90_serdevs),
        .gpio_button = &lenovo_yb1_x90_lid,
        .gpio_button_count = 1,
-       .gpiod_lookup_tables = lenovo_yb1_x90_gpios,
        .gpiochip_type = X86_GPIOCHIP_CHERRYVIEW,
        .init = lenovo_yb1_x90_init,
 };
@@ -819,6 +806,7 @@ static const struct property_entry lenovo_yt3_hideep_ts_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1600),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 2560),
        PROPERTY_ENTRY_U32("touchscreen-max-pressure", 255),
+       PROPERTY_ENTRY_GPIO("reset-gpios", &cherryview_gpiochip_nodes[0], 7, GPIO_ACTIVE_LOW),
        { }
 };
 
@@ -1008,14 +996,6 @@ static int __init lenovo_yt3_init(struct device *dev)
        return 0;
 }
 
-static struct gpiod_lookup_table lenovo_yt3_hideep_gpios = {
-       .dev_id = "i2c-hideep_ts",
-       .table = {
-               GPIO_LOOKUP("INT33FF:00", 7, "reset", GPIO_ACTIVE_LOW),
-               { }
-       },
-};
-
 static struct gpiod_lookup_table lenovo_yt3_wm5102_gpios = {
        .dev_id = "spi1.0",
        .table = {
@@ -1028,7 +1008,6 @@ static struct gpiod_lookup_table lenovo_yt3_wm5102_gpios = {
 };
 
 static struct gpiod_lookup_table * const lenovo_yt3_gpios[] = {
-       &lenovo_yt3_hideep_gpios,
        &lenovo_yt3_wm5102_gpios,
        NULL
 };
@@ -1039,5 +1018,6 @@ const struct x86_dev_info lenovo_yt3_info __initconst = {
        .spi_dev_info = lenovo_yt3_spi_devs,
        .spi_dev_count = ARRAY_SIZE(lenovo_yt3_spi_devs),
        .gpiod_lookup_tables = lenovo_yt3_gpios,
+       .gpiochip_type = X86_GPIOCHIP_CHERRYVIEW,
        .init = lenovo_yt3_init,
 };