Commit 15ccc671 authored by Michael Klein's avatar Michael Klein Committed by sanglipeng
Browse files

platform/x86: touchscreen_dmi: Add info for the CSL Panther Tab HD 

stable inclusion
from stable-v5.10.166
commit 9968f9a86251d697c223031be2ae3d3f11eb0fd9
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7TH9O

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9968f9a86251d697c223031be2ae3d3f11eb0fd9



--------------------------------

[ Upstream commit 36c2b9d6 ]

Add touchscreen info for the CSL Panther Tab HD.

Signed-off-by: default avatarMichael Klein <m.klein@mvz-labor-lb.de>
Link: https://lore.kernel.org/r/20221220121103.uiwn5l7fii2iggct@LLGMVZLB-0037


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent aa35abc4

drivers/platform/x86/touchscreen_dmi.c

+25 −0
Original line number Diff line number Diff line
@@ -255,6 +255,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),
@@ -1057,6 +1074,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,