From 797898d83f9d5df569bed790915c976771b9ca60 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Fri, 18 Jul 2025 10:27:07 +0200 Subject: [PATCH] Meson64 Current: adjust broken patch --- ...l-input-touchscreen-Add-D-WAV-Multitouch.patch | 9 ++++++--- ...l-input-touchscreen-Add-D-WAV-Multitouch.patch | 15 +++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/patch/kernel/archive/meson64-6.12/general-input-touchscreen-Add-D-WAV-Multitouch.patch b/patch/kernel/archive/meson64-6.12/general-input-touchscreen-Add-D-WAV-Multitouch.patch index 53577f59b7..0378125cdc 100644 --- a/patch/kernel/archive/meson64-6.12/general-input-touchscreen-Add-D-WAV-Multitouch.patch +++ b/patch/kernel/archive/meson64-6.12/general-input-touchscreen-Add-D-WAV-Multitouch.patch @@ -28,19 +28,22 @@ index 111111111111..222222222222 100644 + #endif diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index 111111111111..222222222222 100644 +index 80372342c..92472ae7b 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c -@@ -891,6 +891,9 @@ static const struct hid_device_id hid_ignore_list[] = { +@@ -895,10 +895,12 @@ 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_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) }, -+ + { HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) }, { } }; + /* + * hid_mouse_ignore_list - mouse devices which should not be handled by the hid layer diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 111111111111..222222222222 100644 --- a/drivers/input/touchscreen/Kconfig diff --git a/patch/kernel/archive/meson64-6.15/general-input-touchscreen-Add-D-WAV-Multitouch.patch b/patch/kernel/archive/meson64-6.15/general-input-touchscreen-Add-D-WAV-Multitouch.patch index e34b5ea7e9..0378125cdc 100644 --- a/patch/kernel/archive/meson64-6.15/general-input-touchscreen-Add-D-WAV-Multitouch.patch +++ b/patch/kernel/archive/meson64-6.15/general-input-touchscreen-Add-D-WAV-Multitouch.patch @@ -16,7 +16,7 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 111111111111..222222222222 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -1524,4 +1524,10 @@ +@@ -1475,4 +1475,10 @@ #define USB_VENDOR_ID_SIGNOTEC 0x2133 #define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011 0x0018 @@ -28,24 +28,27 @@ index 111111111111..222222222222 100644 + #endif diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index 111111111111..222222222222 100644 +index 80372342c..92472ae7b 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c -@@ -904,6 +904,9 @@ static const struct hid_device_id hid_ignore_list[] = { +@@ -895,10 +895,12 @@ 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_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) }, -+ + { HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) }, { } }; + /* + * hid_mouse_ignore_list - mouse devices which should not be handled by the hid layer diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 111111111111..222222222222 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig -@@ -1403,4 +1403,14 @@ config TOUCHSCREEN_HIMAX_HX83112B +@@ -1388,4 +1388,14 @@ config TOUCHSCREEN_HIMAX_HX83112B To compile this driver as a module, choose M here: the module will be called himax_hx83112b. @@ -64,7 +67,7 @@ diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Make index 111111111111..222222222222 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile -@@ -117,4 +117,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o +@@ -116,4 +116,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o obj-$(CONFIG_TOUCHSCREEN_IQS5XX) += iqs5xx.o obj-$(CONFIG_TOUCHSCREEN_IQS7211) += iqs7211.o obj-$(CONFIG_TOUCHSCREEN_ZINITIX) += zinitix.o