| Message ID | 20180102183928.15267-1-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jan 02, 2018 at 07:39:27PM +0100, Paul Cercueil wrote: > Add touchscreen platform data for the Teclast X98 Plus II tablet. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > Acked-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/platform/x86/silead_dmi.c | 24 ++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > > v2: Rebased on top of http://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git/shortlog/refs/heads/review-andy Generally "testing" is the branch you want to base on if linus/master doesn't work as the review-* branches *will* rebase frequently. Exceptions exist of course, and this patch is just fine - just for future reference. Andy pushed his changes to testing already, so this is no longer dependent on his review queue. I have applied to review-dvhart, will go to testing shortly. Thank you Paul.
Hi, On 03-01-18 00:40, Darren Hart wrote: > On Tue, Jan 02, 2018 at 07:39:27PM +0100, Paul Cercueil wrote: >> Add touchscreen platform data for the Teclast X98 Plus II tablet. >> >> Signed-off-by: Paul Cercueil <paul@crapouillou.net> >> Acked-by: Hans de Goede <hdegoede@redhat.com> >> --- >> drivers/platform/x86/silead_dmi.c | 24 ++++++++++++++++++++++++ >> 1 file changed, 24 insertions(+) >> >> v2: Rebased on top of http://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git/shortlog/refs/heads/review-andy > > Generally "testing" is the branch you want to base on if linus/master > doesn't work as the review-* branches *will* rebase frequently. > Exceptions exist of course, and this patch is just fine - just for > future reference. This is my "fault", I asked Paul to rebase on top of review-andy as that had 1 new silead_dmi patches missing from testing, so otherwise we would end up with a conflict when merging review branches. Same reason why I've been basing my silead_dmi patches on top of review-andy even though that is an unusual base to use. Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jan 3, 2018 at 10:01 AM, Hans de Goede <hdegoede@redhat.com> wrote: > On 03-01-18 00:40, Darren Hart wrote: >> On Tue, Jan 02, 2018 at 07:39:27PM +0100, Paul Cercueil wrote: >> Generally "testing" is the branch you want to base on if linus/master >> doesn't work as the review-* branches *will* rebase frequently. >> Exceptions exist of course, and this patch is just fine - just for >> future reference. > > > This is my "fault", I asked Paul to rebase on top of > review-andy as that had 1 new silead_dmi patches missing > from testing, so otherwise we would end up with a conflict when > merging review branches. Same reason why I've been basing my > silead_dmi patches on top of review-andy even though that is > an unusual base to use. Darren, in this case it's exceptional since there is a stream of a patches against silead_dmi. They appear faster than older appear in testing.
diff --git a/drivers/platform/x86/silead_dmi.c b/drivers/platform/x86/silead_dmi.c index 713446ee3b61..ee8d8e844eb0 100644 --- a/drivers/platform/x86/silead_dmi.c +++ b/drivers/platform/x86/silead_dmi.c @@ -247,6 +247,22 @@ static const struct silead_ts_dmi_data trekstor_primebook_c13_data = { .properties = trekstor_primebook_c13_props, }; +static const struct property_entry teclast_x98plus2_props[] = { + PROPERTY_ENTRY_U32("touchscreen-size-x", 2048), + PROPERTY_ENTRY_U32("touchscreen-size-y", 1280), + PROPERTY_ENTRY_BOOL("touchscreen-inverted-x"), + PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"), + PROPERTY_ENTRY_STRING("firmware-name", + "gsl1686-teclast_x98plus2.fw"), + PROPERTY_ENTRY_U32("silead,max-fingers", 10), + { } +}; + +static const struct silead_ts_dmi_data teclast_x98plus2_data = { + .acpi_name = "MSSL1680:00", + .properties = teclast_x98plus2_props, +}; + static const struct dmi_system_id silead_ts_dmi_table[] = { { /* CUBE iwork8 Air */ @@ -388,6 +404,14 @@ static const struct dmi_system_id silead_ts_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Primebook C13"), }, }, + { + /* Teclast X98 Plus II */ + .driver_data = (void *)&teclast_x98plus2_data, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"), + DMI_MATCH(DMI_PRODUCT_NAME, "X98 Plus II"), + }, + }, { }, };