WaveShare Touchscreen Driver Fix (Odroid) "disable_vu7" (#3799)

* Update boot-meson64.cmd

Fix disable_vu7 functionality by enabling usbhid quirks when set to false

* Update hardkernel-0015-COMMON-input-touchscreen-Add-D-WAV-Multitouch.patch

* Update hardkernel-0015-COMMON-input-touchscreen-Add-D-WAV-Multitouch.patch

* Update hardkernel-0015-COMMON-input-touchscreen-Add-D-WAV-Multitouch.patch

* Update hardkernel-0015-COMMON-input-touchscreen-Add-D-WAV-Multitouch.patch

* Update hardkernel-0015-COMMON-input-touchscreen-Add-D-WAV-Multitouch.patch

* Update hardkernel-0015-COMMON-input-touchscreen-Add-D-WAV-Multitouch.patch

* Update general-input-touchscreen-Add-D-WAV-Multitouch.patch
This commit is contained in:
crocinsocks 2022-05-23 15:15:25 +01:00 committed by GitHub
parent c4b62f848f
commit 37e898332a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 29 deletions

View File

@ -129,8 +129,9 @@ else
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyAML0,115200 console=tty1"; fi
if test "${console}" = "serial"; then setenv consoleargs "console=ttyAML0,115200"; fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${disable_vu7}" = "false"; then setenv usbhidquirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi
setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 coherent_pool=2M loglevel=${verbosity} ubootpart=${partuuid} libata.force=noncq usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 coherent_pool=2M loglevel=${verbosity} ubootpart=${partuuid} libata.force=noncq usb-storage.quirks=${usbstoragequirks} ${usbhidquirks} ${extraargs} ${extraboardargs}"
if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory swapaccount=1"; fi
echo "Mainline bootargs: ${bootargs}"

View File

@ -7,11 +7,11 @@ Subject: [PATCH 15/74] ODROID-COMMON: input/touchscreen: Add D-WAV Multitouch
Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71
---
drivers/hid/hid-ids.h | 6 +
drivers/hid/hid-quirks.c | 4 +
drivers/hid/hid-quirks.c | 3 +
drivers/input/touchscreen/Kconfig | 10 +
drivers/input/touchscreen/Makefile | 1 +
drivers/input/touchscreen/dwav-usb-mt.c | 554 ++++++++++++++++++++++++
5 files changed, 575 insertions(+)
5 files changed, 574 insertions(+)
create mode 100644 drivers/input/touchscreen/dwav-usb-mt.c
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
@ -33,12 +33,11 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 934fc0a798d4..9cf96f48238e 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -845,6 +845,10 @@ static const struct hid_device_id hid_ignore_list[] = {
@@ -845,6 +845,9 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) },
#endif
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
+
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_MULTITOUCH) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) },
{ }

View File

@ -7,11 +7,11 @@ Subject: [PATCH 15/74] ODROID-COMMON: input/touchscreen: Add D-WAV Multitouch
Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71
---
drivers/hid/hid-ids.h | 6 +
drivers/hid/hid-quirks.c | 4 +
drivers/hid/hid-quirks.c | 3 +
drivers/input/touchscreen/Kconfig | 10 +
drivers/input/touchscreen/Makefile | 1 +
drivers/input/touchscreen/dwav-usb-mt.c | 554 ++++++++++++++++++++++++
5 files changed, 575 insertions(+)
5 files changed, 574 insertions(+)
create mode 100644 drivers/input/touchscreen/dwav-usb-mt.c
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
@ -33,12 +33,11 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 934fc0a798d4..9cf96f48238e 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -845,6 +845,10 @@ static const struct hid_device_id hid_ignore_list[] = {
@@ -845,6 +845,9 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) },
#endif
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
+
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_MULTITOUCH) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) },
{ }

View File

@ -7,11 +7,11 @@ Subject: [PATCH 15/74] ODROID-COMMON: input/touchscreen: Add D-WAV Multitouch
Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71
---
drivers/hid/hid-ids.h | 6 +
drivers/hid/hid-quirks.c | 4 +
drivers/hid/hid-quirks.c | 3 +
drivers/input/touchscreen/Kconfig | 10 +
drivers/input/touchscreen/Makefile | 1 +
drivers/input/touchscreen/dwav-usb-mt.c | 554 ++++++++++++++++++++++++
5 files changed, 575 insertions(+)
5 files changed, 574 insertions(+)
create mode 100644 drivers/input/touchscreen/dwav-usb-mt.c
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
@ -33,12 +33,11 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 934fc0a798d4..9cf96f48238e 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -845,6 +845,10 @@ static const struct hid_device_id hid_ignore_list[] = {
@@ -845,6 +845,9 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) },
#endif
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
+
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_MULTITOUCH) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) },
{ }

