Commit 64cf6268 authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Bjorn Andersson
Browse files

ARM: dts: qcom-msm8974: Fix up SDHCI nodes 



- Add missing labels (and remove their redefinition from klte)
- Commonize bus-width
- Add non-removable on sdhc_1, as it's supposed to have an eMMC on it

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220415115633.575010-7-konrad.dybcio@somainline.org
parent 4de36f7b

arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts

+2 −2
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ te { 
		};

	};



	sdhc_1: sdhci@f9824900 {

	sdhci@f9824900 {

		status = "okay";



		vmmc-supply = <&pma8084_l20>;
@@ -547,7 +547,7 @@ sdhc_1: sdhci@f9824900 { 
		pinctrl-0 = <&sdhc1_pin_a>;

	};



	sdhc_2: sdhci@f9864900 {

	sdhci@f9864900 {

		status = "okay";



		max-frequency = <100000000>;

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

+10 −3
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ blsp2_uart4: serial@f9960000 { 
			status = "disabled";

		};



		sdhci@f9824900 {

		sdhc_1: sdhci@f9824900 {

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

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

			reg-names = "hc_mem", "core_mem";
@@ -751,10 +751,13 @@ sdhci@f9824900 { 
				 <&gcc GCC_SDCC1_AHB_CLK>,

				 <&xo_board>;

			clock-names = "core", "iface", "xo";

			bus-width = <8>;

			non-removable;



			status = "disabled";

		};



		sdhci@f9864900 {

		sdhc_3: sdhci@f9864900 {

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

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

			reg-names = "hc_mem", "core_mem";
@@ -765,10 +768,12 @@ sdhci@f9864900 { 
				 <&gcc GCC_SDCC3_AHB_CLK>,

				 <&xo_board>;

			clock-names = "core", "iface", "xo";

			bus-width = <4>;



			status = "disabled";

		};



		sdhci@f98a4900 {

		sdhc_2: sdhci@f98a4900 {

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

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

			reg-names = "hc_mem", "core_mem";
@@ -779,6 +784,8 @@ sdhci@f98a4900 { 
				 <&gcc GCC_SDCC2_AHB_CLK>,

				 <&xo_board>;

			clock-names = "core", "iface", "xo";

			bus-width = <4>;



			status = "disabled";

		};