From: Sasha Levin Date: Sun, 24 Mar 2024 17:48:28 +0000 (-0400) Subject: Drop arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch X-Git-Tag: v6.8.2~63 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4091ac3806230ba4509f9a325cf1b886f324db6;p=thirdparty%2Fkernel%2Fstable-queue.git Drop arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.6/arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch b/queue-6.6/arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch deleted file mode 100644 index 818888a64d2..00000000000 --- a/queue-6.6/arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 452f360ea80f4b96305c7784d3af7cdc384dc95f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jan 2024 12:37:32 +0530 -Subject: arm64: dts: qcom: sm6125: Fix UFS PHY clocks - -From: Manivannan Sadhasivam - -[ Upstream commit 3823a877f25baa152e34325818d5140990d6464f ] - -QMP PHY used in SM6125 requires 3 clocks: - -* ref - 19.2MHz reference clock from RPM -* ref_aux - Auxiliary reference clock from GCC -* qref - QREF clock from GCC - -Fixes: f8399e8a2f80 ("arm64: dts: qcom: sm6125: Add UFS nodes") -Reviewed-by: Konrad Dybcio -Signed-off-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-9-58a49d2f4605@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sm6125.dtsi | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi -index 07081088ba146..9ff7b067f1e9d 100644 ---- a/arch/arm64/boot/dts/qcom/sm6125.dtsi -+++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi -@@ -792,10 +792,12 @@ ufs_mem_phy: phy@4807000 { - compatible = "qcom,sm6125-qmp-ufs-phy"; - reg = <0x04807000 0xdb8>; - -- clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, -- <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; -+ clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>, -+ <&gcc GCC_UFS_PHY_PHY_AUX_CLK>, -+ <&gcc GCC_UFS_MEM_CLKREF_CLK>; - clock-names = "ref", -- "ref_aux"; -+ "ref_aux", -+ "qref"; - - resets = <&ufs_mem_hc 0>; - reset-names = "ufsphy"; --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 11ffcab9425..86b911c30aa 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-sm6125-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm8150-switch-ufs-qmp-phy-to-new-styl.patch arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch diff --git a/queue-6.7/arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch b/queue-6.7/arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch deleted file mode 100644 index e921d28d284..00000000000 --- a/queue-6.7/arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a42ba778589dc025570fa4ef0183c51a9b4d4601 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jan 2024 12:37:32 +0530 -Subject: arm64: dts: qcom: sm6125: Fix UFS PHY clocks - -From: Manivannan Sadhasivam - -[ Upstream commit 3823a877f25baa152e34325818d5140990d6464f ] - -QMP PHY used in SM6125 requires 3 clocks: - -* ref - 19.2MHz reference clock from RPM -* ref_aux - Auxiliary reference clock from GCC -* qref - QREF clock from GCC - -Fixes: f8399e8a2f80 ("arm64: dts: qcom: sm6125: Add UFS nodes") -Reviewed-by: Konrad Dybcio -Signed-off-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-9-58a49d2f4605@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sm6125.dtsi | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi -index 1dd3a4056e26f..e180f7c6e8c93 100644 ---- a/arch/arm64/boot/dts/qcom/sm6125.dtsi -+++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi -@@ -812,10 +812,12 @@ ufs_mem_phy: phy@4807000 { - compatible = "qcom,sm6125-qmp-ufs-phy"; - reg = <0x04807000 0xdb8>; - -- clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, -- <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; -+ clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>, -+ <&gcc GCC_UFS_PHY_PHY_AUX_CLK>, -+ <&gcc GCC_UFS_MEM_CLKREF_CLK>; - clock-names = "ref", -- "ref_aux"; -+ "ref_aux", -+ "qref"; - - resets = <&ufs_mem_hc 0>; - reset-names = "ufsphy"; --- -2.43.0 - diff --git a/queue-6.7/series b/queue-6.7/series index 0569b471e11..431fe8ebe57 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-sm6125-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm8150-switch-ufs-qmp-phy-to-new-styl.patch arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch diff --git a/queue-6.8/arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch b/queue-6.8/arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch deleted file mode 100644 index c236ad23672..00000000000 --- a/queue-6.8/arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4a649dc5fa5c78a69eb53b0de015c49e647ab62e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jan 2024 12:37:32 +0530 -Subject: arm64: dts: qcom: sm6125: Fix UFS PHY clocks - -From: Manivannan Sadhasivam - -[ Upstream commit 3823a877f25baa152e34325818d5140990d6464f ] - -QMP PHY used in SM6125 requires 3 clocks: - -* ref - 19.2MHz reference clock from RPM -* ref_aux - Auxiliary reference clock from GCC -* qref - QREF clock from GCC - -Fixes: f8399e8a2f80 ("arm64: dts: qcom: sm6125: Add UFS nodes") -Reviewed-by: Konrad Dybcio -Signed-off-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-9-58a49d2f4605@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sm6125.dtsi | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi -index 1dd3a4056e26f..e180f7c6e8c93 100644 ---- a/arch/arm64/boot/dts/qcom/sm6125.dtsi -+++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi -@@ -812,10 +812,12 @@ ufs_mem_phy: phy@4807000 { - compatible = "qcom,sm6125-qmp-ufs-phy"; - reg = <0x04807000 0xdb8>; - -- clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, -- <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; -+ clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>, -+ <&gcc GCC_UFS_PHY_PHY_AUX_CLK>, -+ <&gcc GCC_UFS_MEM_CLKREF_CLK>; - clock-names = "ref", -- "ref_aux"; -+ "ref_aux", -+ "qref"; - - resets = <&ufs_mem_hc 0>; - reset-names = "ufsphy"; --- -2.43.0 - diff --git a/queue-6.8/series b/queue-6.8/series index 7e5d9e47d7d..1add708eb32 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-sm6125-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm8250-fix-ufs-phy-clocks.patch