From dab15b520c91157a320836fad9f7a6f8073e0f52 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 17 Dec 2025 16:37:52 +0100 Subject: [PATCH] drop clk patch --- ...m-rpmh-define-rpmh_ipa_clk-on-qcs615.patch | 39 ------------------- queue-6.17/series | 1 - ...m-rpmh-define-rpmh_ipa_clk-on-qcs615.patch | 39 ------------------- queue-6.18/series | 1 - 4 files changed, 80 deletions(-) delete mode 100644 queue-6.17/clk-qcom-rpmh-define-rpmh_ipa_clk-on-qcs615.patch delete mode 100644 queue-6.18/clk-qcom-rpmh-define-rpmh_ipa_clk-on-qcs615.patch diff --git a/queue-6.17/clk-qcom-rpmh-define-rpmh_ipa_clk-on-qcs615.patch b/queue-6.17/clk-qcom-rpmh-define-rpmh_ipa_clk-on-qcs615.patch deleted file mode 100644 index 4398f7d501..0000000000 --- a/queue-6.17/clk-qcom-rpmh-define-rpmh_ipa_clk-on-qcs615.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 40b1ffad0e854a9b454d761c26c059864f7273c3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 27 Jun 2025 21:37:58 +0200 -Subject: clk: qcom: rpmh: Define RPMH_IPA_CLK on QCS615 - -From: Konrad Dybcio - -[ Upstream commit 17e4db05930e455770b15b77708a07681ed24efc ] - -This was previously (mis)represented in the interconnect driver, move -the resource under the clk-rpmh driver control, just like we did for -all platforms in the past, see e.g. Commit aa055bf158cd ("clk: qcom: -rpmh: define IPA clocks where required") - -Fixes: 42a1905a10d6 ("clk: qcom: rpmhcc: Add support for QCS615 Clocks") -Signed-off-by: Konrad Dybcio -Reviewed-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20250627-topic-qcs615_icc_ipa-v1-4-dc47596cde69@oss.qualcomm.com -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - drivers/clk/qcom/clk-rpmh.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c -index 1496fb3de4be8..8aad1676d8da8 100644 ---- a/drivers/clk/qcom/clk-rpmh.c -+++ b/drivers/clk/qcom/clk-rpmh.c -@@ -850,6 +850,7 @@ static struct clk_hw *qcs615_rpmh_clocks[] = { - [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw, - [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a.hw, - [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_ao.hw, -+ [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, - }; - - static const struct clk_rpmh_desc clk_rpmh_qcs615 = { --- -2.51.0 - diff --git a/queue-6.17/series b/queue-6.17/series index c1d7b6b06b..d2fe8350a4 100644 --- a/queue-6.17/series +++ b/queue-6.17/series @@ -70,7 +70,6 @@ tty-introduce-tty_port_tty-guard.patch tty-serial-imx-only-configure-the-wake-register-when.patch clk-qcom-camcc-sm8550-specify-titan-gdsc-power-domai.patch clk-qcom-camcc-sm6350-specify-titan-gdsc-power-domai.patch -clk-qcom-rpmh-define-rpmh_ipa_clk-on-qcs615.patch clk-qcom-gcc-sm8750-add-a-new-frequency-for-sdcc2-cl.patch clk-qcom-gcc-ipq5424-correct-the-icc_first_node_id.patch clk-qcom-camcc-sm6350-fix-pll-config-of-pll2.patch diff --git a/queue-6.18/clk-qcom-rpmh-define-rpmh_ipa_clk-on-qcs615.patch b/queue-6.18/clk-qcom-rpmh-define-rpmh_ipa_clk-on-qcs615.patch deleted file mode 100644 index 442dd125e1..0000000000 --- a/queue-6.18/clk-qcom-rpmh-define-rpmh_ipa_clk-on-qcs615.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1720b95da332de6c78ed417a7e5549009778dfab Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 27 Jun 2025 21:37:58 +0200 -Subject: clk: qcom: rpmh: Define RPMH_IPA_CLK on QCS615 - -From: Konrad Dybcio - -[ Upstream commit 17e4db05930e455770b15b77708a07681ed24efc ] - -This was previously (mis)represented in the interconnect driver, move -the resource under the clk-rpmh driver control, just like we did for -all platforms in the past, see e.g. Commit aa055bf158cd ("clk: qcom: -rpmh: define IPA clocks where required") - -Fixes: 42a1905a10d6 ("clk: qcom: rpmhcc: Add support for QCS615 Clocks") -Signed-off-by: Konrad Dybcio -Reviewed-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20250627-topic-qcs615_icc_ipa-v1-4-dc47596cde69@oss.qualcomm.com -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - drivers/clk/qcom/clk-rpmh.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c -index 63c38cb47bc45..1a98b3a0c528c 100644 ---- a/drivers/clk/qcom/clk-rpmh.c -+++ b/drivers/clk/qcom/clk-rpmh.c -@@ -855,6 +855,7 @@ static struct clk_hw *qcs615_rpmh_clocks[] = { - [RPMH_RF_CLK1_A] = &clk_rpmh_rf_clk1_a_ao.hw, - [RPMH_RF_CLK2] = &clk_rpmh_rf_clk2_a.hw, - [RPMH_RF_CLK2_A] = &clk_rpmh_rf_clk2_a_ao.hw, -+ [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw, - }; - - static const struct clk_rpmh_desc clk_rpmh_qcs615 = { --- -2.51.0 - diff --git a/queue-6.18/series b/queue-6.18/series index afd5e82cfe..b4d45bc9ff 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -78,7 +78,6 @@ uio-uio_fsl_elbc_gpcm-add-null-pointer-check-to-uio_.patch tty-serial-imx-only-configure-the-wake-register-when.patch clk-qcom-camcc-sm8550-specify-titan-gdsc-power-domai.patch clk-qcom-camcc-sm6350-specify-titan-gdsc-power-domai.patch -clk-qcom-rpmh-define-rpmh_ipa_clk-on-qcs615.patch clk-qcom-gcc-sm8750-add-a-new-frequency-for-sdcc2-cl.patch clk-qcom-gcc-glymur-update-the-halt-check-flags-for-.patch clk-qcom-gcc-ipq5424-correct-the-icc_first_node_id.patch -- 2.47.3