Commit 2477d819 authored by Bhupesh Sharma's avatar Bhupesh Sharma Committed by Bjorn Andersson
Browse files

ARM: dts: qcom: Fix sdhci node names - use 'mmc@' 



Since the Qualcomm sdhci-msm device-tree binding has been converted
to yaml format, 'make dtbs_check' reports issues with
inconsistent 'sdhci@' convention used for specifying the
sdhci nodes. The generic mmc bindings expect 'mmc@' format
instead.

Fix the same.

Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: default avatarBhupesh Sharma <bhupesh.sharma@linaro.org>
[bjorn: Extracted from combined arm64 patch]
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220514215424.1007718-2-bhupesh.sharma@linaro.org
parent fe5651cc

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

+2 −2
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ blsp2_uart2: serial@f995e000 { 
			status = "disabled";

		};



		sdhci@f9824900 {

		mmc@f9824900 {

			compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";

			reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;

			reg-names = "hc_mem", "core_mem";
@@ -432,7 +432,7 @@ sdhci@f9824900 { 
			status = "disabled";

		};



		sdhci@f98a4900 {

		mmc@f98a4900 {

			compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";

			reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;

			reg-names = "hc_mem", "core_mem";

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

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ vqmmc: regulator@1948000 { 
			status = "disabled";

		};



		sdhci: sdhci@7824900 {

		sdhci: mmc@7824900 {

			compatible = "qcom,sdhci-msm-v4";

			reg = <0x7824900 0x11c>, <0x7824000 0x800>;

			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;

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

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ apcs: syscon@f9011000 { 
			reg = <0xf9011000 0x1000>;

		};



		sdhc_1: sdhci@f9824900 {

		sdhc_1: mmc@f9824900 {

			compatible = "qcom,msm8226-sdhci", "qcom,sdhci-msm-v4";

			reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;

			reg-names = "hc_mem", "core_mem";
@@ -150,7 +150,7 @@ sdhc_1: sdhci@f9824900 { 
			status = "disabled";

		};



		sdhc_2: sdhci@f98a4900 {

		sdhc_2: mmc@f98a4900 {

			compatible = "qcom,msm8226-sdhci", "qcom,sdhci-msm-v4";

			reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;

			reg-names = "hc_mem", "core_mem";
@@ -166,7 +166,7 @@ sdhc_2: sdhci@f98a4900 { 
			status = "disabled";

		};



		sdhc_3: sdhci@f9864900 {

		sdhc_3: mmc@f9864900 {

			compatible = "qcom,msm8226-sdhci", "qcom,sdhci-msm-v4";

			reg = <0xf9864900 0x11c>, <0xf9864000 0x800>;

			reg-names = "hc_mem", "core_mem";

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

+3 −3
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ acc3: clock-controller@f90b8000 { 
			reg = <0xf90b8000 0x1000>, <0xf9008000 0x1000>;

		};



		sdhc_1: sdhci@f9824900 {

		sdhc_1: mmc@f9824900 {

			compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4";

			reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;

			reg-names = "hc_mem", "core_mem";
@@ -453,7 +453,7 @@ sdhc_1: sdhci@f9824900 { 
			status = "disabled";

		};



		sdhc_3: sdhci@f9864900 {

		sdhc_3: mmc@f9864900 {

			compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4";

			reg = <0xf9864900 0x11c>, <0xf9864000 0x800>;

			reg-names = "hc_mem", "core_mem";
@@ -472,7 +472,7 @@ sdhc_3: sdhci@f9864900 { 
			status = "disabled";

		};



		sdhc_2: sdhci@f98a4900 {

		sdhc_2: mmc@f98a4900 {

			compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4";

			reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;

			reg-names = "hc_mem", "core_mem";

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

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ tcsr: syscon@1fcb000 { 
			reg = <0x01fc0000 0x1000>;

		};



		sdhc_1: sdhci@8804000 {

		sdhc_1: mmc@8804000 {

			compatible = "qcom,sdx55-sdhci", "qcom,sdhci-msm-v5";

			reg = <0x08804000 0x1000>;

			interrupts = <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,