From: Greg Kroah-Hartman Date: Tue, 8 Oct 2024 11:26:25 +0000 (+0200) Subject: drop 5.4 patch that shouldn't have been there. X-Git-Tag: v6.6.55~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a7b076810e0fc729b0d9625c665732d547673e4;p=thirdparty%2Fkernel%2Fstable-queue.git drop 5.4 patch that shouldn't have been there. --- diff --git a/queue-5.4/revert-arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-style-of-bindings.patch b/queue-5.4/revert-arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-style-of-bindings.patch deleted file mode 100644 index 7e6bef63e4e..00000000000 --- a/queue-5.4/revert-arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-style-of-bindings.patch +++ /dev/null @@ -1,76 +0,0 @@ -From sumit.semwal@linaro.org Tue Oct 8 12:17:06 2024 -From: Sumit Semwal -Date: Thu, 3 Oct 2024 20:05:32 +0530 -Subject: Revert "arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings" -To: stable@vger.kernel.org -Cc: dmitry.baryshkov@linaro.org, agross@kernel.org, bjorn.andersson@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Sumit Semwal -Message-ID: <20241003143532.108444-1-sumit.semwal@linaro.org> - -From: Sumit Semwal - -This reverts commit cf9c7b34b90b622254b236a9a43737b6059a1c14. - -This commit breaks UFS on RB5 in the 6.1 LTS kernels. The original patch -author suggests that this is not a stable kernel patch, hence reverting -it. - -This was reported during testing with 6.1.103 / 5.15.165 LTS kernels -merged in the respective Android Common Kernel branches. - -Signed-off-by: Sumit Semwal -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm64/boot/dts/qcom/sm8250.dtsi | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi -index 6a2852584405..c9780b2afd2f 100644 ---- a/arch/arm64/boot/dts/qcom/sm8250.dtsi -+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi -@@ -2125,7 +2125,7 @@ ufs_mem_hc: ufshc@1d84000 { - "jedec,ufs-2.0"; - reg = <0 0x01d84000 0 0x3000>; - interrupts = ; -- phys = <&ufs_mem_phy>; -+ phys = <&ufs_mem_phy_lanes>; - phy-names = "ufsphy"; - lanes-per-direction = <2>; - #reset-cells = <1>; -@@ -2169,8 +2169,10 @@ ufs_mem_hc: ufshc@1d84000 { - - ufs_mem_phy: phy@1d87000 { - compatible = "qcom,sm8250-qmp-ufs-phy"; -- reg = <0 0x01d87000 0 0x1000>; -- -+ reg = <0 0x01d87000 0 0x1c0>; -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges; - clock-names = "ref", - "ref_aux"; - clocks = <&rpmhcc RPMH_CXO_CLK>, -@@ -2178,12 +2180,18 @@ ufs_mem_phy: phy@1d87000 { - - resets = <&ufs_mem_hc 0>; - reset-names = "ufsphy"; -+ status = "disabled"; - - power-domains = <&gcc UFS_PHY_GDSC>; - -- #phy-cells = <0>; -- -- status = "disabled"; -+ ufs_mem_phy_lanes: phy@1d87400 { -+ reg = <0 0x01d87400 0 0x16c>, -+ <0 0x01d87600 0 0x200>, -+ <0 0x01d87c00 0 0x200>, -+ <0 0x01d87800 0 0x16c>, -+ <0 0x01d87a00 0 0x200>; -+ #phy-cells = <0>; -+ }; - }; - - ipa_virt: interconnect@1e00000 { --- -2.46.2 - diff --git a/queue-5.4/series b/queue-5.4/series index 1ec7b56ad87..034a7edac93 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -305,4 +305,3 @@ acpi-battery-fix-possible-crash-when-unregistering-a.patch ext4-fix-inode-tree-inconsistency-caused-by-enomem.patch btrfs-get-rid-of-warning-on-transaction-commit-when-using-flushoncommit.patch clk-imx6ul-fix-failed-to-get-parent-error.patch -revert-arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-style-of-bindings.patch