Commit 0154252a authored Dec 04, 2022 by Krzysztof Kozlowski Committed by Bjorn Andersson Dec 28, 2022

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: 2477d819 ("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

parent 1b929c02

arch/arm/boot/dts/qcom-apq8084-ifc6540.dts

+10 −10

Original line number	Diff line number	Diff line
		@@ -19,16 +19,16 @@ soc {
		serial@f995e000 {
		status = "okay";
		};
		};
		};

		sdhci@f9824900 {
		&sdhc_1 {
		bus-width = <8>;
		non-removable;
		status = "okay";
		};

		sdhci@f98a4900 {
		&sdhc_2 {
		cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>;
		bus-width = <4>;
		};
		};
		};

arch/arm/boot/dts/qcom-apq8084.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -421,7 +421,7 @@ blsp2_uart2: serial@f995e000 {
		status = "disabled";
		};

		mmc@f9824900 {
		sdhc_1: mmc@f9824900 {
		compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";
		reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;
		reg-names = "hc", "core";
		@@ -434,7 +434,7 @@ mmc@f9824900 {
		status = "disabled";
		};

		mmc@f98a4900 {
		sdhc_2: mmc@f98a4900 {
		compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";
		reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;
		reg-names = "hc", "core";