diff mbox series

arm64: dts: qcom: sc8180x: switch UFS QMP PHY to new style of bindings

Message ID 20230731111158.3998107-1-dmitry.baryshkov@linaro.org
State Accepted
Commit 916b5916f228a9f83a22ad91ad8c5bf788a456d7
Headers show
Series arm64: dts: qcom: sc8180x: switch UFS QMP PHY to new style of bindings | expand

Commit Message

Dmitry Baryshkov July 31, 2023, 11:11 a.m. UTC
Change the UFS QMP PHY to use newer style of QMP PHY bindings (single
resource region, no per-PHY subnodes).

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---

As with the rest of UFS DTS conversion patches, this patch should wait
for 6.6, so that the patch flow is bisectable.

---
 arch/arm64/boot/dts/qcom/sc8180x.dtsi | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

Comments

Konrad Dybcio July 31, 2023, 11:14 a.m. UTC | #1
On 31.07.2023 13:11, Dmitry Baryshkov wrote:
> Change the UFS QMP PHY to use newer style of QMP PHY bindings (single
> resource region, no per-PHY subnodes).
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
> 
> As with the rest of UFS DTS conversion patches, this patch should wait
> for 6.6, so that the patch flow is bisectable.
> 
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
Bjorn Andersson Sept. 19, 2023, 11:07 p.m. UTC | #2
On Mon, 31 Jul 2023 14:11:58 +0300, Dmitry Baryshkov wrote:
> Change the UFS QMP PHY to use newer style of QMP PHY bindings (single
> resource region, no per-PHY subnodes).
> 
> 

Applied, thanks!

[1/1] arm64: dts: qcom: sc8180x: switch UFS QMP PHY to new style of bindings
      commit: 916b5916f228a9f83a22ad91ad8c5bf788a456d7

Best regards,
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sc8180x.dtsi b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
index fae149e33b98..3c79b82eac6e 100644
--- a/arch/arm64/boot/dts/qcom/sc8180x.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
@@ -2080,7 +2080,7 @@  ufs_mem_hc: ufshc@1d84000 {
 				     "jedec,ufs-2.0";
 			reg = <0 0x01d84000 0 0x2500>;
 			interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
-			phys = <&ufs_mem_phy_lanes>;
+			phys = <&ufs_mem_phy>;
 			phy-names = "ufsphy";
 			lanes-per-direction = <2>;
 			#reset-cells = <1>;
@@ -2119,10 +2119,8 @@  ufs_mem_hc: ufshc@1d84000 {
 
 		ufs_mem_phy: phy-wrapper@1d87000 {
 			compatible = "qcom,sc8180x-qmp-ufs-phy";
-			reg = <0 0x01d87000 0 0x1c0>;
-			#address-cells = <2>;
-			#size-cells = <2>;
-			ranges;
+			reg = <0 0x01d87000 0 0x1000>;
+
 			clocks = <&rpmhcc RPMH_CXO_CLK>,
 				 <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
 			clock-names = "ref",
@@ -2130,16 +2128,10 @@  ufs_mem_phy: phy-wrapper@1d87000 {
 
 			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";
 		};
 
 		ipa_virt: interconnect@1e00000 {