Revert "arm64: dts: qcom: Fix 'reg-names' for sdhci nodes"

This reverts commit afcbe252e9c19161e4d4c95f33faaf592f1de086.

The commit in question caused my sc7280-herobrine-herobrine-r1 board
not to boot anymore. This shouldn't be too surprising since the driver
is relying on the name "cqhci".

The issue seems to be that someone decided to change the names of
things when the binding moved from .txt to .yaml. We should go back to
the names that the bindings have historically specified.

For some history, see commit d3392339cae9 ("mmc: cqhci: Update cqhci
memory ioresource name") and commit d79100c91ae5 ("dt-bindings: mmc:
sdhci-msm: Add CQE reg map").

Fixes: afcbe252e9c1 ("arm64: dts: qcom: Fix 'reg-names' for sdhci nodes")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220706144706.1.I48f35820bf3670d54940110462555c2d0a6d5eb2@changeid

diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi
index 1721c72d591af7f514bee2098c9fe26673007f4c..19fd8a2b551eb422bed9f89a87af45332fab73a4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
@@ -809,7 +809,7 @@
                sdcc1: mmc@7804000 {
                        compatible = "qcom,qcs404-sdhci", "qcom,sdhci-msm-v5";
                        reg = <0x07804000 0x1000>, <0x7805000 0x1000>;
-                       reg-names = "hc_mem", "cqe_mem";
+                       reg-names = "hc", "cqhci";
 
                        interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 47ce5787ed5bc98cc1948bb735e57c0229d9fad8..881e30953c0f9446bb5af5d17d83bc48b5df32dd 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -697,7 +697,7 @@
                        compatible = "qcom,sc7180-sdhci", "qcom,sdhci-msm-v5";
                        reg = <0 0x7c4000 0 0x1000>,
                                <0 0x07c5000 0 0x1000>;
-                       reg-names = "hc_mem", "cqe_mem";
+                       reg-names = "hc", "cqhci";
 
                        iommus = <&apps_smmu 0x60 0x0>;
                        interrupts = <GIC_SPI 641 IRQ_TYPE_LEVEL_HIGH>,

diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index a3def1022ea2974fe504c705f77394fe348a1549..90cee40b2ea81f29401aa6b03869ded01bbb6471 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -866,7 +866,7 @@
 
                        reg = <0 0x007c4000 0 0x1000>,
                              <0 0x007c5000 0 0x1000>;
-                       reg-names = "hc_mem", "cqe_mem";
+                       reg-names = "hc", "cqhci";
 
                        iommus = <&apps_smmu 0xc0 0x0>;
                        interrupts = <GIC_SPI 652 IRQ_TYPE_LEVEL_HIGH>,

diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
index 0f4c22be0224c53774f641beb7b92df533a508f9..1bc9091cad2a8a1acbdf5a000093056358c4cfdd 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
@@ -1280,7 +1280,7 @@
                sdhc_2: mmc@c084000 {
                        compatible = "qcom,sdm630-sdhci", "qcom,sdhci-msm-v5";
                        reg = <0x0c084000 0x1000>;
-                       reg-names = "hc_mem";
+                       reg-names = "hc";
 
                        interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
                                        <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
@@ -1335,7 +1335,7 @@
                        reg = <0x0c0c4000 0x1000>,
                              <0x0c0c5000 0x1000>,
                              <0x0c0c8000 0x8000>;
-                       reg-names = "hc_mem", "cqe_mem", "ice_mem";
+                       reg-names = "hc", "cqhci", "ice";
 
                        interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
                                        <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
index e03680cbcbcd609364ce3843816eb74256214fb2..8c582a9e4ada4f0bef8f066fa71d4129ff1c3b84 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
@@ -458,7 +458,7 @@
                sdhc_1: mmc@4744000 {
                        compatible = "qcom,sm6125-sdhci", "qcom,sdhci-msm-v5";
                        reg = <0x04744000 0x1000>, <0x04745000 0x1000>;
-                       reg-names = "hc_mem", "core_mem";
+                       reg-names = "hc", "core";
 
                        interrupts = <GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
@@ -482,7 +482,7 @@
                sdhc_2: mmc@4784000 {
                        compatible = "qcom,sm6125-sdhci", "qcom,sdhci-msm-v5";
                        reg = <0x04784000 0x1000>;
-                       reg-names = "hc_mem";
+                       reg-names = "hc";
 
                        interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi
index c702235f029154f85001229b9f4b328b79983689..bb9349bc2d353a6ccc202b460edd1809c928e082 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi
@@ -477,7 +477,7 @@
                        reg = <0 0x007c4000 0 0x1000>,
                                <0 0x007c5000 0 0x1000>,
                                <0 0x007c8000 0 0x8000>;
-                       reg-names = "hc_mem", "cqe_mem", "ice_mem";
+                       reg-names = "hc", "cqhci", "ice";
 
                        interrupts = <GIC_SPI 641 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 644 IRQ_TYPE_LEVEL_HIGH>;