From: Sasha Levin Date: Sun, 24 Mar 2024 17:48:32 +0000 (-0400) Subject: Drop arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch X-Git-Tag: v6.8.2~55 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6c982dd32ed6b5e6a42471d51089d9d649d4615;p=thirdparty%2Fkernel%2Fstable-queue.git Drop arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.6/arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch b/queue-6.6/arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch deleted file mode 100644 index 1a0d3bbf1ac..00000000000 --- a/queue-6.6/arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5f333359bd8d8a3585f5344d3d666f9cc4425b8b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jan 2024 12:37:39 +0530 -Subject: arm64: dts: qcom: sm8550: Fix UFS PHY clocks - -From: Manivannan Sadhasivam - -[ Upstream commit 746ae23ad02004fe283e2edb45b7a060bbc36d46 ] - -QMP PHY used in SM8550 requires 3 clocks: - -* ref - 19.2MHz reference clock from RPMh -* ref_aux - Auxiliary reference clock from GCC -* qref - QREF clock from TCSR - -Fixes: 35cf1aaab169 ("arm64: dts: qcom: sm8550: Add UFS host controller and phy nodes") -Reviewed-by: Can Guo -Reviewed-by: Konrad Dybcio -Signed-off-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-16-58a49d2f4605@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sm8550.dtsi | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi -index 076715ef09d56..e0821039f43a1 100644 ---- a/arch/arm64/boot/dts/qcom/sm8550.dtsi -+++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi -@@ -1885,9 +1885,12 @@ crypto: crypto@1dfa000 { - ufs_mem_phy: phy@1d80000 { - compatible = "qcom,sm8550-qmp-ufs-phy"; - reg = <0x0 0x01d80000 0x0 0x2000>; -- clocks = <&tcsr TCSR_UFS_CLKREF_EN>, -- <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; -- clock-names = "ref", "ref_aux"; -+ clocks = <&rpmhcc RPMH_CXO_CLK>, -+ <&gcc GCC_UFS_PHY_PHY_AUX_CLK>, -+ <&tcsr TCSR_UFS_CLKREF_EN>; -+ clock-names = "ref", -+ "ref_aux", -+ "qref"; - - power-domains = <&gcc UFS_MEM_PHY_GDSC>; - --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index e53b620811c..1344ad1ea8c 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -187,7 +187,6 @@ arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch arm64-dts-qcom-qcm2290-declare-vls-clamp-register-fo.patch arm64-dts-qcom-sm6115-declare-vls-clamp-register-for.patch -arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch wifi-ath12k-fix-incorrect-logic-of-calculating-vdev_.patch printk-disable-passing-console-lock-owner-completely.patch pwm-sti-fix-capture-for-st-pwm-num-chan-st-capture-n.patch diff --git a/queue-6.7/arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch b/queue-6.7/arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch deleted file mode 100644 index d2e6c425553..00000000000 --- a/queue-6.7/arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 09350bb378f76500d7c9adf8c254d76fc26c6868 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jan 2024 12:37:39 +0530 -Subject: arm64: dts: qcom: sm8550: Fix UFS PHY clocks - -From: Manivannan Sadhasivam - -[ Upstream commit 746ae23ad02004fe283e2edb45b7a060bbc36d46 ] - -QMP PHY used in SM8550 requires 3 clocks: - -* ref - 19.2MHz reference clock from RPMh -* ref_aux - Auxiliary reference clock from GCC -* qref - QREF clock from TCSR - -Fixes: 35cf1aaab169 ("arm64: dts: qcom: sm8550: Add UFS host controller and phy nodes") -Reviewed-by: Can Guo -Reviewed-by: Konrad Dybcio -Signed-off-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-16-58a49d2f4605@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sm8550.dtsi | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi -index e15564ed54cef..f5d07af9c5cd5 100644 ---- a/arch/arm64/boot/dts/qcom/sm8550.dtsi -+++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi -@@ -1901,9 +1901,12 @@ crypto: crypto@1dfa000 { - ufs_mem_phy: phy@1d80000 { - compatible = "qcom,sm8550-qmp-ufs-phy"; - reg = <0x0 0x01d80000 0x0 0x2000>; -- clocks = <&tcsr TCSR_UFS_CLKREF_EN>, -- <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; -- clock-names = "ref", "ref_aux"; -+ clocks = <&rpmhcc RPMH_CXO_CLK>, -+ <&gcc GCC_UFS_PHY_PHY_AUX_CLK>, -+ <&tcsr TCSR_UFS_CLKREF_EN>; -+ clock-names = "ref", -+ "ref_aux", -+ "qref"; - - power-domains = <&gcc UFS_MEM_PHY_GDSC>; - --- -2.43.0 - diff --git a/queue-6.7/series b/queue-6.7/series index a5b0864cb3e..8a8e328a4ed 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -212,7 +212,6 @@ arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch arm64-dts-qcom-qcm2290-declare-vls-clamp-register-fo.patch arm64-dts-qcom-sm6115-declare-vls-clamp-register-for.patch -arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch wifi-ath12k-fix-incorrect-logic-of-calculating-vdev_.patch printk-nbcon-relocate-32bit-seq-macros.patch printk-ringbuffer-do-not-skip-non-finalized-records-.patch diff --git a/queue-6.8/arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch b/queue-6.8/arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch deleted file mode 100644 index 17bc197fc5a..00000000000 --- a/queue-6.8/arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d35f8901acab8f3774c9d34f7c81d01e38b8ae16 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jan 2024 12:37:39 +0530 -Subject: arm64: dts: qcom: sm8550: Fix UFS PHY clocks - -From: Manivannan Sadhasivam - -[ Upstream commit 746ae23ad02004fe283e2edb45b7a060bbc36d46 ] - -QMP PHY used in SM8550 requires 3 clocks: - -* ref - 19.2MHz reference clock from RPMh -* ref_aux - Auxiliary reference clock from GCC -* qref - QREF clock from TCSR - -Fixes: 35cf1aaab169 ("arm64: dts: qcom: sm8550: Add UFS host controller and phy nodes") -Reviewed-by: Can Guo -Reviewed-by: Konrad Dybcio -Signed-off-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-16-58a49d2f4605@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sm8550.dtsi | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi -index ee1ba5a8c8fc2..72b1b8caafaa7 100644 ---- a/arch/arm64/boot/dts/qcom/sm8550.dtsi -+++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi -@@ -1907,9 +1907,12 @@ crypto: crypto@1dfa000 { - ufs_mem_phy: phy@1d80000 { - compatible = "qcom,sm8550-qmp-ufs-phy"; - reg = <0x0 0x01d80000 0x0 0x2000>; -- clocks = <&tcsr TCSR_UFS_CLKREF_EN>, -- <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; -- clock-names = "ref", "ref_aux"; -+ clocks = <&rpmhcc RPMH_CXO_CLK>, -+ <&gcc GCC_UFS_PHY_PHY_AUX_CLK>, -+ <&tcsr TCSR_UFS_CLKREF_EN>; -+ clock-names = "ref", -+ "ref_aux", -+ "qref"; - - power-domains = <&gcc UFS_MEM_PHY_GDSC>; - --- -2.43.0 - diff --git a/queue-6.8/series b/queue-6.8/series index 1e055a43005..d41716800c1 100644 --- a/queue-6.8/series +++ b/queue-6.8/series @@ -154,7 +154,6 @@ wifi-wfx-fix-memory-leak-when-starting-ap.patch arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch arm64-dts-qcom-qcm2290-declare-vls-clamp-register-fo.patch arm64-dts-qcom-sm6115-declare-vls-clamp-register-for.patch -arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm8650-fix-ufs-phy-clocks.patch wifi-ath12k-fix-incorrect-logic-of-calculating-vdev_.patch printk-nbcon-relocate-32bit-seq-macros.patch