6.1-stable patches

added patches:
	hwmon-nzxt-smart2-add-another-usb-id.patch
	hwmon-nzxt-smart2-add-device-id.patch

diff --git a/queue-6.1/hwmon-nzxt-smart2-add-another-usb-id.patch b/queue-6.1/hwmon-nzxt-smart2-add-another-usb-id.patch
new file mode 100644 (file)
index 0000000..bb73b58
--- /dev/null
+++ b/queue-6.1/hwmon-nzxt-smart2-add-another-usb-id.patch
@@ -0,0 +1,41 @@
+From 4a148e9b1ee04e608263fa9536a96214d5561220 Mon Sep 17 00:00:00 2001
+From: Aleksandr Mezin <mezin.alexander@gmail.com>
+Date: Sun, 19 Feb 2023 12:59:19 +0200
+Subject: hwmon: (nzxt-smart2) add another USB ID
+
+From: Aleksandr Mezin <mezin.alexander@gmail.com>
+
+commit 4a148e9b1ee04e608263fa9536a96214d5561220 upstream.
+
+This seems to be a new revision of the device. RGB controls have changed,
+but this driver doesn't touch them anyway.
+
+Fan speed control reported to be working with existing userspace (hidraw)
+software, so I assume it's compatible. Fan channel count is the same.
+
+Recently added (0x1e71, 0x2019) seems to be the same device.
+
+Discovered in liquidctl project:
+
+https://github.com/liquidctl/liquidctl/issues/541
+
+Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
+Link: https://lore.kernel.org/r/20230219105924.333007-1-mezin.alexander@gmail.com
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/hwmon/nzxt-smart2.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/hwmon/nzxt-smart2.c
++++ b/drivers/hwmon/nzxt-smart2.c
+@@ -791,7 +791,8 @@ static const struct hid_device_id nzxt_s
+       { HID_USB_DEVICE(0x1e71, 0x2009) }, /* NZXT RGB & Fan Controller */
+       { HID_USB_DEVICE(0x1e71, 0x200e) }, /* NZXT RGB & Fan Controller */
+       { HID_USB_DEVICE(0x1e71, 0x2010) }, /* NZXT RGB & Fan Controller */
+-      { HID_USB_DEVICE(0x1e71, 0x2019) }, /* NZXT RGB & Fan Controller */
++      { HID_USB_DEVICE(0x1e71, 0x2011) }, /* NZXT RGB & Fan Controller (6 RGB) */
++      { HID_USB_DEVICE(0x1e71, 0x2019) }, /* NZXT RGB & Fan Controller (6 RGB) */
+       {},
+ };
+ 

diff --git a/queue-6.1/hwmon-nzxt-smart2-add-device-id.patch b/queue-6.1/hwmon-nzxt-smart2-add-device-id.patch
new file mode 100644 (file)
index 0000000..b48d266
--- /dev/null
+++ b/queue-6.1/hwmon-nzxt-smart2-add-device-id.patch
@@ -0,0 +1,30 @@
+From e247510e1baad04e9b7b8ed7190dbb00989387b9 Mon Sep 17 00:00:00 2001
+From: Herman Fries <baracoder@googlemail.com>
+Date: Wed, 14 Dec 2022 20:46:28 +0100
+Subject: hwmon: (nzxt-smart2) Add device id
+
+From: Herman Fries <baracoder@googlemail.com>
+
+commit e247510e1baad04e9b7b8ed7190dbb00989387b9 upstream.
+
+Adding support for new device id
+1e71:2019 NZXT NZXT RGB & Fan Controller
+
+Signed-off-by: Herman Fries <baracoder@googlemail.com>
+Link: https://lore.kernel.org/r/20221214194627.135692-1-baracoder@googlemail.com
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/hwmon/nzxt-smart2.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/hwmon/nzxt-smart2.c
++++ b/drivers/hwmon/nzxt-smart2.c
+@@ -791,6 +791,7 @@ static const struct hid_device_id nzxt_s
+       { HID_USB_DEVICE(0x1e71, 0x2009) }, /* NZXT RGB & Fan Controller */
+       { HID_USB_DEVICE(0x1e71, 0x200e) }, /* NZXT RGB & Fan Controller */
+       { HID_USB_DEVICE(0x1e71, 0x2010) }, /* NZXT RGB & Fan Controller */
++      { HID_USB_DEVICE(0x1e71, 0x2019) }, /* NZXT RGB & Fan Controller */
+       {},
+ };
+ 

diff --git a/queue-6.1/series b/queue-6.1/series
index 292df754dccdde8d7100cfc59320eaf88b4600fe..8af244f05c07cd5450f3470e73b124d21786186b 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -51,3 +51,5 @@ rbd-decouple-header-read-in-from-updating-rbd_dev-he.patch
 rbd-decouple-parent-info-read-in-from-updating-rbd_d.patch
 rbd-take-header_rwsem-in-rbd_dev_refresh-only-when-u.patch
 block-fix-use-after-free-of-q-q_usage_counter.patch
+hwmon-nzxt-smart2-add-device-id.patch
+hwmon-nzxt-smart2-add-another-usb-id.patch