From: Greg Kroah-Hartman Date: Mon, 12 May 2025 09:08:13 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.15.183~65 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27674079a5f9649cd1abf95c390ec347350d600a;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: input-synaptics-enable-intertouch-on-dell-precision-m3800.patch input-synaptics-enable-intertouch-on-dynabook-portege-x30-d.patch input-synaptics-enable-intertouch-on-dynabook-portege-x30l-g.patch staging-iio-adc-ad7816-correct-conditional-logic-for-store-mode.patch --- diff --git a/queue-5.4/input-synaptics-enable-intertouch-on-dell-precision-m3800.patch b/queue-5.4/input-synaptics-enable-intertouch-on-dell-precision-m3800.patch new file mode 100644 index 0000000000..6ee44bfa16 --- /dev/null +++ b/queue-5.4/input-synaptics-enable-intertouch-on-dell-precision-m3800.patch @@ -0,0 +1,32 @@ +From a609cb4cc07aa9ab8f50466622814356c06f2c17 Mon Sep 17 00:00:00 2001 +From: Aditya Garg +Date: Wed, 7 May 2025 12:12:15 -0700 +Subject: Input: synaptics - enable InterTouch on Dell Precision M3800 + +From: Aditya Garg + +commit a609cb4cc07aa9ab8f50466622814356c06f2c17 upstream. + +Enable InterTouch mode on Dell Precision M3800 by adding "DLL060d" to +the list of SMBus-enabled variants. + +Reported-by: Markus Rathgeb +Signed-off-by: Aditya Garg +Link: https://lore.kernel.org/r/PN3PR01MB959789DD6D574E16141E5DC4B888A@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/mouse/synaptics.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -163,6 +163,7 @@ static const char * const topbuttonpad_p + + static const char * const smbus_pnp_ids[] = { + /* all of the topbuttonpad_pnp_ids are valid, we just add some extras */ ++ "DLL060d", /* Dell Precision M3800 */ + "LEN0048", /* X1 Carbon 3 */ + "LEN0046", /* X250 */ + "LEN0049", /* Yoga 11e */ diff --git a/queue-5.4/input-synaptics-enable-intertouch-on-dynabook-portege-x30-d.patch b/queue-5.4/input-synaptics-enable-intertouch-on-dynabook-portege-x30-d.patch new file mode 100644 index 0000000000..50a6cd4cc3 --- /dev/null +++ b/queue-5.4/input-synaptics-enable-intertouch-on-dynabook-portege-x30-d.patch @@ -0,0 +1,38 @@ +From 6d7ea0881000966607772451b789b5fb5766f11d Mon Sep 17 00:00:00 2001 +From: Manuel Fombuena +Date: Wed, 7 May 2025 12:05:26 -0700 +Subject: Input: synaptics - enable InterTouch on Dynabook Portege X30-D + +From: Manuel Fombuena + +commit 6d7ea0881000966607772451b789b5fb5766f11d upstream. + +[ 5.989588] psmouse serio1: synaptics: Your touchpad (PNP: TOS0213 PNP0f03) says it can support a different bus. If i2c-hid and hid-rmi are not used, you might want to try setting psmouse.synaptics_intertouch to 1 and report this to linux-input@vger.kernel.org. +[ 6.039923] psmouse serio1: synaptics: Touchpad model: 1, fw: 9.32, id: 0x1e2a1, caps: 0xf00223/0x840300/0x12e800/0x52d884, board id: 3322, fw id: 2658004 + +The board is labelled TM3322. + +Present on the Toshiba / Dynabook Portege X30-D and possibly others. + +Confirmed working well with psmouse.synaptics_intertouch=1 and local build. + +Signed-off-by: Manuel Fombuena +Signed-off-by: Aditya Garg +Link: https://lore.kernel.org/r/PN3PR01MB9597711E7933A08389FEC31DB888A@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/mouse/synaptics.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -189,6 +189,7 @@ static const char * const smbus_pnp_ids[ + "SYN3221", /* HP 15-ay000 */ + "SYN323d", /* HP Spectre X360 13-w013dx */ + "SYN3257", /* HP Envy 13-ad105ng */ ++ "TOS0213", /* Dynabook Portege X30-D */ + NULL + }; + diff --git a/queue-5.4/input-synaptics-enable-intertouch-on-dynabook-portege-x30l-g.patch b/queue-5.4/input-synaptics-enable-intertouch-on-dynabook-portege-x30l-g.patch new file mode 100644 index 0000000000..1f042fa915 --- /dev/null +++ b/queue-5.4/input-synaptics-enable-intertouch-on-dynabook-portege-x30l-g.patch @@ -0,0 +1,33 @@ +From 47d768b32e644b56901bb4bbbdb1feb01ea86c85 Mon Sep 17 00:00:00 2001 +From: Aditya Garg +Date: Wed, 7 May 2025 12:06:32 -0700 +Subject: Input: synaptics - enable InterTouch on Dynabook Portege X30L-G + +From: Aditya Garg + +commit 47d768b32e644b56901bb4bbbdb1feb01ea86c85 upstream. + +Enable InterTouch mode on Dynabook Portege X30L-G by adding "TOS01f6" to +the list of SMBus-enabled variants. + +Reported-by: Xuntao Chi +Tested-by: Xuntao Chi +Signed-off-by: Aditya Garg +Link: https://lore.kernel.org/r/PN3PR01MB959786E4AC797160CDA93012B888A@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/mouse/synaptics.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -189,6 +189,7 @@ static const char * const smbus_pnp_ids[ + "SYN3221", /* HP 15-ay000 */ + "SYN323d", /* HP Spectre X360 13-w013dx */ + "SYN3257", /* HP Envy 13-ad105ng */ ++ "TOS01f6", /* Dynabook Portege X30L-G */ + "TOS0213", /* Dynabook Portege X30-D */ + NULL + }; diff --git a/queue-5.4/series b/queue-5.4/series index 482515d555..53825863e2 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -34,3 +34,7 @@ scsi-target-fix-write_same-no-data-buffer-crash.patch sch_htb-make-htb_deactivate-idempotent.patch netfilter-ipset-fix-region-locking-in-hash-types.patch net-dsa-b53-fix-learning-on-vlan-unaware-bridges.patch +input-synaptics-enable-intertouch-on-dynabook-portege-x30-d.patch +input-synaptics-enable-intertouch-on-dynabook-portege-x30l-g.patch +input-synaptics-enable-intertouch-on-dell-precision-m3800.patch +staging-iio-adc-ad7816-correct-conditional-logic-for-store-mode.patch diff --git a/queue-5.4/staging-iio-adc-ad7816-correct-conditional-logic-for-store-mode.patch b/queue-5.4/staging-iio-adc-ad7816-correct-conditional-logic-for-store-mode.patch new file mode 100644 index 0000000000..0352fc50d5 --- /dev/null +++ b/queue-5.4/staging-iio-adc-ad7816-correct-conditional-logic-for-store-mode.patch @@ -0,0 +1,46 @@ +From 2e922956277187655ed9bedf7b5c28906e51708f Mon Sep 17 00:00:00 2001 +From: Gabriel Shahrouzi +Date: Mon, 14 Apr 2025 11:40:49 -0400 +Subject: staging: iio: adc: ad7816: Correct conditional logic for store mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Gabriel Shahrouzi + +commit 2e922956277187655ed9bedf7b5c28906e51708f upstream. + +The mode setting logic in ad7816_store_mode was reversed due to +incorrect handling of the strcmp return value. strcmp returns 0 on +match, so the `if (strcmp(buf, "full"))` block executed when the +input was not "full". + +This resulted in "full" setting the mode to AD7816_PD (power-down) and +other inputs setting it to AD7816_FULL. + +Fix this by checking it against 0 to correctly check for "full" and +"power-down", mapping them to AD7816_FULL and AD7816_PD respectively. + +Fixes: 7924425db04a ("staging: iio: adc: new driver for AD7816 devices") +Cc: stable@vger.kernel.org +Signed-off-by: Gabriel Shahrouzi +Acked-by: Nuno Sá +Link: https://lore.kernel.org/stable/20250414152920.467505-1-gshahrouzi%40gmail.com +Link: https://patch.msgid.link/20250414154050.469482-1-gshahrouzi@gmail.com +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman +--- + drivers/staging/iio/adc/ad7816.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/staging/iio/adc/ad7816.c ++++ b/drivers/staging/iio/adc/ad7816.c +@@ -136,7 +136,7 @@ static ssize_t ad7816_store_mode(struct + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct ad7816_chip_info *chip = iio_priv(indio_dev); + +- if (strcmp(buf, "full")) { ++ if (strcmp(buf, "full") == 0) { + gpiod_set_value(chip->rdwr_pin, 1); + chip->mode = AD7816_FULL; + } else {