| Message ID | 20210520093228.7439-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | platform/x86: touchscreen_dmi: Add info for the Chuwi Hi10 Pro (CWI529) tablet | expand |
Hi, On 5/20/21 11:32 AM, Hans de Goede wrote: > Add touchscreen info for the Chuwi Hi10 Pro (CWI529) tablet. This includes > info for getting the firmware directly from the UEFI, so that the user does > not need to manually install the firmware in /lib/firmware/silead. > > This change will make the touchscreen on these devices work OOTB, > without requiring any manual setup. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> I've added this to the pdx86 review-hans and fixes branches now. Regards, Hans > --- > drivers/platform/x86/touchscreen_dmi.c | 35 ++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c > index 40c970908a99..a626891f3ec8 100644 > --- a/drivers/platform/x86/touchscreen_dmi.c > +++ b/drivers/platform/x86/touchscreen_dmi.c > @@ -115,6 +115,32 @@ static const struct ts_dmi_data chuwi_hi10_plus_data = { > .properties = chuwi_hi10_plus_props, > }; > > +static const struct property_entry chuwi_hi10_pro_props[] = { > + PROPERTY_ENTRY_U32("touchscreen-min-x", 8), > + PROPERTY_ENTRY_U32("touchscreen-min-y", 8), > + PROPERTY_ENTRY_U32("touchscreen-size-x", 1912), > + PROPERTY_ENTRY_U32("touchscreen-size-y", 1272), > + PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"), > + PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-chuwi-hi10-pro.fw"), > + PROPERTY_ENTRY_U32("silead,max-fingers", 10), > + PROPERTY_ENTRY_BOOL("silead,home-button"), > + { } > +}; > + > +static const struct ts_dmi_data chuwi_hi10_pro_data = { > + .embedded_fw = { > + .name = "silead/gsl1680-chuwi-hi10-pro.fw", > + .prefix = { 0xf0, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 }, > + .length = 42504, > + .sha256 = { 0xdb, 0x92, 0x68, 0xa8, 0xdb, 0x81, 0x31, 0x00, > + 0x1f, 0x58, 0x89, 0xdb, 0x19, 0x1b, 0x15, 0x8c, > + 0x05, 0x14, 0xf4, 0x95, 0xba, 0x15, 0x45, 0x98, > + 0x42, 0xa3, 0xbb, 0x65, 0xe3, 0x30, 0xa5, 0x93 }, > + }, > + .acpi_name = "MSSL1680:00", > + .properties = chuwi_hi10_pro_props, > +}; > + > static const struct property_entry chuwi_vi8_props[] = { > PROPERTY_ENTRY_U32("touchscreen-min-x", 4), > PROPERTY_ENTRY_U32("touchscreen-min-y", 6), > @@ -955,6 +981,15 @@ const struct dmi_system_id touchscreen_dmi_table[] = { > DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), > }, > }, > + { > + /* Chuwi Hi10 Prus (CWI597) */ > + .driver_data = (void *)&chuwi_hi10_pro_data, > + .matches = { > + DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"), > + DMI_MATCH(DMI_PRODUCT_NAME, "Hi10 pro tablet"), > + DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), > + }, > + }, > { > /* Chuwi Vi8 (CWI506) */ > .driver_data = (void *)&chuwi_vi8_data, >
diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c index 40c970908a99..a626891f3ec8 100644 --- a/drivers/platform/x86/touchscreen_dmi.c +++ b/drivers/platform/x86/touchscreen_dmi.c @@ -115,6 +115,32 @@ static const struct ts_dmi_data chuwi_hi10_plus_data = { .properties = chuwi_hi10_plus_props, }; +static const struct property_entry chuwi_hi10_pro_props[] = { + PROPERTY_ENTRY_U32("touchscreen-min-x", 8), + PROPERTY_ENTRY_U32("touchscreen-min-y", 8), + PROPERTY_ENTRY_U32("touchscreen-size-x", 1912), + PROPERTY_ENTRY_U32("touchscreen-size-y", 1272), + PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"), + PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-chuwi-hi10-pro.fw"), + PROPERTY_ENTRY_U32("silead,max-fingers", 10), + PROPERTY_ENTRY_BOOL("silead,home-button"), + { } +}; + +static const struct ts_dmi_data chuwi_hi10_pro_data = { + .embedded_fw = { + .name = "silead/gsl1680-chuwi-hi10-pro.fw", + .prefix = { 0xf0, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 }, + .length = 42504, + .sha256 = { 0xdb, 0x92, 0x68, 0xa8, 0xdb, 0x81, 0x31, 0x00, + 0x1f, 0x58, 0x89, 0xdb, 0x19, 0x1b, 0x15, 0x8c, + 0x05, 0x14, 0xf4, 0x95, 0xba, 0x15, 0x45, 0x98, + 0x42, 0xa3, 0xbb, 0x65, 0xe3, 0x30, 0xa5, 0x93 }, + }, + .acpi_name = "MSSL1680:00", + .properties = chuwi_hi10_pro_props, +}; + static const struct property_entry chuwi_vi8_props[] = { PROPERTY_ENTRY_U32("touchscreen-min-x", 4), PROPERTY_ENTRY_U32("touchscreen-min-y", 6), @@ -955,6 +981,15 @@ const struct dmi_system_id touchscreen_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), }, }, + { + /* Chuwi Hi10 Prus (CWI597) */ + .driver_data = (void *)&chuwi_hi10_pro_data, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"), + DMI_MATCH(DMI_PRODUCT_NAME, "Hi10 pro tablet"), + DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), + }, + }, { /* Chuwi Vi8 (CWI506) */ .driver_data = (void *)&chuwi_vi8_data,
Add touchscreen info for the Chuwi Hi10 Pro (CWI529) tablet. This includes info for getting the firmware directly from the UEFI, so that the user does not need to manually install the firmware in /lib/firmware/silead. This change will make the touchscreen on these devices work OOTB, without requiring any manual setup. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/platform/x86/touchscreen_dmi.c | 35 ++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)