Commit 27ad7815 authored by Bhupesh Sharma's avatar Bhupesh Sharma Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: sm6115: Move SDHC node(s)'s 'pinctrl' properties to dts 



Normally the 'pinctrl' properties of a SDHC controller and the
chip detect pin settings are dependent on the type of the slots
(for e.g uSD card slot), regulators and GPIO(s) available on the
board(s).

So, move the same from the sm6115 dtsi file to the respective
board file(s).

Reviewed-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: default avatarBhupesh Sharma <bhupesh.sharma@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230314074001.1873781-1-bhupesh.sharma@linaro.org
parent 1f1e5122

arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts

+10 −0
Original line number Diff line number Diff line
@@ -202,12 +202,22 @@ &sdhc_2 { 
	vqmmc-supply = <&vreg_l5a>;



	cd-gpios = <&tlmm 88 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc2_state_on &sdc2_card_det_n>;

	pinctrl-1 = <&sdc2_state_off &sdc2_card_det_n>;



	status = "okay";

};



&tlmm {

	gpio-reserved-ranges = <14 4>;



	sdc2_card_det_n: sd-card-det-n-state {

		pins = "gpio88";

		function = "gpio";

		drive-strength = <2>;

		bias-pull-up;

	};

};



&ufs_mem_hc {

arch/arm64/boot/dts/qcom/sm6115.dtsi

+0 −22
Original line number Diff line number Diff line
@@ -603,13 +603,6 @@ data-pins { 
					bias-pull-up;

					drive-strength = <10>;

				};



				sd-cd-pins {

					pins = "gpio88";

					function = "gpio";

					bias-pull-up;

					drive-strength = <2>;

				};

			};



			sdc2_state_off: sdc2-off-state {
@@ -630,13 +623,6 @@ data-pins { 
					bias-pull-up;

					drive-strength = <2>;

				};



				sd-cd-pins {

					pins = "gpio88";

					function = "gpio";

					bias-disable;

					drive-strength = <2>;

				};

			};

		};
@@ -739,10 +725,6 @@ sdhc_1: mmc@4744000 { 
				 <&gcc GCC_SDCC1_ICE_CORE_CLK>;

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



			pinctrl-0 = <&sdc1_state_on>;

			pinctrl-1 = <&sdc1_state_off>;

			pinctrl-names = "default", "sleep";



			bus-width = <8>;

			status = "disabled";

		};
@@ -761,10 +743,6 @@ sdhc_2: mmc@4784000 { 
				 <&rpmcc RPM_SMD_XO_CLK_SRC>;

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



			pinctrl-0 = <&sdc2_state_on>;

			pinctrl-1 = <&sdc2_state_off>;

			pinctrl-names = "default", "sleep";



			power-domains = <&rpmpd SM6115_VDDCX>;

			operating-points-v2 = <&sdhc2_opp_table>;

			iommus = <&apps_smmu 0x00a0 0x0>;