arm64: dts: qcom: Use 'ufshc' as the node name for UFS controller nodes

Devicetree binding has documented the node name for UFS controllers as
'ufshc'. So let's use it instead of 'ufs' which is for the UFS devices.

Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20240514-ufs-nodename-fix-v1-2-4c55483ac401@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sa8775p.dtsi b/arch/arm64/boot/dts/qcom/sa8775p.dtsi
index 34163d2ebd57c74504e343cbf0bdfdbb27330013..9f315a51a7c14cd4116ec5a66a60285361d343f1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sa8775p.dtsi
+++ b/arch/arm64/boot/dts/qcom/sa8775p.dtsi
@@ -2323,7 +2323,7 @@
                        reg = <0 0x010d2000 0 0x1000>;
                };
 
-               ufs_mem_hc: ufs@1d84000 {
+               ufs_mem_hc: ufshc@1d84000 {
                        compatible = "qcom,sa8775p-ufshc", "qcom,ufshc", "jedec,ufs-2.0";
                        reg = <0x0 0x01d84000 0x0 0x3000>;
                        interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 77da825159b0ec2a9ac899697eb4f63d933d12b1..55db1c83ef5517f82504816baeee583695065225 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -2323,7 +2323,7 @@
                        status = "disabled";
                };
 
-               ufs_mem_hc: ufs@1d84000 {
+               ufs_mem_hc: ufshc@1d84000 {
                        compatible = "qcom,sc7280-ufshc", "qcom,ufshc",
                                     "jedec,ufs-2.0";
                        reg = <0x0 0x01d84000 0x0 0x3000>;

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index 2b98a8f0f899c2d7e3badec0a122e8b3d4b897a2..ef06d1ac084d3205a149feff880f457822dca2b4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -2312,7 +2312,7 @@
                        status = "disabled";
                };
 
-               ufs_mem_hc: ufs@1d84000 {
+               ufs_mem_hc: ufshc@1d84000 {
                        compatible = "qcom,sc8280xp-ufshc", "qcom,ufshc",
                                     "jedec,ufs-2.0";
                        reg = <0 0x01d84000 0 0x3000>;
@@ -2378,7 +2378,7 @@
                        status = "disabled";
                };
 
-               ufs_card_hc: ufs@1da4000 {
+               ufs_card_hc: ufshc@1da4000 {
                        compatible = "qcom,sc8280xp-ufshc", "qcom,ufshc",
                                     "jedec,ufs-2.0";
                        reg = <0 0x01da4000 0 0x3000>;

diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
index abaabeb414396ff3c8dd001b474901f16cb722bf..9b23534c456bde8c400cc331e847f0f84ae0b74a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6115.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi
@@ -1178,7 +1178,7 @@
                        };
                };
 
-               ufs_mem_hc: ufs@4804000 {
+               ufs_mem_hc: ufshc@4804000 {
                        compatible = "qcom,sm6115-ufshc", "qcom,ufshc", "jedec,ufs-2.0";
                        reg = <0x0 0x04804000 0x0 0x3000>, <0x0 0x04810000 0x0 0x8000>;
                        reg-names = "std", "ice";

diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
index 1a4e196391a66199a2ff802001637df0bd47cff5..17d528d639343b9d649167d231aad3aa63474435 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
@@ -763,7 +763,7 @@
                        status = "disabled";
                };
 
-               ufs_mem_hc: ufs@4804000 {
+               ufs_mem_hc: ufshc@4804000 {
                        compatible = "qcom,sm6125-ufshc", "qcom,ufshc", "jedec,ufs-2.0";
                        reg = <0x04804000 0x3000>, <0x04810000 0x8000>;
                        reg-names = "std", "ice";

diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi
index 2ca5a59ba4fb8a88b189aa906a34995ec33ec4c7..8d697280249fefcc62ab0848e949b5509deb32a6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi
@@ -1136,7 +1136,7 @@
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
-               ufs_mem_hc: ufs@1d84000 {
+               ufs_mem_hc: ufshc@1d84000 {
                        compatible = "qcom,sm6350-ufshc", "qcom,ufshc",
                                     "jedec,ufs-2.0";
                        reg = <0 0x01d84000 0 0x3000>,

diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
index 9d2ee372b225783c0fd2acc0fe23329fa42abb12..e7774d32fb6d2288748ecec00bf525b2b3c40fbb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
@@ -1989,7 +1989,7 @@
                        status = "disabled";
                };
 
-               ufs_mem_hc: ufs@1d84000 {
+               ufs_mem_hc: ufshc@1d84000 {
                        compatible = "qcom,sm8550-ufshc", "qcom,ufshc",
                                     "jedec,ufs-2.0";
                        reg = <0x0 0x01d84000 0x0 0x3000>;

diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi
index 0c2b2a12663363b7d35eec89051697d69aba287d..25e47505adcb790d09f1d2726386438487255824 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8650.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi
@@ -2535,7 +2535,7 @@
                        status = "disabled";
                };
 
-               ufs_mem_hc: ufs@1d84000 {
+               ufs_mem_hc: ufshc@1d84000 {
                        compatible = "qcom,sm8650-ufshc", "qcom,ufshc", "jedec,ufs-2.0";
                        reg = <0 0x01d84000 0 0x3000>;