drop a hid patch for 6.0

And fix up a fixes: tag for another one

diff --git a/queue-6.0/hid-amd_sfh-change-dev_err-to-dev_dbg-for-additional.patch b/queue-6.0/hid-amd_sfh-change-dev_err-to-dev_dbg-for-additional.patch
deleted file mode 100644 (file)
index cff3bb2..0000000
--- a/queue-6.0/hid-amd_sfh-change-dev_err-to-dev_dbg-for-additional.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 21ee5161576d2235be7c72cb1b1d65f38a4e7f1a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 27 Sep 2022 15:57:25 +0530
-Subject: HID: amd_sfh: Change dev_err to dev_dbg for additional debug info
-
-From: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
-
-[ Upstream commit beb18bb22cd4fb88648bb2925d56f36131c1ac21 ]
-
-Users should only be notified at most one time on systems doesn't have
-any sensors connected or non-supported systems.
-
-Check the return code and don't display error messages in those
-conditions.
-
-Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-Stable-dep-of: 68266bdcceec ("HID: amd_sfh: Handle condition of "no sensors" for SFH1.1")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c b/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c
-index 70436f9fad2f..d840efb4a2e2 100644
---- a/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c
-+++ b/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c
-@@ -286,13 +286,13 @@ int amd_sfh1_1_init(struct amd_mp2_dev *mp2)
- 
-       phy_base <<= 21;
-       if (!devm_request_mem_region(dev, phy_base, 128 * 1024, "amd_sfh")) {
--              dev_err(dev, "can't reserve mmio registers\n");
-+              dev_dbg(dev, "can't reserve mmio registers\n");
-               return -ENOMEM;
-       }
- 
-       mp2->vsbase = devm_ioremap(dev, phy_base, 128 * 1024);
-       if (!mp2->vsbase) {
--              dev_err(dev, "failed to remap vsbase\n");
-+              dev_dbg(dev, "failed to remap vsbase\n");
-               return -ENOMEM;
-       }
- 
-@@ -301,7 +301,7 @@ int amd_sfh1_1_init(struct amd_mp2_dev *mp2)
- 
-       memcpy_fromio(&binfo, mp2->vsbase, sizeof(struct sfh_base_info));
-       if (binfo.sbase.fw_info.fw_ver == 0 || binfo.sbase.s_list.sl.sensors == 0) {
--              dev_err(dev, "failed to get sensors\n");
-+              dev_dbg(dev, "failed to get sensors\n");
-               return -EOPNOTSUPP;
-       }
-       dev_dbg(dev, "firmware version 0x%x\n", binfo.sbase.fw_info.fw_ver);
--- 
-2.35.1
-

diff --git a/queue-6.0/hid-amd_sfh-handle-condition-of-no-sensors-for-sfh1..patch b/queue-6.0/hid-amd_sfh-handle-condition-of-no-sensors-for-sfh1..patch
index ee1b5ad6e26785d1dc085dfcc3175dfcc8424bad..2768c8937f6ce2fb1d97696987fbd04d40ac28b5 100644 (file)
--- a/queue-6.0/hid-amd_sfh-handle-condition-of-no-sensors-for-sfh1..patch
+++ b/queue-6.0/hid-amd_sfh-handle-condition-of-no-sensors-for-sfh1..patch
@@ -21,14 +21,12 @@ Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 Signed-off-by: Jiri Kosina <jkosina@suse.cz>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 2 ++
+ drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c b/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c
-index d840efb4a2e2..4da2f9f62aba 100644
 --- a/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c
 +++ b/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c
-@@ -110,6 +110,8 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata)
+@@ -110,6 +110,8 @@ static int amd_sfh1_1_hid_client_init(st
        amd_sfh1_1_set_desc_ops(mp2_ops);
  
        cl_data->num_hid_devices = amd_sfh_get_sensor_num(privdata, &cl_data->sensor_idx[0]);
@@ -37,6 +35,3 @@ index d840efb4a2e2..4da2f9f62aba 100644
  
        INIT_DELAYED_WORK(&cl_data->work, amd_sfh_work);
        INIT_DELAYED_WORK(&cl_data->work_buffer, amd_sfh_work_buffer);
--- 
-2.35.1
-

diff --git a/queue-6.0/hid-uclogic-add-missing-suffix-for-digitalizers.patch b/queue-6.0/hid-uclogic-add-missing-suffix-for-digitalizers.patch
index aa83908347c1e0e0b7229480f7a846c751a6510f..6d88cc00c0ddce0df46bd43479a3c30812451f87 100644 (file)
--- a/queue-6.0/hid-uclogic-add-missing-suffix-for-digitalizers.patch
+++ b/queue-6.0/hid-uclogic-add-missing-suffix-for-digitalizers.patch
@@ -19,17 +19,16 @@ and add the required suffix.
 
 Signed-off-by: José Expósito <jose.exposito89@gmail.com>
 Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-Stable-dep-of: 609174edeb75 ("HID: uclogic: Fix warning in uclogic_rdesc_template_apply")
+Fixes: f7d8e387d9ae ("HID: uclogic: Switch to Digitizer usage for styluses")
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/hid/hid-uclogic-core.c | 1 +
+ drivers/hid/hid-uclogic-core.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/hid/hid-uclogic-core.c b/drivers/hid/hid-uclogic-core.c
-index 47a17375c7fc..ff46604ef1d8 100644
 --- a/drivers/hid/hid-uclogic-core.c
 +++ b/drivers/hid/hid-uclogic-core.c
-@@ -153,6 +153,7 @@ static int uclogic_input_configured(struct hid_device *hdev,
+@@ -153,6 +153,7 @@ static int uclogic_input_configured(stru
                        suffix = "Pad";
                        break;
                case HID_DG_PEN:
@@ -37,6 +36,3 @@ index 47a17375c7fc..ff46604ef1d8 100644
                        suffix = "Pen";
                        break;
                case HID_CP_CONSUMER_CONTROL:
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index 690f5763249ed199a82804543b4789eb6ae81913..ccd00fde35e280451181b7f77f0d4479fb514d98 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -606,7 +606,6 @@ clk-mediatek-migrate-remaining-clk_unregister_-to-cl.patch
 phy-qcom-qmp-pcie-fix-resource-mapping-for-sdm845-qh.patch
 io_uring-rw-defer-fsnotify-calls-to-task-context.patch
 dmaengine-ioat-stop-mod_timer-from-resurrecting-dele.patch
-hid-amd_sfh-change-dev_err-to-dev_dbg-for-additional.patch
 hid-amd_sfh-handle-condition-of-no-sensors-for-sfh1..patch
 usb-mtu3-fix-failed-runtime-suspend-in-host-only-mod.patch
 spmi-pmic-arb-correct-duplicate-apid-to-ppid-mapping.patch