drop interconnect-qcom-sm8250-enable-sync_state.patch from 5.10 and 5.15

diff --git a/queue-5.10/interconnect-qcom-sm8250-enable-sync_state.patch b/queue-5.10/interconnect-qcom-sm8250-enable-sync_state.patch
deleted file mode 100644 (file)
index fd07ca8..0000000
--- a/queue-5.10/interconnect-qcom-sm8250-enable-sync_state.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5bf3bc8148e6391b1dd7d651d6bba4ca821a6182 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 30 Nov 2023 15:04:45 +0100
-Subject: interconnect: qcom: sm8250: Enable sync_state
-
-From: Konrad Dybcio <konrad.dybcio@linaro.org>
-
-[ Upstream commit bfc7db1cb94ad664546d70212699f8cc6c539e8c ]
-
-Add the generic icc sync_state callback to ensure interconnect votes
-are taken into account, instead of being pegged at maximum values.
-
-Fixes: b95b668eaaa2 ("interconnect: qcom: icc-rpmh: Add BCMs to commit list in pre_aggregate")
-Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Link: https://lore.kernel.org/r/20231130-topic-8250icc_syncstate-v1-1-7ce78ba6e04c@linaro.org
-Signed-off-by: Georgi Djakov <djakov@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/interconnect/qcom/sm8250.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/interconnect/qcom/sm8250.c b/drivers/interconnect/qcom/sm8250.c
-index 40820043c8d36..cc558fec74e38 100644
---- a/drivers/interconnect/qcom/sm8250.c
-+++ b/drivers/interconnect/qcom/sm8250.c
-@@ -643,6 +643,7 @@ static struct platform_driver qnoc_driver = {
-       .driver = {
-               .name = "qnoc-sm8250",
-               .of_match_table = qnoc_of_match,
-+              .sync_state = icc_sync_state,
-       },
- };
- module_platform_driver(qnoc_driver);
--- 
-2.43.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 33437af13834ef01f65ca00a59497782d5d6b5be..17b74e3e617c22781a1e6669e06f84d5caafcf79 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -26,7 +26,6 @@ smb-client-fix-null-deref-in-asn1_ber_decoder.patch
 btrfs-do-not-allow-non-subvolume-root-targets-for-sn.patch
 interconnect-treat-xlate-returning-null-node-as-an-e.patch
 iio-imu-inv_mpu6050-fix-an-error-code-problem-in-inv.patch
-interconnect-qcom-sm8250-enable-sync_state.patch
 input-ipaq-micro-keys-add-error-handling-for-devm_km.patch
 scsi-bnx2fc-fix-skb-double-free-in-bnx2fc_rcv.patch
 iio-common-ms_sensors-ms_sensors_i2c-fix-humidity-conversion-time-table.patch

diff --git a/queue-5.15/interconnect-qcom-sm8250-enable-sync_state.patch b/queue-5.15/interconnect-qcom-sm8250-enable-sync_state.patch
deleted file mode 100644 (file)
index 10384e9..0000000
--- a/queue-5.15/interconnect-qcom-sm8250-enable-sync_state.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3bdee60367ff63b43157f949de6139af555cb301 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 30 Nov 2023 15:04:45 +0100
-Subject: interconnect: qcom: sm8250: Enable sync_state
-
-From: Konrad Dybcio <konrad.dybcio@linaro.org>
-
-[ Upstream commit bfc7db1cb94ad664546d70212699f8cc6c539e8c ]
-
-Add the generic icc sync_state callback to ensure interconnect votes
-are taken into account, instead of being pegged at maximum values.
-
-Fixes: b95b668eaaa2 ("interconnect: qcom: icc-rpmh: Add BCMs to commit list in pre_aggregate")
-Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Link: https://lore.kernel.org/r/20231130-topic-8250icc_syncstate-v1-1-7ce78ba6e04c@linaro.org
-Signed-off-by: Georgi Djakov <djakov@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/interconnect/qcom/sm8250.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/interconnect/qcom/sm8250.c b/drivers/interconnect/qcom/sm8250.c
-index aa707582ea016..8dfb5dea562a3 100644
---- a/drivers/interconnect/qcom/sm8250.c
-+++ b/drivers/interconnect/qcom/sm8250.c
-@@ -551,6 +551,7 @@ static struct platform_driver qnoc_driver = {
-       .driver = {
-               .name = "qnoc-sm8250",
-               .of_match_table = qnoc_of_match,
-+              .sync_state = icc_sync_state,
-       },
- };
- module_platform_driver(qnoc_driver);
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 72e39ed96bbec52325b9e9e1331e510fb8f6976d..c9d7ac1515b1394d0d99d904b88c2f5c3afca8e0 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -34,7 +34,6 @@ smb-client-fix-null-deref-in-asn1_ber_decoder.patch
 smb-client-fix-oob-in-smb2_query_reparse_point.patch
 interconnect-treat-xlate-returning-null-node-as-an-e.patch
 iio-imu-inv_mpu6050-fix-an-error-code-problem-in-inv.patch
-interconnect-qcom-sm8250-enable-sync_state.patch
 input-ipaq-micro-keys-add-error-handling-for-devm_km.patch
 scsi-bnx2fc-fix-skb-double-free-in-bnx2fc_rcv.patch
 iio-common-ms_sensors-ms_sensors_i2c-fix-humidity-conversion-time-table.patch