View File

@ -7,11 +7,11 @@ Subject: [PATCH 15/74] ODROID-COMMON: input/touchscreen: Add D-WAV Multitouch
Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71
---
drivers/hid/hid-ids.h | 6 +
drivers/hid/hid-quirks.c | 4 +
drivers/hid/hid-quirks.c | 3 +
drivers/input/touchscreen/Kconfig | 10 +
drivers/input/touchscreen/Makefile | 1 +
drivers/input/touchscreen/dwav-usb-mt.c | 554 ++++++++++++++++++++++++
5 files changed, 575 insertions(+)
5 files changed, 574 insertions(+)
create mode 100644 drivers/input/touchscreen/dwav-usb-mt.c
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
@ -33,12 +33,11 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 934fc0a798d4..9cf96f48238e 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -845,6 +845,10 @@ static const struct hid_device_id hid_ignore_list[] = {
@@ -845,6 +845,9 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) },
#endif
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
+
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_MULTITOUCH) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) },
{ }

View File

@ -7,11 +7,11 @@ Subject: [PATCH 15/74] ODROID-COMMON: input/touchscreen: Add D-WAV Multitouch
Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71
---
drivers/hid/hid-ids.h | 6 +
drivers/hid/hid-quirks.c | 4 +
drivers/hid/hid-quirks.c | 3 +
drivers/input/touchscreen/Kconfig | 10 +
drivers/input/touchscreen/Makefile | 1 +
drivers/input/touchscreen/dwav-usb-mt.c | 554 ++++++++++++++++++++++++
5 files changed, 575 insertions(+)
5 files changed, 574 insertions(+)
create mode 100644 drivers/input/touchscreen/dwav-usb-mt.c
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
@ -33,12 +33,11 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 934fc0a798d4..9cf96f48238e 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -845,6 +845,10 @@ static const struct hid_device_id hid_ignore_list[] = {
@@ -845,6 +845,9 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) },
#endif
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
+
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_MULTITOUCH) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) },
{ }

View File

@ -7,11 +7,11 @@ Subject: [PATCH 15/74] ODROID-COMMON: input/touchscreen: Add D-WAV Multitouch
Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71
---
drivers/hid/hid-ids.h | 6 +
drivers/hid/hid-quirks.c | 4 +
drivers/hid/hid-quirks.c | 3 +
drivers/input/touchscreen/Kconfig | 10 +
drivers/input/touchscreen/Makefile | 1 +
drivers/input/touchscreen/dwav-usb-mt.c | 554 ++++++++++++++++++++++++
5 files changed, 575 insertions(+)
5 files changed, 574 insertions(+)
create mode 100644 drivers/input/touchscreen/dwav-usb-mt.c
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
@ -33,12 +33,11 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 934fc0a798d4..9cf96f48238e 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -845,6 +845,10 @@ static const struct hid_device_id hid_ignore_list[] = {
@@ -845,6 +845,9 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) },
#endif
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
+
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_MULTITOUCH) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) },
{ }

View File

@ -7,11 +7,11 @@ Subject: [PATCH] ODROID-COMMON: input/touchscreen: Add D-WAV Multitouch
Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71
---
drivers/hid/hid-ids.h | 6 +
drivers/hid/hid-quirks.c | 4 +
drivers/hid/hid-quirks.c | 3 +
drivers/input/touchscreen/Kconfig | 10 +
drivers/input/touchscreen/Makefile | 1 +
drivers/input/touchscreen/dwav-usb-mt.c | 554 ++++++++++++++++++++++++
5 files changed, 575 insertions(+)
5 files changed, 574 insertions(+)
create mode 100644 drivers/input/touchscreen/dwav-usb-mt.c
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
@ -33,12 +33,11 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index ee7e504e7279..4d876faea391 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -863,6 +863,10 @@ static const struct hid_device_id hid_ignore_list[] = {
@@ -863,6 +863,9 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) },
#endif
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
+
+ { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_MULTITOUCH) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) },
{ }