Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: qcom: apq8084-ifc6540: fix overriding SDHCI

While changing node names of APQ8084 SDHCI, the ones in IFC6540 board
were not updated leading to disabled and misconfigured SDHCI.

Cc: <stable@vger.kernel.org>
Fixes: 2477d81901a2 ("ARM: dts: qcom: Fix sdhci node names - use 'mmc@'")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221204084614.12193-1-krzysztof.kozlowski@linaro.org

authored by

Krzysztof Kozlowski and committed by
Bjorn Andersson
0154252a 1b929c02

+13 -13
+11 -11
arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
··· 19 19 serial@f995e000 { 20 20 status = "okay"; 21 21 }; 22 - 23 - sdhci@f9824900 { 24 - bus-width = <8>; 25 - non-removable; 26 - status = "okay"; 27 - }; 28 - 29 - sdhci@f98a4900 { 30 - cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>; 31 - bus-width = <4>; 32 - }; 33 22 }; 23 + }; 24 + 25 + &sdhc_1 { 26 + bus-width = <8>; 27 + non-removable; 28 + status = "okay"; 29 + }; 30 + 31 + &sdhc_2 { 32 + cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>; 33 + bus-width = <4>; 34 34 };
+2 -2
arch/arm/boot/dts/qcom-apq8084.dtsi
··· 421 421 status = "disabled"; 422 422 }; 423 423 424 - mmc@f9824900 { 424 + sdhc_1: mmc@f9824900 { 425 425 compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4"; 426 426 reg = <0xf9824900 0x11c>, <0xf9824000 0x800>; 427 427 reg-names = "hc", "core"; ··· 434 434 status = "disabled"; 435 435 }; 436 436 437 - mmc@f98a4900 { 437 + sdhc_2: mmc@f98a4900 { 438 438 compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4"; 439 439 reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>; 440 440 reg-names = "hc", "core";