| Message ID | 20220706144706.1.I48f35820bf3670d54940110462555c2d0a6d5eb2@changeid |
|---|---|
| State | Accepted |
| Commit | 21857088fa274750608e25b44ededa6199fac4a5 |
| Headers | show |
| Series | Revert "arm64: dts: qcom: Fix 'reg-names' for sdhci nodes" | expand |
On Wed, 6 Jul 2022 14:47:33 -0700, Douglas Anderson wrote: > 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. > > [...] Applied, thanks! [1/1] Revert "arm64: dts: qcom: Fix 'reg-names' for sdhci nodes" commit: 21857088fa274750608e25b44ededa6199fac4a5 Best regards,
On 06/07/2022 23:47, Douglas Anderson wrote: > 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". Thanks for finding the issue. > > 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> > --- > This is just a straight revert. That presumably means we'll get some > "make dtbs_check" warnings that were fixed by the commit being > reverted. I'll leave it to the authors of the original commit to > adjust the bindings to fix those. Thanks for the report. I can help here. Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi index 1721c72d591a..19fd8a2b551e 100644 --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi @@ -809,7 +809,7 @@ pcie_phy: phy@7786000 { 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 47ce5787ed5b..881e30953c0f 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -697,7 +697,7 @@ sdhc_1: mmc@7c4000 { 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 40e700cebe56..c398485fec2d 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -866,7 +866,7 @@ sdhc_1: mmc@7c4000 { 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 0f4c22be0224..1bc9091cad2a 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -1280,7 +1280,7 @@ qusb2phy1: phy@c014000 { 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 @@ sdhc_1: mmc@c0c4000 { 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 94e427abbfd2..77bff81af433 100644 --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi @@ -438,7 +438,7 @@ rpm_msg_ram: sram@45f0000 { 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>; @@ -459,7 +459,7 @@ sdhc_1: mmc@4744000 { 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 c702235f0291..bb9349bc2d35 100644 --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi @@ -477,7 +477,7 @@ sdhc_1: mmc@7c4000 { 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>;
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> --- This is just a straight revert. That presumably means we'll get some "make dtbs_check" warnings that were fixed by the commit being reverted. I'll leave it to the authors of the original commit to adjust the bindings to fix those. arch/arm64/boot/dts/qcom/qcs404.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm630.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/sm6125.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/sm6350.dtsi | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)