]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Fixes for 6.11
authorSasha Levin <sashal@kernel.org>
Sun, 13 Oct 2024 20:03:29 +0000 (16:03 -0400)
committerSasha Levin <sashal@kernel.org>
Sun, 13 Oct 2024 20:03:29 +0000 (16:03 -0400)
Signed-off-by: Sasha Levin <sashal@kernel.org>
queue-6.11/hid-multitouch-add-support-for-lenovo-y9000p-touchpa.patch [new file with mode: 0644]
queue-6.11/hwmon-adm9240-add-missing-dependency-on-regmap_i2c.patch [new file with mode: 0644]
queue-6.11/hwmon-adt7470-add-missing-dependency-on-regmap_i2c.patch [new file with mode: 0644]
queue-6.11/hwmon-intel-m10-bmc-hwmon-relabel-columbiaville-to-c.patch [new file with mode: 0644]
queue-6.11/hwmon-ltc2991-add-missing-dependency-on-regmap_i2c.patch [new file with mode: 0644]
queue-6.11/hwmon-mc34vr500-add-missing-dependency-on-regmap_i2c.patch [new file with mode: 0644]
queue-6.11/hwmon-tmp513-add-missing-dependency-on-regmap_i2c.patch [new file with mode: 0644]
queue-6.11/series

