Commit a7374752 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: sm8450: align TLMM pin configuration with DT schema 



DT schema expects TLMM pin configuration nodes to be named with '-state'
suffix and their optional children with '-pins' suffix.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220912061746.6311-39-krzysztof.kozlowski@linaro.org
parent e227fa29

arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts

+6 −6
Original line number Diff line number Diff line
@@ -572,27 +572,27 @@ 
&tlmm {

	gpio-reserved-ranges = <28 4>;



	sdc2_default_state: sdc2-default {

		clk {

	sdc2_default_state: sdc2-default-state {

		clk-pins {

			pins = "sdc2_clk";

			drive-strength = <16>;

			bias-disable;

		};



		cmd {

		cmd-pins {

			pins = "sdc2_cmd";

			drive-strength = <16>;

			bias-pull-up;

		};



		data {

		data-pins {

			pins = "sdc2_data";

			drive-strength = <16>;

			bias-pull-up;

		};

	};



	ts_int_default: ts-int-default {

	ts_int_default: ts-int-default-state {

		pins = "gpio23";

		function = "gpio";

		drive-strength = <2>;
@@ -600,7 +600,7 @@ 
		input-enable;

	};



	sdc2_card_det_n: sd-card-det-n {

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

		pins = "gpio92";

		function = "gpio";

		drive-strength = <2>;

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

+76 −76
Original line number Diff line number Diff line
@@ -2384,20 +2384,20 @@ 
			gpio-ranges = <&tlmm 0 0 211>;

			wakeup-parent = <&pdc>;



			sdc2_sleep_state: sdc2-sleep {

				clk {

			sdc2_sleep_state: sdc2-sleep-state {

				clk-pins {

					pins = "sdc2_clk";

					drive-strength = <2>;

					bias-disable;

				};



				cmd {

				cmd-pins {

					pins = "sdc2_cmd";

					drive-strength = <2>;

					bias-pull-up;

				};



				data {

				data-pins {

					pins = "sdc2_data";

					drive-strength = <2>;

					bias-pull-up;
@@ -2405,21 +2405,21 @@ 
			};



			pcie0_default_state: pcie0-default-state {

				perst {

				perst-pins {

					pins = "gpio94";

					function = "gpio";

					drive-strength = <2>;

					bias-pull-down;

				};



				clkreq {

				clkreq-pins {

					pins = "gpio95";

					function = "pcie0_clkreqn";

					drive-strength = <2>;

					bias-pull-up;

				};



				wake {

				wake-pins {

					pins = "gpio96";

					function = "gpio";

					drive-strength = <2>;
@@ -2428,21 +2428,21 @@ 
			};



			pcie1_default_state: pcie1-default-state {

				perst {

				perst-pins {

					pins = "gpio97";

					function = "gpio";

					drive-strength = <2>;

					bias-pull-down;

				};



				clkreq {

				clkreq-pins {

					pins = "gpio98";

					function = "pcie1_clkreqn";

					drive-strength = <2>;

					bias-pull-up;

				};



				wake {

				wake-pins {

					pins = "gpio99";

					function = "gpio";

					drive-strength = <2>;
@@ -2450,350 +2450,350 @@ 
				};

			};



			qup_i2c0_data_clk: qup-i2c0-data-clk {

			qup_i2c0_data_clk: qup-i2c0-data-clk-state {

				pins = "gpio0", "gpio1";

				function = "qup0";

			};



			qup_i2c1_data_clk: qup-i2c1-data-clk {

			qup_i2c1_data_clk: qup-i2c1-data-clk-state {

				pins = "gpio4", "gpio5";

				function = "qup1";

			};



			qup_i2c2_data_clk: qup-i2c2-data-clk {

			qup_i2c2_data_clk: qup-i2c2-data-clk-state {

				pins = "gpio8", "gpio9";

				function = "qup2";

			};



			qup_i2c3_data_clk: qup-i2c3-data-clk {

			qup_i2c3_data_clk: qup-i2c3-data-clk-state {

				pins = "gpio12", "gpio13";

				function = "qup3";

			};



			qup_i2c4_data_clk: qup-i2c4-data-clk {

			qup_i2c4_data_clk: qup-i2c4-data-clk-state {

				pins = "gpio16", "gpio17";

				function = "qup4";

			};



			qup_i2c5_data_clk: qup-i2c5-data-clk {

			qup_i2c5_data_clk: qup-i2c5-data-clk-state {

				pins = "gpio206", "gpio207";

				function = "qup5";

			};



			qup_i2c6_data_clk: qup-i2c6-data-clk {

			qup_i2c6_data_clk: qup-i2c6-data-clk-state {

				pins = "gpio20", "gpio21";

				function = "qup6";

			};



			qup_i2c8_data_clk: qup-i2c8-data-clk {

			qup_i2c8_data_clk: qup-i2c8-data-clk-state {

				pins = "gpio28", "gpio29";

				function = "qup8";

			};



			qup_i2c9_data_clk: qup-i2c9-data-clk {

			qup_i2c9_data_clk: qup-i2c9-data-clk-state {

				pins = "gpio32", "gpio33";

				function = "qup9";

			};



			qup_i2c10_data_clk: qup-i2c10-data-clk {

			qup_i2c10_data_clk: qup-i2c10-data-clk-state {

				pins = "gpio36", "gpio37";

				function = "qup10";

			};



			qup_i2c11_data_clk: qup-i2c11-data-clk {

			qup_i2c11_data_clk: qup-i2c11-data-clk-state {

				pins = "gpio40", "gpio41";

				function = "qup11";

			};



			qup_i2c12_data_clk: qup-i2c12-data-clk {

			qup_i2c12_data_clk: qup-i2c12-data-clk-state {

				pins = "gpio44", "gpio45";

				function = "qup12";

			};



			qup_i2c13_data_clk: qup-i2c13-data-clk {

			qup_i2c13_data_clk: qup-i2c13-data-clk-state {

				pins = "gpio48", "gpio49";

				function = "qup13";

				drive-strength = <2>;

				bias-pull-up;

			};



			qup_i2c14_data_clk: qup-i2c14-data-clk {

			qup_i2c14_data_clk: qup-i2c14-data-clk-state {

				pins = "gpio52", "gpio53";

				function = "qup14";

				drive-strength = <2>;

				bias-pull-up;

			};



			qup_i2c15_data_clk: qup-i2c15-data-clk {

			qup_i2c15_data_clk: qup-i2c15-data-clk-state {

				pins = "gpio56", "gpio57";

				function = "qup15";

			};



			qup_i2c16_data_clk: qup-i2c16-data-clk {

			qup_i2c16_data_clk: qup-i2c16-data-clk-state {

				pins = "gpio60", "gpio61";

				function = "qup16";

			};



			qup_i2c17_data_clk: qup-i2c17-data-clk {

			qup_i2c17_data_clk: qup-i2c17-data-clk-state {

				pins = "gpio64", "gpio65";

				function = "qup17";

			};



			qup_i2c18_data_clk: qup-i2c18-data-clk {

			qup_i2c18_data_clk: qup-i2c18-data-clk-state {

				pins = "gpio68", "gpio69";

				function = "qup18";

			};



			qup_i2c19_data_clk: qup-i2c19-data-clk {

			qup_i2c19_data_clk: qup-i2c19-data-clk-state {

				pins = "gpio72", "gpio73";

				function = "qup19";

			};



			qup_i2c20_data_clk: qup-i2c20-data-clk {

			qup_i2c20_data_clk: qup-i2c20-data-clk-state {

				pins = "gpio76", "gpio77";

				function = "qup20";

			};



			qup_i2c21_data_clk: qup-i2c21-data-clk {

			qup_i2c21_data_clk: qup-i2c21-data-clk-state {

				pins = "gpio80", "gpio81";

				function = "qup21";

			};



			qup_spi0_cs: qup-spi0-cs {

			qup_spi0_cs: qup-spi0-cs-state {

				pins = "gpio3";

				function = "qup0";

			};



			qup_spi0_data_clk: qup-spi0-data-clk {

			qup_spi0_data_clk: qup-spi0-data-clk-state {

				pins = "gpio0", "gpio1", "gpio2";

				function = "qup0";

			};



			qup_spi1_cs: qup-spi1-cs {

			qup_spi1_cs: qup-spi1-cs-state {

				pins = "gpio7";

				function = "qup1";

			};



			qup_spi1_data_clk: qup-spi1-data-clk {

			qup_spi1_data_clk: qup-spi1-data-clk-state {

				pins = "gpio4", "gpio5", "gpio6";

				function = "qup1";

			};



			qup_spi2_cs: qup-spi2-cs {

			qup_spi2_cs: qup-spi2-cs-state {

				pins = "gpio11";

				function = "qup2";

			};



			qup_spi2_data_clk: qup-spi2-data-clk {

			qup_spi2_data_clk: qup-spi2-data-clk-state {

				pins = "gpio8", "gpio9", "gpio10";

				function = "qup2";

			};



			qup_spi3_cs: qup-spi3-cs {

			qup_spi3_cs: qup-spi3-cs-state {

				pins = "gpio15";

				function = "qup3";

			};



			qup_spi3_data_clk: qup-spi3-data-clk {

			qup_spi3_data_clk: qup-spi3-data-clk-state {

				pins = "gpio12", "gpio13", "gpio14";

				function = "qup3";

			};



			qup_spi4_cs: qup-spi4-cs {

			qup_spi4_cs: qup-spi4-cs-state {

				pins = "gpio19";

				function = "qup4";

				drive-strength = <6>;

				bias-disable;

			};



			qup_spi4_data_clk: qup-spi4-data-clk {

			qup_spi4_data_clk: qup-spi4-data-clk-state {

				pins = "gpio16", "gpio17", "gpio18";

				function = "qup4";

			};



			qup_spi5_cs: qup-spi5-cs {

			qup_spi5_cs: qup-spi5-cs-state {

				pins = "gpio85";

				function = "qup5";

			};



			qup_spi5_data_clk: qup-spi5-data-clk {

			qup_spi5_data_clk: qup-spi5-data-clk-state {

				pins = "gpio206", "gpio207", "gpio84";

				function = "qup5";

			};



			qup_spi6_cs: qup-spi6-cs {

			qup_spi6_cs: qup-spi6-cs-state {

				pins = "gpio23";

				function = "qup6";

			};



			qup_spi6_data_clk: qup-spi6-data-clk {

			qup_spi6_data_clk: qup-spi6-data-clk-state {

				pins = "gpio20", "gpio21", "gpio22";

				function = "qup6";

			};



			qup_spi8_cs: qup-spi8-cs {

			qup_spi8_cs: qup-spi8-cs-state {

				pins = "gpio31";

				function = "qup8";

			};



			qup_spi8_data_clk: qup-spi8-data-clk {

			qup_spi8_data_clk: qup-spi8-data-clk-state {

				pins = "gpio28", "gpio29", "gpio30";

				function = "qup8";

			};



			qup_spi9_cs: qup-spi9-cs {

			qup_spi9_cs: qup-spi9-cs-state {

				pins = "gpio35";

				function = "qup9";

			};



			qup_spi9_data_clk: qup-spi9-data-clk {

			qup_spi9_data_clk: qup-spi9-data-clk-state {

				pins = "gpio32", "gpio33", "gpio34";

				function = "qup9";

			};



			qup_spi10_cs: qup-spi10-cs {

			qup_spi10_cs: qup-spi10-cs-state {

				pins = "gpio39";

				function = "qup10";

			};



			qup_spi10_data_clk: qup-spi10-data-clk {

			qup_spi10_data_clk: qup-spi10-data-clk-state {

				pins = "gpio36", "gpio37", "gpio38";

				function = "qup10";

			};



			qup_spi11_cs: qup-spi11-cs {

			qup_spi11_cs: qup-spi11-cs-state {

				pins = "gpio43";

				function = "qup11";

			};



			qup_spi11_data_clk: qup-spi11-data-clk {

			qup_spi11_data_clk: qup-spi11-data-clk-state {

				pins = "gpio40", "gpio41", "gpio42";

				function = "qup11";

			};



			qup_spi12_cs: qup-spi12-cs {

			qup_spi12_cs: qup-spi12-cs-state {

				pins = "gpio47";

				function = "qup12";

			};



			qup_spi12_data_clk: qup-spi12-data-clk {

			qup_spi12_data_clk: qup-spi12-data-clk-state {

				pins = "gpio44", "gpio45", "gpio46";

				function = "qup12";

			};



			qup_spi13_cs: qup-spi13-cs {

			qup_spi13_cs: qup-spi13-cs-state {

				pins = "gpio51";

				function = "qup13";

			};



			qup_spi13_data_clk: qup-spi13-data-clk {

			qup_spi13_data_clk: qup-spi13-data-clk-state {

				pins = "gpio48", "gpio49", "gpio50";

				function = "qup13";

			};



			qup_spi14_cs: qup-spi14-cs {

			qup_spi14_cs: qup-spi14-cs-state {

				pins = "gpio55";

				function = "qup14";

			};



			qup_spi14_data_clk: qup-spi14-data-clk {

			qup_spi14_data_clk: qup-spi14-data-clk-state {

				pins = "gpio52", "gpio53", "gpio54";

				function = "qup14";

			};



			qup_spi15_cs: qup-spi15-cs {

			qup_spi15_cs: qup-spi15-cs-state {

				pins = "gpio59";

				function = "qup15";

			};



			qup_spi15_data_clk: qup-spi15-data-clk {

			qup_spi15_data_clk: qup-spi15-data-clk-state {

				pins = "gpio56", "gpio57", "gpio58";

				function = "qup15";

			};



			qup_spi16_cs: qup-spi16-cs {

			qup_spi16_cs: qup-spi16-cs-state {

				pins = "gpio63";

				function = "qup16";

			};



			qup_spi16_data_clk: qup-spi16-data-clk {

			qup_spi16_data_clk: qup-spi16-data-clk-state {

				pins = "gpio60", "gpio61", "gpio62";

				function = "qup16";

			};



			qup_spi17_cs: qup-spi17-cs {

			qup_spi17_cs: qup-spi17-cs-state {

				pins = "gpio67";

				function = "qup17";

			};



			qup_spi17_data_clk: qup-spi17-data-clk {

			qup_spi17_data_clk: qup-spi17-data-clk-state {

				pins = "gpio64", "gpio65", "gpio66";

				function = "qup17";

			};



			qup_spi18_cs: qup-spi18-cs {

			qup_spi18_cs: qup-spi18-cs-state {

				pins = "gpio71";

				function = "qup18";

				drive-strength = <6>;

				bias-disable;

			};



			qup_spi18_data_clk: qup-spi18-data-clk {

			qup_spi18_data_clk: qup-spi18-data-clk-state {

				pins = "gpio68", "gpio69", "gpio70";

				function = "qup18";

				drive-strength = <6>;

				bias-disable;

			};



			qup_spi19_cs: qup-spi19-cs {

			qup_spi19_cs: qup-spi19-cs-state {

				pins = "gpio75";

				function = "qup19";

				drive-strength = <6>;

				bias-disable;

			};



			qup_spi19_data_clk: qup-spi19-data-clk {

			qup_spi19_data_clk: qup-spi19-data-clk-state {

				pins = "gpio72", "gpio73", "gpio74";

				function = "qup19";

				drive-strength = <6>;

				bias-disable;

			};



			qup_spi20_cs: qup-spi20-cs {

			qup_spi20_cs: qup-spi20-cs-state {

				pins = "gpio79";

				function = "qup20";

			};



			qup_spi20_data_clk: qup-spi20-data-clk {

			qup_spi20_data_clk: qup-spi20-data-clk-state {

				pins = "gpio76", "gpio77", "gpio78";

				function = "qup20";

			};



			qup_spi21_cs: qup-spi21-cs {

			qup_spi21_cs: qup-spi21-cs-state {

				pins = "gpio83";

				function = "qup21";

			};



			qup_spi21_data_clk: qup-spi21-data-clk {

			qup_spi21_data_clk: qup-spi21-data-clk-state {

				pins = "gpio80", "gpio81", "gpio82";

				function = "qup21";

			};



			qup_uart7_rx: qup-uart7-rx {

			qup_uart7_rx: qup-uart7-rx-state {

				pins = "gpio26";

				function = "qup7";

				drive-strength = <2>;

				bias-disable;

			};



			qup_uart7_tx: qup-uart7-tx {

			qup_uart7_tx: qup-uart7-tx-state {

				pins = "gpio27";

				function = "qup7";

				drive-strength = <2>;

				bias-disable;

			};



			qup_uart20_default: qup-uart20-default {

			qup_uart20_default: qup-uart20-default-state {

				pins = "gpio76", "gpio77", "gpio78", "gpio79";

				function = "qup20";

			};