shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: Revert "arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings"

Browse Source 
This reverts commit cf9c7b34b9.

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.

Change-Id: I75be6e002bc526bdddc403dbc2758816fbdbc39e
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
(cherry picked from commit 5292eafa1b78a6510ed250d314327144e0a6a3ba)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sumit Semwal
2024-10-03 20:05:32 +05:30
committed by Treehugger Robot
parent 55c3fa9885
commit defe0024cf
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm64/boot/dts/qcom/sm8250.dtsi
View File

@@ -2125,7 +2125,7 @@
"jedec,ufs-2.0"; "jedec,ufs-2.0";
reg = <0 0x01d84000 0 0x3000>; reg = <0 0x01d84000 0 0x3000>;
interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
phys = <&ufs_mem_phy>; phys = <&ufs_mem_phy_lanes>;
phy-names = "ufsphy"; phy-names = "ufsphy";
lanes-per-direction = <2>; lanes-per-direction = <2>;
#reset-cells = <1>; #reset-cells = <1>;
@@ -2169,8 +2169,10 @@
ufs_mem_phy: phy@1d87000 { ufs_mem_phy: phy@1d87000 {
compatible = "qcom,sm8250-qmp-ufs-phy"; 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", clock-names = "ref",
"ref_aux"; "ref_aux";
clocks = <&rpmhcc RPMH_CXO_CLK>, clocks = <&rpmhcc RPMH_CXO_CLK>,
@@ -2178,12 +2180,18 @@
resets = <&ufs_mem_hc 0>; resets = <&ufs_mem_hc 0>;
reset-names = "ufsphy"; reset-names = "ufsphy";
status = "disabled";
power-domains = <&gcc UFS_PHY_GDSC>; power-domains = <&gcc UFS_PHY_GDSC>;
#phy-cells = <0>; ufs_mem_phy_lanes: phy@1d87400 {
reg = <0 0x01d87400 0 0x16c>,
status = "disabled"; <0 0x01d87600 0 0x200>,
<0 0x01d87c00 0 0x200>,
<0 0x01d87800 0 0x16c>,
<0 0x01d87a00 0 0x200>;
#phy-cells = <0>;
};
}; };
ipa_virt: interconnect@1e00000 { ipa_virt: interconnect@1e00000 {