| Message ID | 20190523190913.5801-1-danct12@disroot.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 6baac53e03c31a9612c8919da7b9ae4b34ba6f2a |
| Headers | show |
| Series | platform/x86: touchscreen_dmi: Add info for the CHUWI Hi10 Plus tablet. | expand |
On Thu, May 23, 2019 at 10:12 PM Daniel Smith <danct12@disroot.org> wrote: > > Added touch screen info for CHUWI Hi10 Plus tablet. > Pushed to my review and testing queue, thanks! > Signed-off-by: Daniel Smith <danct12@disroot.org> > --- > 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 bd0856d2e825..1dbb53c3f1e7 100644 > --- a/drivers/platform/x86/touchscreen_dmi.c > +++ b/drivers/platform/x86/touchscreen_dmi.c > @@ -91,6 +91,22 @@ static const struct ts_dmi_data chuwi_hi10_air_data = { > .properties = chuwi_hi10_air_props, > }; > > +static const struct property_entry chuwi_hi10_plus_props[] = { > + PROPERTY_ENTRY_U32("touchscreen-min-x", 0), > + PROPERTY_ENTRY_U32("touchscreen-min-y", 5), > + PROPERTY_ENTRY_U32("touchscreen-size-x", 1914), > + PROPERTY_ENTRY_U32("touchscreen-size-y", 1283), > + PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-chuwi-hi10plus.fw"), > + PROPERTY_ENTRY_U32("silead,max-fingers", 10), > + PROPERTY_ENTRY_BOOL("silead,home-button"), > + { } > +}; > + > +static const struct ts_dmi_data chuwi_hi10_plus_data = { > + .acpi_name = "MSSL0017:00", > + .properties = chuwi_hi10_plus_props, > +}; > + > static const struct property_entry chuwi_vi8_props[] = { > PROPERTY_ENTRY_U32("touchscreen-min-x", 4), > PROPERTY_ENTRY_U32("touchscreen-min-y", 6), > @@ -605,6 +621,15 @@ static const struct dmi_system_id touchscreen_dmi_table[] = { > DMI_MATCH(DMI_PRODUCT_SKU, "P1W6_C109D_B"), > }, > }, > + { > + /* Chuwi Hi10 Plus (CWI527) */ > + .driver_data = (void *)&chuwi_hi10_plus_data, > + .matches = { > + DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"), > + DMI_MATCH(DMI_PRODUCT_NAME, "Hi10 plus tablet"), > + DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), > + }, > + }, > { > /* Chuwi Vi8 (CWI506) */ > .driver_data = (void *)&chuwi_vi8_data, > -- > 2.21.0 >
diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c index bd0856d2e825..1dbb53c3f1e7 100644 --- a/drivers/platform/x86/touchscreen_dmi.c +++ b/drivers/platform/x86/touchscreen_dmi.c @@ -91,6 +91,22 @@ static const struct ts_dmi_data chuwi_hi10_air_data = { .properties = chuwi_hi10_air_props, }; +static const struct property_entry chuwi_hi10_plus_props[] = { + PROPERTY_ENTRY_U32("touchscreen-min-x", 0), + PROPERTY_ENTRY_U32("touchscreen-min-y", 5), + PROPERTY_ENTRY_U32("touchscreen-size-x", 1914), + PROPERTY_ENTRY_U32("touchscreen-size-y", 1283), + PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-chuwi-hi10plus.fw"), + PROPERTY_ENTRY_U32("silead,max-fingers", 10), + PROPERTY_ENTRY_BOOL("silead,home-button"), + { } +}; + +static const struct ts_dmi_data chuwi_hi10_plus_data = { + .acpi_name = "MSSL0017:00", + .properties = chuwi_hi10_plus_props, +}; + static const struct property_entry chuwi_vi8_props[] = { PROPERTY_ENTRY_U32("touchscreen-min-x", 4), PROPERTY_ENTRY_U32("touchscreen-min-y", 6), @@ -605,6 +621,15 @@ static const struct dmi_system_id touchscreen_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_SKU, "P1W6_C109D_B"), }, }, + { + /* Chuwi Hi10 Plus (CWI527) */ + .driver_data = (void *)&chuwi_hi10_plus_data, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"), + DMI_MATCH(DMI_PRODUCT_NAME, "Hi10 plus tablet"), + DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), + }, + }, { /* Chuwi Vi8 (CWI506) */ .driver_data = (void *)&chuwi_vi8_data,
Added touch screen info for CHUWI Hi10 Plus tablet. Signed-off-by: Daniel Smith <danct12@disroot.org> --- drivers/platform/x86/touchscreen_dmi.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)