| Message ID | 20221220121103.uiwn5l7fii2iggct@LLGMVZLB-0037 |
|---|---|
| State | Accepted |
| Commit | 36c2b9d6710427f802494ba070621cb415198293 |
| Headers | show |
| Series | platform/x86: touchscreen_dmi: Add info for the CSL Panther Tab HD | expand |
Hi, On 12/20/22 13:11, Michael Klein wrote: > Add touchscreen info for the CSL Panther Tab HD. > > Signed-off-by: Michael Klein <m.klein@mvz-labor-lb.de> Thank you for your patch, I've applied this patch to my fixes branch: https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=fixes Note it will show up in my fixes branch once I've pushed my local branch there, which might take a while. I will include this patch in my next fixes pull-req to Linus for the current kernel development cycle. Regards, Hans > --- > drivers/platform/x86/touchscreen_dmi.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c > index baae3120efd0..f00995390fdf 100644 > --- a/drivers/platform/x86/touchscreen_dmi.c > +++ b/drivers/platform/x86/touchscreen_dmi.c > @@ -264,6 +264,23 @@ static const struct ts_dmi_data connect_tablet9_data = { > .properties = connect_tablet9_props, > }; > > +static const struct property_entry csl_panther_tab_hd_props[] = { > + PROPERTY_ENTRY_U32("touchscreen-min-x", 1), > + PROPERTY_ENTRY_U32("touchscreen-min-y", 20), > + PROPERTY_ENTRY_U32("touchscreen-size-x", 1980), > + PROPERTY_ENTRY_U32("touchscreen-size-y", 1526), > + PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"), > + PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"), > + PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-csl-panther-tab-hd.fw"), > + PROPERTY_ENTRY_U32("silead,max-fingers", 10), > + { } > +}; > + > +static const struct ts_dmi_data csl_panther_tab_hd_data = { > + .acpi_name = "MSSL1680:00", > + .properties = csl_panther_tab_hd_props, > +}; > + > static const struct property_entry cube_iwork8_air_props[] = { > PROPERTY_ENTRY_U32("touchscreen-min-x", 1), > PROPERTY_ENTRY_U32("touchscreen-min-y", 3), > @@ -1124,6 +1141,14 @@ const struct dmi_system_id touchscreen_dmi_table[] = { > DMI_MATCH(DMI_PRODUCT_NAME, "Tablet 9"), > }, > }, > + { > + /* CSL Panther Tab HD */ > + .driver_data = (void *)&csl_panther_tab_hd_data, > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "CSL Computer GmbH & Co. KG"), > + DMI_MATCH(DMI_PRODUCT_NAME, "CSL Panther Tab HD"), > + }, > + }, > { > /* CUBE iwork8 Air */ > .driver_data = (void *)&cube_iwork8_air_data,
diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c index baae3120efd0..f00995390fdf 100644 --- a/drivers/platform/x86/touchscreen_dmi.c +++ b/drivers/platform/x86/touchscreen_dmi.c @@ -264,6 +264,23 @@ static const struct ts_dmi_data connect_tablet9_data = { .properties = connect_tablet9_props, }; +static const struct property_entry csl_panther_tab_hd_props[] = { + PROPERTY_ENTRY_U32("touchscreen-min-x", 1), + PROPERTY_ENTRY_U32("touchscreen-min-y", 20), + PROPERTY_ENTRY_U32("touchscreen-size-x", 1980), + PROPERTY_ENTRY_U32("touchscreen-size-y", 1526), + PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"), + PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"), + PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-csl-panther-tab-hd.fw"), + PROPERTY_ENTRY_U32("silead,max-fingers", 10), + { } +}; + +static const struct ts_dmi_data csl_panther_tab_hd_data = { + .acpi_name = "MSSL1680:00", + .properties = csl_panther_tab_hd_props, +}; + static const struct property_entry cube_iwork8_air_props[] = { PROPERTY_ENTRY_U32("touchscreen-min-x", 1), PROPERTY_ENTRY_U32("touchscreen-min-y", 3), @@ -1124,6 +1141,14 @@ const struct dmi_system_id touchscreen_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Tablet 9"), }, }, + { + /* CSL Panther Tab HD */ + .driver_data = (void *)&csl_panther_tab_hd_data, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "CSL Computer GmbH & Co. KG"), + DMI_MATCH(DMI_PRODUCT_NAME, "CSL Panther Tab HD"), + }, + }, { /* CUBE iwork8 Air */ .driver_data = (void *)&cube_iwork8_air_data,
Add touchscreen info for the CSL Panther Tab HD. Signed-off-by: Michael Klein <m.klein@mvz-labor-lb.de> --- drivers/platform/x86/touchscreen_dmi.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)