diff --git a/queue-6.11/hid-multitouch-add-support-for-lenovo-y9000p-touchpa.patch b/queue-6.11/hid-multitouch-add-support-for-lenovo-y9000p-touchpa.patch
new file mode 100644 (file)
index 0000000..02a37fd
--- /dev/null
@@ -0,0 +1,62 @@
+From d71f4f8052507f59a340ce19f2232d225bfa8ac6 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 27 Aug 2024 10:56:05 +0800
+Subject: HID: multitouch: Add support for lenovo Y9000P Touchpad
+
+From: He Lugang <helugang@uniontech.com>
+
+[ Upstream commit 251efae73bd46b097deec4f9986d926813aed744 ]
+
+The 2024 Lenovo Y9000P which use GT7868Q chip also needs a fixup.
+The information of the chip is as follows:
+I2C HID v1.00 Mouse [GXTP5100:00 27C6:01E0]
+
+Signed-off-by: He Lugang <helugang@uniontech.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/hid/hid-ids.h        | 1 +
+ drivers/hid/hid-multitouch.c | 8 ++++++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index 06104a4e0fdc1..86820a3d9766d 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -505,6 +505,7 @@
+ #define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100
+ #define I2C_VENDOR_ID_GOODIX          0x27c6
++#define I2C_DEVICE_ID_GOODIX_01E0     0x01e0
+ #define I2C_DEVICE_ID_GOODIX_01E8     0x01e8
+ #define I2C_DEVICE_ID_GOODIX_01E9     0x01e9
+ #define I2C_DEVICE_ID_GOODIX_01F0     0x01f0
+diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
+index c4a6908bbe540..847462650549e 100644
+--- a/drivers/hid/hid-multitouch.c
++++ b/drivers/hid/hid-multitouch.c
+@@ -1446,7 +1446,8 @@ static __u8 *mt_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+ {
+       if (hdev->vendor == I2C_VENDOR_ID_GOODIX &&
+           (hdev->product == I2C_DEVICE_ID_GOODIX_01E8 ||
+-           hdev->product == I2C_DEVICE_ID_GOODIX_01E9)) {
++           hdev->product == I2C_DEVICE_ID_GOODIX_01E9 ||
++               hdev->product == I2C_DEVICE_ID_GOODIX_01E0)) {
+               if (rdesc[607] == 0x15) {
+                       rdesc[607] = 0x25;
+                       dev_info(
+@@ -2065,7 +2066,10 @@ static const struct hid_device_id mt_devices[] = {
+                    I2C_DEVICE_ID_GOODIX_01E8) },
+       { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,
+         HID_DEVICE(BUS_I2C, HID_GROUP_ANY, I2C_VENDOR_ID_GOODIX,
+-                   I2C_DEVICE_ID_GOODIX_01E8) },
++                   I2C_DEVICE_ID_GOODIX_01E9) },
++      { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,
++        HID_DEVICE(BUS_I2C, HID_GROUP_ANY, I2C_VENDOR_ID_GOODIX,
++                   I2C_DEVICE_ID_GOODIX_01E0) },
+       /* GoodTouch panels */
+       { .driver_data = MT_CLS_NSMU,
+-- 
+2.43.0
+
diff --git a/queue-6.11/hwmon-adm9240-add-missing-dependency-on-regmap_i2c.patch b/queue-6.11/hwmon-adm9240-add-missing-dependency-on-regmap_i2c.patch
new file mode 100644 (file)
index 0000000..9f4a140
--- /dev/null
@@ -0,0 +1,36 @@
+From 6969612befbfb1463c9de5d738c8fe0ddaed47fc Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 2 Oct 2024 03:08:08 +0200
+Subject: hwmon: (adm9240) Add missing dependency on REGMAP_I2C
+
+From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+
+[ Upstream commit 14849a2ec175bb8a2280ce20efe002bb19f1e274 ]
+
+This driver requires REGMAP_I2C to be selected in order to get access to
+regmap_config and devm_regmap_init_i2c. Add the missing dependency.
+
+Fixes: df885d912f67 ("hwmon: (adm9240) Convert to regmap")
+Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+Message-ID: <20241002-hwmon-select-regmap-v1-1-548d03268934@gmail.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/hwmon/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index d9799d1b7d3c6..75d7797a5b943 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -162,6 +162,7 @@ config SENSORS_ADM9240
+       tristate "Analog Devices ADM9240 and compatibles"
+       depends on I2C
+       select HWMON_VID
++      select REGMAP_I2C
+       help
+         If you say yes here you get support for Analog Devices ADM9240,
+         Dallas DS1780, National Semiconductor LM81 sensor chips.
+-- 
+2.43.0
+
diff --git a/queue-6.11/hwmon-adt7470-add-missing-dependency-on-regmap_i2c.patch b/queue-6.11/hwmon-adt7470-add-missing-dependency-on-regmap_i2c.patch
new file mode 100644 (file)
index 0000000..14cf25d
--- /dev/null
@@ -0,0 +1,36 @@
+From 2de086669760196a0f2cf30fe525b06b674da446 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 2 Oct 2024 03:08:09 +0200
+Subject: hwmon: (adt7470) Add missing dependency on REGMAP_I2C
+
+From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+
+[ Upstream commit b6abcc19566509ab4812bd5ae5df46515d0c1d70 ]
+
+This driver requires REGMAP_I2C to be selected in order to get access to
+regmap_config and devm_regmap_init_i2c. Add the missing dependency.
+
+Fixes: ef67959c4253 ("hwmon: (adt7470) Convert to use regmap")
+Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+Message-ID: <20241002-hwmon-select-regmap-v1-2-548d03268934@gmail.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/hwmon/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index 75d7797a5b943..cfb22c2b9e61c 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -224,6 +224,7 @@ config SENSORS_ADT7462
+ config SENSORS_ADT7470
+       tristate "Analog Devices ADT7470"
+       depends on I2C
++      select REGMAP_I2C
+       help
+         If you say yes here you get support for the Analog Devices
+         ADT7470 temperature monitoring chips.
+-- 
+2.43.0
+
diff --git a/queue-6.11/hwmon-intel-m10-bmc-hwmon-relabel-columbiaville-to-c.patch b/queue-6.11/hwmon-intel-m10-bmc-hwmon-relabel-columbiaville-to-c.patch
new file mode 100644 (file)
index 0000000..3cc8051
--- /dev/null
@@ -0,0 +1,39 @@
+From ea31f669765c402f51257729b46863a724e440ef Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 19 Sep 2024 13:34:17 -0400
+Subject: hwmon: intel-m10-bmc-hwmon: relabel Columbiaville to CVL Die
+ Temperature
+
+From: Peter Colberg <peter.colberg@intel.com>
+
+[ Upstream commit a017616fafc6b2a6b3043bf46f6381ef2611c188 ]
+
+Consistently use CVL instead of Columbiaville, since CVL is already
+being used in all other sensor labels for the Intel N6000 card.
+
+Fixes: e1983220ae14 ("hwmon: intel-m10-bmc-hwmon: Add N6000 sensors")
+Signed-off-by: Peter Colberg <peter.colberg@intel.com>
+Reviewed-by: Michael Adler <michael.adler@intel.com>
+Message-ID: <20240919173417.867640-1-peter.colberg@intel.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/hwmon/intel-m10-bmc-hwmon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/hwmon/intel-m10-bmc-hwmon.c b/drivers/hwmon/intel-m10-bmc-hwmon.c
+index ca2dff1589251..96397ae6ff18f 100644
+--- a/drivers/hwmon/intel-m10-bmc-hwmon.c
++++ b/drivers/hwmon/intel-m10-bmc-hwmon.c
+@@ -358,7 +358,7 @@ static const struct m10bmc_sdata n6000bmc_temp_tbl[] = {
+       { 0x4f0, 0x4f4, 0x4f8, 0x52c, 0x0, 500, "Board Top Near FPGA Temperature" },
+       { 0x4fc, 0x500, 0x504, 0x52c, 0x0, 500, "Board Bottom Near CVL Temperature" },
+       { 0x508, 0x50c, 0x510, 0x52c, 0x0, 500, "Board Top East Near VRs Temperature" },
+-      { 0x514, 0x518, 0x51c, 0x52c, 0x0, 500, "Columbiaville Die Temperature" },
++      { 0x514, 0x518, 0x51c, 0x52c, 0x0, 500, "CVL Die Temperature" },
+       { 0x520, 0x524, 0x528, 0x52c, 0x0, 500, "Board Rear Side Temperature" },
+       { 0x530, 0x534, 0x538, 0x52c, 0x0, 500, "Board Front Side Temperature" },
+       { 0x53c, 0x540, 0x544, 0x0, 0x0, 500, "QSFP1 Case Temperature" },
+-- 
+2.43.0
+
diff --git a/queue-6.11/hwmon-ltc2991-add-missing-dependency-on-regmap_i2c.patch b/queue-6.11/hwmon-ltc2991-add-missing-dependency-on-regmap_i2c.patch
new file mode 100644 (file)
index 0000000..9d96908
--- /dev/null
@@ -0,0 +1,36 @@
+From f0f8bbd5a6be5b95fc07878a9de9a8a92ff5c219 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 2 Oct 2024 03:08:10 +0200
+Subject: hwmon: (ltc2991) Add missing dependency on REGMAP_I2C
+
+From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+
+[ Upstream commit 7d4cc7fdc6c889608fff051530e6f0c617f71995 ]
+
+This driver requires REGMAP_I2C to be selected in order to get access to
+regmap_config and devm_regmap_init_i2c. Add the missing dependency.
+
+Fixes: 2b9ea4262ae9 ("hwmon: Add driver for ltc2991")
+Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+Message-ID: <20241002-hwmon-select-regmap-v1-3-548d03268934@gmail.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/hwmon/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index cfb22c2b9e61c..778e584c3a75c 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -1001,6 +1001,7 @@ config SENSORS_LTC2990
+ config SENSORS_LTC2991
+       tristate "Analog Devices LTC2991"
+       depends on I2C
++      select REGMAP_I2C
+       help
+         If you say yes here you get support for Analog Devices LTC2991
+         Octal I2C Voltage, Current, and Temperature Monitor. The LTC2991
+-- 
+2.43.0
+
diff --git a/queue-6.11/hwmon-mc34vr500-add-missing-dependency-on-regmap_i2c.patch b/queue-6.11/hwmon-mc34vr500-add-missing-dependency-on-regmap_i2c.patch
new file mode 100644 (file)
index 0000000..4ca5589
--- /dev/null
@@ -0,0 +1,36 @@
+From 67e50f15d064437a9c7aa56172fbdeef7fea7b7f Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 2 Oct 2024 02:31:25 +0200
+Subject: hwmon: (mc34vr500) Add missing dependency on REGMAP_I2C
+
+From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+
+[ Upstream commit 56c77c0f4a7c9043e7d1d94e0aace264361e6717 ]
+
+This driver requires REGMAP_I2C to be selected in order to get access to
+regmap_config and devm_regmap_init_i2c. Add the missing dependency.
+
+Fixes: 07830d9ab34c ("hwmon: add initial NXP MC34VR500 PMIC monitoring support")
+Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+Message-ID: <20241002-mc34vr500-select-regmap_i2c-v1-1-a01875d0a2e5@gmail.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/hwmon/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index 543c40630d67e..d9799d1b7d3c6 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -1275,6 +1275,7 @@ config SENSORS_MAX31790
+ config SENSORS_MC34VR500
+       tristate "NXP MC34VR500 hardware monitoring driver"
+       depends on I2C
++      select REGMAP_I2C
+       help
+         If you say yes here you get support for the temperature and input
+         voltage sensors of the NXP MC34VR500.
+-- 
+2.43.0
+
diff --git a/queue-6.11/hwmon-tmp513-add-missing-dependency-on-regmap_i2c.patch b/queue-6.11/hwmon-tmp513-add-missing-dependency-on-regmap_i2c.patch
new file mode 100644 (file)
index 0000000..107583a
--- /dev/null
@@ -0,0 +1,45 @@
+From 69941fa48cd838b597e38d5c3644ecf75a32a9b9 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 1 Oct 2024 11:37:15 -0700
+Subject: hwmon: (tmp513) Add missing dependency on REGMAP_I2C
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+[ Upstream commit 193bc02c664999581a1f38c152f379fce91afc0c ]
+
+0-day reports:
+
+drivers/hwmon/tmp513.c:162:21: error:
+       variable 'tmp51x_regmap_config' has initializer but incomplete type
+162 | static const struct regmap_config tmp51x_regmap_config = {
+    |                     ^
+
+struct regmap_config is only available if REGMAP is enabled.
+Add the missing Kconfig dependency to fix the problem.
+
+Reported-by: kernel test robot <lkp@intel.com>
+Closes: https://lore.kernel.org/oe-kbuild-all/202410020246.2cTDDx0X-lkp@intel.com/
+Fixes: 59dfa75e5d82 ("hwmon: Add driver for Texas Instruments TMP512/513 sensor chips.")
+Cc: Eric Tremblay <etremblay@distech-controls.com>
+Reviewed-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/hwmon/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index b60fe2e58ad6c..543c40630d67e 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -2288,6 +2288,7 @@ config SENSORS_TMP464
+ config SENSORS_TMP513
+       tristate "Texas Instruments TMP513 and compatibles"
+       depends on I2C
++      select REGMAP_I2C
+       help
+         If you say yes here you get support for Texas Instruments TMP512,
+         and TMP513 temperature and power supply sensor chips.
+-- 
+2.43.0
+
index de779b83384425ecb143d7e3e3c3fb003fe9c209..3b313db1c0bee9782eeaab0d1a57b8e730f263f0 100644 (file)
@@ -150,3 +150,10 @@ net-smc-fix-lacks-of-icsk_syn_mss-with-ipproto_smc.patch
 slip-make-slhc_remember-more-robust-against-maliciou.patch
 rcu-nocb-fix-rcuog-wake-up-from-offline-softirq.patch
 x86-amd_nb-add-new-pci-ids-for-amd-family-1ah-model-.patch
+hid-multitouch-add-support-for-lenovo-y9000p-touchpa.patch
+hwmon-intel-m10-bmc-hwmon-relabel-columbiaville-to-c.patch
+hwmon-tmp513-add-missing-dependency-on-regmap_i2c.patch
+hwmon-mc34vr500-add-missing-dependency-on-regmap_i2c.patch
+hwmon-adm9240-add-missing-dependency-on-regmap_i2c.patch
+hwmon-adt7470-add-missing-dependency-on-regmap_i2c.patch
+hwmon-ltc2991-add-missing-dependency-on-regmap_i2c.patch