From: Sasha Levin Date: Sun, 24 Mar 2024 17:48:26 +0000 (-0400) Subject: Drop arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch X-Git-Tag: v6.8.2~66 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d59b69f6bbbb826deadc78df49f43de350a18d2;p=thirdparty%2Fkernel%2Fstable-queue.git Drop arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch b/queue-5.15/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch deleted file mode 100644 index 5d6c152d05f..00000000000 --- a/queue-5.15/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f61c4cd0daa7867eea38d1b04ac1ad68ff1e27df Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jan 2024 12:37:30 +0530 -Subject: arm64: dts: qcom: sdm845: Fix UFS PHY clocks - -From: Manivannan Sadhasivam - -[ Upstream commit ca8fb2bd2248ae05890c011d691ba5d4a1e7d8d6 ] - -QMP PHY used in SDM845 requires 3 clocks: - -* ref - 19.2MHz reference clock from RPMh -* ref_aux - Auxiliary reference clock from GCC -* qref - QREF clock from GCC - -While at it, let's move 'clocks' property before 'clock-names' to match -the style used commonly. - -Fixes: cc16687fbd74 ("arm64: dts: qcom: sdm845: add UFS controller") -Reviewed-by: Konrad Dybcio -Signed-off-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-7-58a49d2f4605@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi -index 06e160ee00dd1..f83f83dd56a53 100644 ---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi -@@ -2292,10 +2292,12 @@ ufs_mem_phy: phy@1d87000 { - compatible = "qcom,sdm845-qmp-ufs-phy"; - reg = <0 0x01d87000 0 0x1000>; - -+ clocks = <&rpmhcc RPMH_CXO_CLK>, -+ <&gcc GCC_UFS_PHY_PHY_AUX_CLK>, -+ <&gcc GCC_UFS_MEM_CLKREF_CLK>; - clock-names = "ref", -- "ref_aux"; -- clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, -- <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; -+ "ref_aux", -+ "qref"; - - resets = <&ufs_mem_hc 0>; - reset-names = "ufsphy"; --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index c7cb2b8731e..db0f93e24b7 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -88,7 +88,6 @@ arm64-dts-qcom-msm8998-drop-usb-phy-clock-index.patch 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-sdm845-switch-ufs-qmp-phy-to-new-styl.patch -arm64-dts-qcom-sdm845-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 arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch diff --git a/queue-6.1/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch b/queue-6.1/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch deleted file mode 100644 index 77a03797115..00000000000 --- a/queue-6.1/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b351fbd5629067255d82687b9d71be5fb2b658a7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jan 2024 12:37:30 +0530 -Subject: arm64: dts: qcom: sdm845: Fix UFS PHY clocks - -From: Manivannan Sadhasivam - -[ Upstream commit ca8fb2bd2248ae05890c011d691ba5d4a1e7d8d6 ] - -QMP PHY used in SDM845 requires 3 clocks: - -* ref - 19.2MHz reference clock from RPMh -* ref_aux - Auxiliary reference clock from GCC -* qref - QREF clock from GCC - -While at it, let's move 'clocks' property before 'clock-names' to match -the style used commonly. - -Fixes: cc16687fbd74 ("arm64: dts: qcom: sdm845: add UFS controller") -Reviewed-by: Konrad Dybcio -Signed-off-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-7-58a49d2f4605@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi -index 8d2c78083ee49..b613c58bb43b6 100644 ---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi -@@ -2530,10 +2530,12 @@ ufs_mem_phy: phy@1d87000 { - compatible = "qcom,sdm845-qmp-ufs-phy"; - reg = <0 0x01d87000 0 0x1000>; - -+ clocks = <&rpmhcc RPMH_CXO_CLK>, -+ <&gcc GCC_UFS_PHY_PHY_AUX_CLK>, -+ <&gcc GCC_UFS_MEM_CLKREF_CLK>; - clock-names = "ref", -- "ref_aux"; -- clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, -- <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; -+ "ref_aux", -+ "qref"; - - resets = <&ufs_mem_hc 0>; - reset-names = "ufsphy"; --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 4d3e5ecb27a..b24ce516b13 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -128,7 +128,6 @@ wifi-wfx-fix-memory-leak-when-starting-ap.patch 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-sdm845-switch-ufs-qmp-phy-to-new-styl.patch -arm64-dts-qcom-sdm845-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.6/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch b/queue-6.6/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch deleted file mode 100644 index 5f912bab92a..00000000000 --- a/queue-6.6/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch +++ /dev/null @@ -1,51 +0,0 @@ -From cde03fd26754e56381267b93224746d25daab592 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jan 2024 12:37:30 +0530 -Subject: arm64: dts: qcom: sdm845: Fix UFS PHY clocks - -From: Manivannan Sadhasivam - -[ Upstream commit ca8fb2bd2248ae05890c011d691ba5d4a1e7d8d6 ] - -QMP PHY used in SDM845 requires 3 clocks: - -* ref - 19.2MHz reference clock from RPMh -* ref_aux - Auxiliary reference clock from GCC -* qref - QREF clock from GCC - -While at it, let's move 'clocks' property before 'clock-names' to match -the style used commonly. - -Fixes: cc16687fbd74 ("arm64: dts: qcom: sdm845: add UFS controller") -Reviewed-by: Konrad Dybcio -Signed-off-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-7-58a49d2f4605@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi -index 1ce71d70daa01..5f5c1b3bdeee8 100644 ---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi -@@ -2627,10 +2627,12 @@ ufs_mem_phy: phy@1d87000 { - compatible = "qcom,sdm845-qmp-ufs-phy"; - reg = <0 0x01d87000 0 0x1000>; - -+ clocks = <&rpmhcc RPMH_CXO_CLK>, -+ <&gcc GCC_UFS_PHY_PHY_AUX_CLK>, -+ <&gcc GCC_UFS_MEM_CLKREF_CLK>; - clock-names = "ref", -- "ref_aux"; -- clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, -- <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; -+ "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 2d5acecb9bc..7f7345b5dad 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -188,7 +188,6 @@ 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-sdm845-switch-ufs-qmp-phy-to-new-styl.patch -arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch diff --git a/queue-6.7/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch b/queue-6.7/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch deleted file mode 100644 index 3e48de268c3..00000000000 --- a/queue-6.7/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 99f9513ffb6899563d12a59c3abe28ee977d2cf4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jan 2024 12:37:30 +0530 -Subject: arm64: dts: qcom: sdm845: Fix UFS PHY clocks - -From: Manivannan Sadhasivam - -[ Upstream commit ca8fb2bd2248ae05890c011d691ba5d4a1e7d8d6 ] - -QMP PHY used in SDM845 requires 3 clocks: - -* ref - 19.2MHz reference clock from RPMh -* ref_aux - Auxiliary reference clock from GCC -* qref - QREF clock from GCC - -While at it, let's move 'clocks' property before 'clock-names' to match -the style used commonly. - -Fixes: cc16687fbd74 ("arm64: dts: qcom: sdm845: add UFS controller") -Reviewed-by: Konrad Dybcio -Signed-off-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-7-58a49d2f4605@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi -index 4d1396325f667..5fda325e4f45e 100644 ---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi -@@ -2617,10 +2617,12 @@ ufs_mem_phy: phy@1d87000 { - compatible = "qcom,sdm845-qmp-ufs-phy"; - reg = <0 0x01d87000 0 0x1000>; - -+ clocks = <&rpmhcc RPMH_CXO_CLK>, -+ <&gcc GCC_UFS_PHY_PHY_AUX_CLK>, -+ <&gcc GCC_UFS_MEM_CLKREF_CLK>; - clock-names = "ref", -- "ref_aux"; -- clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, -- <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; -+ "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 e8a3d4d8f94..6718bcbf86b 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -213,7 +213,6 @@ 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-sdm845-switch-ufs-qmp-phy-to-new-styl.patch -arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch diff --git a/queue-6.8/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch b/queue-6.8/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch deleted file mode 100644 index 1df41dc6d25..00000000000 --- a/queue-6.8/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch +++ /dev/null @@ -1,51 +0,0 @@ -From aee7a0f6fc799a34d1bb8d2795c35ed907ba84b6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jan 2024 12:37:30 +0530 -Subject: arm64: dts: qcom: sdm845: Fix UFS PHY clocks - -From: Manivannan Sadhasivam - -[ Upstream commit ca8fb2bd2248ae05890c011d691ba5d4a1e7d8d6 ] - -QMP PHY used in SDM845 requires 3 clocks: - -* ref - 19.2MHz reference clock from RPMh -* ref_aux - Auxiliary reference clock from GCC -* qref - QREF clock from GCC - -While at it, let's move 'clocks' property before 'clock-names' to match -the style used commonly. - -Fixes: cc16687fbd74 ("arm64: dts: qcom: sdm845: add UFS controller") -Reviewed-by: Konrad Dybcio -Signed-off-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-7-58a49d2f4605@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi -index c2244824355a2..5ee98ff84d171 100644 ---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi -@@ -2639,10 +2639,12 @@ ufs_mem_phy: phy@1d87000 { - compatible = "qcom,sdm845-qmp-ufs-phy"; - reg = <0 0x01d87000 0 0x1000>; - -+ clocks = <&rpmhcc RPMH_CXO_CLK>, -+ <&gcc GCC_UFS_PHY_PHY_AUX_CLK>, -+ <&gcc GCC_UFS_MEM_CLKREF_CLK>; - clock-names = "ref", -- "ref_aux"; -- clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, -- <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; -+ "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 6d01f351f3d..c4d615f69fe 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-sdm845-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch