From: Sasha Levin Date: Mon, 25 Mar 2024 11:15:01 +0000 (-0400) Subject: Drop arm64-dts-qcom-sc8280xp-update-ufs-phy-nodes.patch X-Git-Tag: v6.8.2~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4028107dbbb6bf4b88c929ae020434d71cb7d6f8;p=thirdparty%2Fkernel%2Fstable-queue.git Drop arm64-dts-qcom-sc8280xp-update-ufs-phy-nodes.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/arm64-dts-qcom-sc8280xp-update-ufs-phy-nodes.patch b/queue-6.1/arm64-dts-qcom-sc8280xp-update-ufs-phy-nodes.patch deleted file mode 100644 index 0b4f22dcf03..00000000000 --- a/queue-6.1/arm64-dts-qcom-sc8280xp-update-ufs-phy-nodes.patch +++ /dev/null @@ -1,119 +0,0 @@ -From af01b2e4bf1cbd26902e27b2e68222d142ba287a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 4 Nov 2022 10:20:45 +0100 -Subject: arm64: dts: qcom: sc8280xp: update UFS PHY nodes - -From: Johan Hovold - -[ Upstream commit 33c4e6588e4f018abc43381ee21fe2bed37e34a5 ] - -Update the UFS PHY nodes to match the new binding. - -Signed-off-by: Johan Hovold -Reviewed-by: Brian Masney -Reviewed-by: Konrad Dybcio -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20221104092045.17410-3-johan+linaro@kernel.org -Stable-dep-of: 1d4ef9644e21 ("arm64: dts: qcom: sc8280xp: Fix UFS PHY clocks") -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 49 +++++++++----------------- - 1 file changed, 17 insertions(+), 32 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi -index 7e3aaf5de3f5c..88140ce104a44 100644 ---- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi -@@ -845,7 +845,7 @@ ufs_mem_hc: ufs@1d84000 { - "jedec,ufs-2.0"; - reg = <0 0x01d84000 0 0x3000>; - interrupts = ; -- phys = <&ufs_mem_phy_lanes>; -+ phys = <&ufs_mem_phy>; - phy-names = "ufsphy"; - lanes-per-direction = <2>; - #reset-cells = <1>; -@@ -887,27 +887,20 @@ ufs_mem_hc: ufs@1d84000 { - - ufs_mem_phy: phy@1d87000 { - compatible = "qcom,sc8280xp-qmp-ufs-phy"; -- reg = <0 0x01d87000 0 0x1c8>; -- #address-cells = <2>; -- #size-cells = <2>; -- ranges; -- clock-names = "ref", -- "ref_aux"; -+ reg = <0 0x01d87000 0 0x1000>; -+ - clocks = <&gcc GCC_UFS_CARD_CLKREF_CLK>, - <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; -+ clock-names = "ref", "ref_aux"; -+ -+ power-domains = <&gcc UFS_PHY_GDSC>; - - resets = <&ufs_mem_hc 0>; - reset-names = "ufsphy"; -- status = "disabled"; - -- ufs_mem_phy_lanes: phy@1d87400 { -- reg = <0 0x01d87400 0 0x108>, -- <0 0x01d87600 0 0x1e0>, -- <0 0x01d87c00 0 0x1dc>, -- <0 0x01d87800 0 0x108>, -- <0 0x01d87a00 0 0x1e0>; -- #phy-cells = <0>; -- }; -+ #phy-cells = <0>; -+ -+ status = "disabled"; - }; - - ufs_card_hc: ufs@1da4000 { -@@ -915,7 +908,7 @@ ufs_card_hc: ufs@1da4000 { - "jedec,ufs-2.0"; - reg = <0 0x01da4000 0 0x3000>; - interrupts = ; -- phys = <&ufs_card_phy_lanes>; -+ phys = <&ufs_card_phy>; - phy-names = "ufsphy"; - lanes-per-direction = <2>; - #reset-cells = <1>; -@@ -956,28 +949,20 @@ ufs_card_hc: ufs@1da4000 { - - ufs_card_phy: phy@1da7000 { - compatible = "qcom,sc8280xp-qmp-ufs-phy"; -- reg = <0 0x01da7000 0 0x1c8>; -- #address-cells = <2>; -- #size-cells = <2>; -- ranges; -- clock-names = "ref", -- "ref_aux"; -+ reg = <0 0x01da7000 0 0x1000>; -+ - clocks = <&gcc GCC_UFS_1_CARD_CLKREF_CLK>, - <&gcc GCC_UFS_CARD_PHY_AUX_CLK>; -+ clock-names = "ref", "ref_aux"; -+ -+ power-domains = <&gcc UFS_CARD_GDSC>; - - resets = <&ufs_card_hc 0>; - reset-names = "ufsphy"; - -- status = "disabled"; -+ #phy-cells = <0>; - -- ufs_card_phy_lanes: phy@1da7400 { -- reg = <0 0x01da7400 0 0x108>, -- <0 0x01da7600 0 0x1e0>, -- <0 0x01da7c00 0 0x1dc>, -- <0 0x01da7800 0 0x108>, -- <0 0x01da7a00 0 0x1e0>; -- #phy-cells = <0>; -- }; -+ status = "disabled"; - }; - - tcsr_mutex: hwlock@1f40000 { --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 8b59078b64b..0ae5faf54ec 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -127,7 +127,6 @@ wifi-libertas-fix-some-memleaks-in-lbs_allocate_cmd_.patch 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-sc8280xp-update-ufs-phy-nodes.patch printk-disable-passing-console-lock-owner-completely.patch pwm-sti-fix-capture-for-st-pwm-num-chan-st-capture-n.patch tools-resolve_btfids-refactor-set-sorting-with-types.patch