Unverified Commit 985d7fef authored Jan 10, 2023 by Arnd Bergmann

Merge tag 'qcom-dts-fixes-for-6.2' of...

Merge tag 'qcom-dts-fixes-for-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

Qualcomm ARM32 DTS fix for 6.2

This fixes a regression on Inforce 6540, as the sdhci nodes no longer
overrides the platform's mmc nodes.

* tag 'qcom-dts-fixes-for-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: dts: qcom: apq8084-ifc6540: fix overriding SDHCI

Link: https://lore.kernel.org/r/20230110212750.2182904-1-andersson@kernel.org


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 6437c029 0154252a

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";