Commit d3769729 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: sm8250: split spi pinctrl config



As discussed on linux-arm-msm list, start splitting sm8250 pinctrl
settings into generic and board-specific parts. The first part to
receive such treatment is the spi, so split spi pinconf to the board
device tree.

Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20210210133458.1201066-2-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 68119b3a
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -1348,3 +1348,9 @@
	vdd-micb-supply = <&vreg_s4a_1p8>;
	qcom,dmic-sample-rate = <600000>;
};

/* PINCTRL - additions to nodes defined in sm8250.dtsi */
&qup_spi0_default {
	drive-strength = <6>;
	bias-disable;
};
+60 −240
Original line number Diff line number Diff line
@@ -2984,305 +2984,125 @@
			};

			qup_spi0_default: qup-spi0-default {
				mux {
				pins = "gpio28", "gpio29",
				       "gpio30", "gpio31";
				function = "qup0";
			};

				config {
					pins = "gpio28", "gpio29",
					       "gpio30", "gpio31";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi1_default: qup-spi1-default {
				mux {
				pins = "gpio4", "gpio5",
				       "gpio6", "gpio7";
				function = "qup1";
			};

				config {
					pins = "gpio4", "gpio5",
					       "gpio6", "gpio7";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi2_default: qup-spi2-default {
				mux {
				pins = "gpio115", "gpio116",
				       "gpio117", "gpio118";
				function = "qup2";
			};

				config {
					pins = "gpio115", "gpio116",
					       "gpio117", "gpio118";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi3_default: qup-spi3-default {
				mux {
				pins = "gpio119", "gpio120",
				       "gpio121", "gpio122";
				function = "qup3";
			};

				config {
					pins = "gpio119", "gpio120",
					       "gpio121", "gpio122";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi4_default: qup-spi4-default {
				mux {
				pins = "gpio8", "gpio9",
				       "gpio10", "gpio11";
				function = "qup4";
			};

				config {
					pins = "gpio8", "gpio9",
					       "gpio10", "gpio11";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi5_default: qup-spi5-default {
				mux {
				pins = "gpio12", "gpio13",
				       "gpio14", "gpio15";
				function = "qup5";
			};

				config {
					pins = "gpio12", "gpio13",
					       "gpio14", "gpio15";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi6_default: qup-spi6-default {
				mux {
				pins = "gpio16", "gpio17",
				       "gpio18", "gpio19";
				function = "qup6";
			};

				config {
					pins = "gpio16", "gpio17",
					       "gpio18", "gpio19";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi7_default: qup-spi7-default {
				mux {
				pins = "gpio20", "gpio21",
				       "gpio22", "gpio23";
				function = "qup7";
			};

				config {
					pins = "gpio20", "gpio21",
					       "gpio22", "gpio23";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi8_default: qup-spi8-default {
				mux {
				pins = "gpio24", "gpio25",
				       "gpio26", "gpio27";
				function = "qup8";
			};

				config {
					pins = "gpio24", "gpio25",
					       "gpio26", "gpio27";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi9_default: qup-spi9-default {
				mux {
				pins = "gpio125", "gpio126",
				       "gpio127", "gpio128";
				function = "qup9";
			};

				config {
					pins = "gpio125", "gpio126",
					       "gpio127", "gpio128";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi10_default: qup-spi10-default {
				mux {
				pins = "gpio129", "gpio130",
				       "gpio131", "gpio132";
				function = "qup10";
			};

				config {
					pins = "gpio129", "gpio130",
					       "gpio131", "gpio132";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi11_default: qup-spi11-default {
				mux {
				pins = "gpio60", "gpio61",
				       "gpio62", "gpio63";
				function = "qup11";
			};

				config {
					pins = "gpio60", "gpio61",
					       "gpio62", "gpio63";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi12_default: qup-spi12-default {
				mux {
				pins = "gpio32", "gpio33",
				       "gpio34", "gpio35";
				function = "qup12";
			};

				config {
					pins = "gpio32", "gpio33",
					       "gpio34", "gpio35";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi13_default: qup-spi13-default {
				mux {
				pins = "gpio36", "gpio37",
				       "gpio38", "gpio39";
				function = "qup13";
			};

				config {
					pins = "gpio36", "gpio37",
					       "gpio38", "gpio39";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi14_default: qup-spi14-default {
				mux {
				pins = "gpio40", "gpio41",
				       "gpio42", "gpio43";
				function = "qup14";
			};

				config {
					pins = "gpio40", "gpio41",
					       "gpio42", "gpio43";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi15_default: qup-spi15-default {
				mux {
				pins = "gpio44", "gpio45",
				       "gpio46", "gpio47";
				function = "qup15";
			};

				config {
					pins = "gpio44", "gpio45",
					       "gpio46", "gpio47";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi16_default: qup-spi16-default {
				mux {
				pins = "gpio48", "gpio49",
				       "gpio50", "gpio51";
				function = "qup16";
			};

				config {
					pins = "gpio48", "gpio49",
					       "gpio50", "gpio51";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi17_default: qup-spi17-default {
				mux {
				pins = "gpio52", "gpio53",
				       "gpio54", "gpio55";
				function = "qup17";
			};

				config {
					pins = "gpio52", "gpio53",
					       "gpio54", "gpio55";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi18_default: qup-spi18-default {
				mux {
				pins = "gpio56", "gpio57",
				       "gpio58", "gpio59";
				function = "qup18";
			};

				config {
					pins = "gpio56", "gpio57",
					       "gpio58", "gpio59";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_spi19_default: qup-spi19-default {
				mux {
				pins = "gpio0", "gpio1",
				       "gpio2", "gpio3";
				function = "qup19";
			};

				config {
					pins = "gpio0", "gpio1",
					       "gpio2", "gpio3";
					drive-strength = <6>;
					bias-disable;
				};
			};

			qup_uart2_default: qup-uart2-default {
				mux {
					pins = "gpio117", "gpio118";