linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] platform/x86: silead_dmi: Add entry for the Teclast X98 Plus II
@ 2018-01-02 13:42 Paul Cercueil
  2018-01-02 15:34 ` Hans de Goede
  2018-01-02 18:39 ` [PATCH v2] " Paul Cercueil
  0 siblings, 2 replies; 6+ messages in thread
From: Paul Cercueil @ 2018-01-02 13:42 UTC (permalink / raw)
  To: Hans de Goede, Darren Hart, Andy Shevchenko
  Cc: linux-input, platform-driver-x86, linux-kernel, Paul Cercueil

Add touchscreen platform data for the Teclast X98 Plus II tablet.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
 drivers/platform/x86/silead_dmi.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/drivers/platform/x86/silead_dmi.c b/drivers/platform/x86/silead_dmi.c
index 266535c2a72f..ebe8692a2868 100644
--- a/drivers/platform/x86/silead_dmi.c
+++ b/drivers/platform/x86/silead_dmi.c
@@ -171,6 +171,22 @@ static const struct silead_ts_dmi_data digma_citi_e200_data = {
 	.properties	= digma_citi_e200_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 */
@@ -271,6 +287,14 @@ static const struct dmi_system_id silead_ts_dmi_table[] = {
 			DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
 		},
 	},
+	{
+		/* 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"),
+		},
+	},
 	{ },
 };
 
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] platform/x86: silead_dmi: Add entry for the Teclast X98 Plus II
  2018-01-02 13:42 [PATCH] platform/x86: silead_dmi: Add entry for the Teclast X98 Plus II Paul Cercueil
@ 2018-01-02 15:34 ` Hans de Goede
  2018-01-02 18:39 ` [PATCH v2] " Paul Cercueil
  1 sibling, 0 replies; 6+ messages in thread
From: Hans de Goede @ 2018-01-02 15:34 UTC (permalink / raw)
  To: Paul Cercueil, Darren Hart, Andy Shevchenko
  Cc: linux-input, platform-driver-x86, linux-kernel

Hi,

On 02-01-18 14:42, Paul Cercueil wrote:
> Add touchscreen platform data for the Teclast X98 Plus II tablet.
> 
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>

Looks good to me:

Acked-by: Hans de Goede <hdegoede@redhat.com>

You should probably send a v2 rebased on top of:

http://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git/shortlog/refs/heads/review-andy

Which has several additional entries compared to the version you
used as base.

Regards,

Hans



> ---
>   drivers/platform/x86/silead_dmi.c | 24 ++++++++++++++++++++++++
>   1 file changed, 24 insertions(+)
> 
> diff --git a/drivers/platform/x86/silead_dmi.c b/drivers/platform/x86/silead_dmi.c
> index 266535c2a72f..ebe8692a2868 100644
> --- a/drivers/platform/x86/silead_dmi.c
> +++ b/drivers/platform/x86/silead_dmi.c
> @@ -171,6 +171,22 @@ static const struct silead_ts_dmi_data digma_citi_e200_data = {
>   	.properties	= digma_citi_e200_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 */
> @@ -271,6 +287,14 @@ static const struct dmi_system_id silead_ts_dmi_table[] = {
>   			DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
>   		},
>   	},
> +	{
> +		/* 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"),
> +		},
> +	},
>   	{ },
>   };
>   
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v2] platform/x86: silead_dmi: Add entry for the Teclast X98 Plus II
  2018-01-02 13:42 [PATCH] platform/x86: silead_dmi: Add entry for the Teclast X98 Plus II Paul Cercueil
  2018-01-02 15:34 ` Hans de Goede
@ 2018-01-02 18:39 ` Paul Cercueil
  2018-01-02 23:40   ` Darren Hart
  1 sibling, 1 reply; 6+ messages in thread
From: Paul Cercueil @ 2018-01-02 18:39 UTC (permalink / raw)
  To: Hans de Goede, Darren Hart, Andy Shevchenko
  Cc: linux-input, platform-driver-x86, linux-kernel, Paul Cercueil

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

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"),
+		},
+	},
 	{ },
 };
 
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] platform/x86: silead_dmi: Add entry for the Teclast X98 Plus II
  2018-01-02 18:39 ` [PATCH v2] " Paul Cercueil
@ 2018-01-02 23:40   ` Darren Hart
  2018-01-03  8:01     ` Hans de Goede
  0 siblings, 1 reply; 6+ messages in thread
From: Darren Hart @ 2018-01-02 23:40 UTC (permalink / raw)
  To: Paul Cercueil
  Cc: Hans de Goede, Andy Shevchenko, linux-input, platform-driver-x86,
	linux-kernel

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.

-- 
Darren Hart
VMware Open Source Technology Center

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] platform/x86: silead_dmi: Add entry for the Teclast X98 Plus II
  2018-01-02 23:40   ` Darren Hart
@ 2018-01-03  8:01     ` Hans de Goede
  2018-01-03 14:10       ` Andy Shevchenko
  0 siblings, 1 reply; 6+ messages in thread
From: Hans de Goede @ 2018-01-03  8:01 UTC (permalink / raw)
  To: Darren Hart, Paul Cercueil
  Cc: Andy Shevchenko, linux-input, platform-driver-x86, linux-kernel

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


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] platform/x86: silead_dmi: Add entry for the Teclast X98 Plus II
  2018-01-03  8:01     ` Hans de Goede
@ 2018-01-03 14:10       ` Andy Shevchenko
  0 siblings, 0 replies; 6+ messages in thread
From: Andy Shevchenko @ 2018-01-03 14:10 UTC (permalink / raw)
  To: Hans de Goede
  Cc: Darren Hart, Paul Cercueil, Andy Shevchenko, linux-input,
	Platform Driver, Linux Kernel Mailing List

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.

-- 
With Best Regards,
Andy Shevchenko

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-01-03 14:10 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-02 13:42 [PATCH] platform/x86: silead_dmi: Add entry for the Teclast X98 Plus II Paul Cercueil
2018-01-02 15:34 ` Hans de Goede
2018-01-02 18:39 ` [PATCH v2] " Paul Cercueil
2018-01-02 23:40   ` Darren Hart
2018-01-03  8:01     ` Hans de Goede
2018-01-03 14:10       ` Andy Shevchenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).