diff mbox series

platform/x86: touchscreen_dmi: add nanote-next quirks

Message ID e8dda83a-10ae-42cf-a061-5d29be0d193a@yandex.ru (mailing list archive)
State Accepted, archived
Headers show
Series platform/x86: touchscreen_dmi: add nanote-next quirks | expand

Commit Message

Ckat Sept. 11, 2024, 7:12 p.m. UTC
Add quirks for the nanote next (UMPC-03-SR).

After checking with multiple owners the DMI info really is this generic.

Signed-off-by: ckath <ckath@yandex.ru>
---
 drivers/platform/x86/touchscreen_dmi.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)


base-commit: da3ea35007d0af457a0afc87e84fddaebc4e0b63

Comments

Hans de Goede Sept. 14, 2024, 3:58 p.m. UTC | #1
Hi,

On 9/11/24 9:12 PM, Ckat wrote:
> Add quirks for the nanote next (UMPC-03-SR).
> 
> After checking with multiple owners the DMI info really is this generic.
> 
> Signed-off-by: ckath <ckath@yandex.ru>

Thank you for your patch, I've applied this patch to my review-hans 
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.

Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.

Regards,

Hans




> ---
>  drivers/platform/x86/touchscreen_dmi.c | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
> 
> 
> base-commit: da3ea35007d0af457a0afc87e84fddaebc4e0b63
> 
> diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c
> index f74af0a689f2..0a39f68c641d 100644
> --- a/drivers/platform/x86/touchscreen_dmi.c
> +++ b/drivers/platform/x86/touchscreen_dmi.c
> @@ -840,6 +840,21 @@ static const struct ts_dmi_data rwc_nanote_p8_data = {
>  	.properties = rwc_nanote_p8_props,
>  };
>  
> +static const struct property_entry rwc_nanote_next_props[] = {
> +	PROPERTY_ENTRY_U32("touchscreen-min-x", 5),
> +	PROPERTY_ENTRY_U32("touchscreen-min-y", 5),
> +	PROPERTY_ENTRY_U32("touchscreen-size-x", 1785),
> +	PROPERTY_ENTRY_U32("touchscreen-size-y", 1145),
> +	PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
> +	PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-rwc-nanote-next.fw"),
> +	{ }
> +};
> +
> +static const struct ts_dmi_data rwc_nanote_next_data = {
> +	.acpi_name = "MSSL1680:00",
> +	.properties = rwc_nanote_next_props,
> +};
> +
>  static const struct property_entry schneider_sct101ctm_props[] = {
>  	PROPERTY_ENTRY_U32("touchscreen-size-x", 1715),
>  	PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
> @@ -1589,6 +1604,17 @@ const struct dmi_system_id touchscreen_dmi_table[] = {
>  			DMI_MATCH(DMI_PRODUCT_SKU, "0001")
>  		},
>  	},
> +	{
> +		/* RWC NANOTE NEXT */
> +		.driver_data = (void *)&rwc_nanote_next_data,
> +		.matches = {
> +			DMI_MATCH(DMI_PRODUCT_NAME, "To be filled by O.E.M."),
> +			DMI_MATCH(DMI_BOARD_NAME, "To be filled by O.E.M."),
> +			DMI_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),
> +			/* Above matches are too generic, add bios-version match */
> +			DMI_MATCH(DMI_BIOS_VERSION, "S8A70R100-V005"),
> +		},
> +	},
>  	{
>  		/* Schneider SCT101CTM */
>  		.driver_data = (void *)&schneider_sct101ctm_data,
diff mbox series

Patch

diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c
index f74af0a689f2..0a39f68c641d 100644
--- a/drivers/platform/x86/touchscreen_dmi.c
+++ b/drivers/platform/x86/touchscreen_dmi.c
@@ -840,6 +840,21 @@  static const struct ts_dmi_data rwc_nanote_p8_data = {
 	.properties = rwc_nanote_p8_props,
 };
 
+static const struct property_entry rwc_nanote_next_props[] = {
+	PROPERTY_ENTRY_U32("touchscreen-min-x", 5),
+	PROPERTY_ENTRY_U32("touchscreen-min-y", 5),
+	PROPERTY_ENTRY_U32("touchscreen-size-x", 1785),
+	PROPERTY_ENTRY_U32("touchscreen-size-y", 1145),
+	PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
+	PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-rwc-nanote-next.fw"),
+	{ }
+};
+
+static const struct ts_dmi_data rwc_nanote_next_data = {
+	.acpi_name = "MSSL1680:00",
+	.properties = rwc_nanote_next_props,
+};
+
 static const struct property_entry schneider_sct101ctm_props[] = {
 	PROPERTY_ENTRY_U32("touchscreen-size-x", 1715),
 	PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
@@ -1589,6 +1604,17 @@  const struct dmi_system_id touchscreen_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_SKU, "0001")
 		},
 	},
+	{
+		/* RWC NANOTE NEXT */
+		.driver_data = (void *)&rwc_nanote_next_data,
+		.matches = {
+			DMI_MATCH(DMI_PRODUCT_NAME, "To be filled by O.E.M."),
+			DMI_MATCH(DMI_BOARD_NAME, "To be filled by O.E.M."),
+			DMI_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),
+			/* Above matches are too generic, add bios-version match */
+			DMI_MATCH(DMI_BIOS_VERSION, "S8A70R100-V005"),
+		},
+	},
 	{
 		/* Schneider SCT101CTM */
 		.driver_data = (void *)&schneider_sct101ctm_data,