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

arm64: dts: qcom: sdm845: 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>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221222151319.122398-3-krzysztof.kozlowski@linaro.org
parent e5011447

arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi

+136 −261
Original line number Diff line number Diff line
@@ -995,104 +995,69 @@ ap_ts_i2c: &i2c14 { 
/* PINCTRL - additions to nodes defined in sdm845.dtsi */



&qspi_cs0 {

	pinconf {

		pins = "gpio90";

	bias-disable;

};

};



&qspi_clk {

	pinconf {

		pins = "gpio95";

	bias-disable;

};

};



&qspi_data01 {

	pinconf {

		pins = "gpio91", "gpio92";



	/* High-Z when no transfers; nice to park the lines */

	bias-pull-up;

};

};



&qup_i2c3_default {

	pinconf {

		pins = "gpio41", "gpio42";

	drive-strength = <2>;



	/* Has external pullup */

	bias-disable;

};

};



&qup_i2c11_default {

	pinconf {

		pins = "gpio31", "gpio32";

	drive-strength = <2>;



	/* Has external pullup */

	bias-disable;

};

};



&qup_i2c12_default {

	pinconf {

		pins = "gpio49", "gpio50";

	drive-strength = <2>;



	/* Has external pullup */

	bias-disable;

};

};



&qup_i2c14_default {

	pinconf {

		pins = "gpio33", "gpio34";

	drive-strength = <2>;



	/* Has external pullup */

	bias-disable;

};

};



&qup_spi0_default {

	pinconf {

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

	drive-strength = <2>;

	bias-disable;

};

};



&qup_spi5_default {

	pinconf {

		pins = "gpio85", "gpio86", "gpio87", "gpio88";

	drive-strength = <2>;

	bias-disable;

};

};



&qup_spi10_default {

	pinconf {

		pins = "gpio53", "gpio54", "gpio55", "gpio56";

	drive-strength = <2>;

	bias-disable;

};

};



&qup_uart9_default {

	pinconf-tx {

		pins = "gpio4";

&qup_uart9_rx {

	drive-strength = <2>;

		bias-disable;

	bias-pull-up;

};



	pinconf-rx {

		pins = "gpio5";

&qup_uart9_tx {

	drive-strength = <2>;

		bias-pull-up;

	};

	bias-disable;

};



/* PINCTRL - board-specific pinctrl */
@@ -1180,141 +1145,80 @@ ap_ts_i2c: &i2c14 { 
		output-low;

	};



	ap_edp_bklten: ap-edp-bklten {

		pinmux {

	ap_edp_bklten: ap-edp-bklten-state {

		pins = "gpio37";

		function = "gpio";

		};



		pinconf {

			pins = "gpio37";

		drive-strength = <2>;

		bias-disable;

	};

	};



	bios_flash_wp_r_l: bios-flash-wp-r-l {

		pinmux {

	bios_flash_wp_r_l: bios-flash-wp-r-l-state {

		pins = "gpio128";

		function = "gpio";

		input-enable;

		};



		pinconf {

			pins = "gpio128";

		bias-disable;

	};

	};



	ec_ap_int_l: ec-ap-int-l {

		pinmux {

	ec_ap_int_l: ec-ap-int-l-state {

	       pins = "gpio122";

	       function = "gpio";

	       input-enable;

		};



		pinconf {

		       pins = "gpio122";

	       bias-pull-up;

	};

	};



	edp_brij_en: edp-brij-en {

		pinmux {

	edp_brij_en: edp-brij-en-state {

		pins = "gpio102";

		function = "gpio";

		};



		pinconf {

			pins = "gpio102";

		drive-strength = <2>;

		bias-disable;

	};

	};



	edp_brij_irq: edp-brij-irq {

		pinmux {

	edp_brij_irq: edp-brij-irq-state {

		pins = "gpio10";

		function = "gpio";

		};



		pinconf {

			pins = "gpio10";

		drive-strength = <2>;

		bias-pull-down;

	};

	};



	en_pp3300_dx_edp: en-pp3300-dx-edp {

		pinmux {

	en_pp3300_dx_edp: en-pp3300-dx-edp-state {

		pins = "gpio43";

		function = "gpio";

		};



		pinconf {

			pins = "gpio43";

		drive-strength = <2>;

		bias-disable;

	};

	};



	h1_ap_int_odl: h1-ap-int-odl {

		pinmux {

	h1_ap_int_odl: h1-ap-int-odl-state {

		pins = "gpio129";

		function = "gpio";

		input-enable;

		};



		pinconf {

			pins = "gpio129";

		bias-pull-up;

	};

	};



	pen_eject_odl: pen-eject-odl {

		pinmux {

	pen_eject_odl: pen-eject-odl-state {

		pins = "gpio119";

		function = "gpio";

		bias-pull-up;

	};

	};



	pen_irq_l: pen-irq-l {

		pinmux {

	pen_irq_l: pen-irq-l-state {

		pins = "gpio24";

		function = "gpio";

		};



		pinconf {

			pins = "gpio24";



		/* Has external pullup */

		bias-disable;

	};

	};



	pen_pdct_l: pen-pdct-l {

		pinmux {

	pen_pdct_l: pen-pdct-l-state {

		pins = "gpio63";

		function = "gpio";

		};



		pinconf {

			pins = "gpio63";



		/* Has external pullup */

		bias-disable;

	};

	};



	pen_rst_l: pen-rst-l {

		pinmux {

	pen_rst_l: pen-rst-l-state {

		pins = "gpio23";

		function = "gpio";

		};



		pinconf {

			pins = "gpio23";

		bias-disable;

		drive-strength = <2>;
@@ -1331,10 +1235,8 @@ ap_ts_i2c: &i2c14 { 
		 */

		output-high;

	};

	};



	sdc2_clk: sdc2-clk {

		pinconf {

	sdc2_clk: sdc2-clk-state {

		pins = "sdc2_clk";

		bias-disable;
@@ -1344,73 +1246,47 @@ ap_ts_i2c: &i2c14 { 
		 */

		drive-strength = <16>;

	};

	};



	sdc2_cmd: sdc2-cmd {

		pinconf {

	sdc2_cmd: sdc2-cmd-state {

		pins = "sdc2_cmd";

		bias-pull-up;

		drive-strength = <16>;

	};

	};



	sdc2_data: sdc2-data {

		pinconf {

	sdc2_data: sdc2-data-state {

		pins = "sdc2_data";

		bias-pull-up;

		drive-strength = <16>;

	};

	};



	sd_cd_odl: sd-cd-odl {

		pinmux {

	sd_cd_odl: sd-cd-odl-state {

		pins = "gpio44";

		function = "gpio";

		};



		pinconf {

			pins = "gpio44";

		bias-pull-up;

	};

	};



	ts_int_l: ts-int-l {

		pinmux {

	ts_int_l: ts-int-l-state {

		pins = "gpio125";

		function = "gpio";

		};



		pinconf {

			pins = "gpio125";

		bias-pull-up;

	};

	};



	ts_reset_l: ts-reset-l {

		pinmux {

	ts_reset_l: ts-reset-l-state {

		pins = "gpio118";

		function = "gpio";

		};



		pinconf {

			pins = "gpio118";

		bias-disable;

		drive-strength = <2>;

	};

	};



	ap_suspend_l_assert: ap_suspend_l_assert {

		config {

	ap_suspend_l_assert: ap-suspend-l-assert-state {

		pins = "gpio126";

		function = "gpio";

		bias-disable;

		drive-strength = <2>;

		output-low;

	};

	};



	ap_suspend_l_deassert: ap_suspend_l_deassert {

		config {

	ap_suspend_l_deassert: ap-suspend-l-deassert-state {

		pins = "gpio126";

		function = "gpio";

		bias-disable;
@@ -1418,7 +1294,6 @@ ap_ts_i2c: &i2c14 { 
		output-high;

	};

};

};



&venus {

	status = "okay";

arch/arm64/boot/dts/qcom/sdm845-db845c.dts

+38 −55
Original line number Diff line number Diff line
@@ -825,8 +825,8 @@ 
};



&tlmm {

	cam0_default: cam0_default {

		rst {

	cam0_default: cam0-default-state {

		rst-pins {

			pins = "gpio9";

			function = "gpio";
@@ -834,7 +834,7 @@ 
			bias-disable;

		};



		mclk0 {

		mclk0-pins {

			pins = "gpio13";

			function = "cam_mclk";
@@ -843,8 +843,8 @@ 
		};

	};



	cam3_default: cam3_default {

		rst {

	cam3_default: cam3-default-state {

		rst-pins {

			function = "gpio";

			pins = "gpio21";
@@ -852,7 +852,7 @@ 
			bias-disable;

		};



		mclk3 {

		mclk3-pins {

			function = "cam_mclk";

			pins = "gpio16";
@@ -861,7 +861,7 @@ 
		};

	};



	dsi_sw_sel: dsi-sw-sel {

	dsi_sw_sel: dsi-sw-sel-state {

		pins = "gpio120";

		function = "gpio";
@@ -870,20 +870,20 @@ 
		output-high;

	};



	lt9611_irq_pin: lt9611-irq {

	lt9611_irq_pin: lt9611-irq-state {

		pins = "gpio84";

		function = "gpio";

		bias-disable;

	};



	pcie0_default_state: pcie0-default {

		clkreq {

	pcie0_default_state: pcie0-default-state {

		clkreq-pins {

			pins = "gpio36";

			function = "pci_e0";

			bias-pull-up;

		};



		reset-n {

		reset-n-pins {

			pins = "gpio35";

			function = "gpio";
@@ -892,7 +892,7 @@ 
			bias-pull-down;

		};



		wake-n {

		wake-n-pins {

			pins = "gpio37";

			function = "gpio";
@@ -901,7 +901,7 @@ 
		};

	};



	pcie0_pwren_state: pcie0-pwren {

	pcie0_pwren_state: pcie0-pwren-state {

		pins = "gpio90";

		function = "gpio";
@@ -909,8 +909,8 @@ 
		bias-disable;

	};



	pcie1_default_state: pcie1-default {

		perst-n {

	pcie1_default_state: pcie1-default-state {

		perst-n-pins {

			pins = "gpio102";

			function = "gpio";
@@ -918,13 +918,13 @@ 
			bias-disable;

		};



		clkreq {

		clkreq-pins {

			pins = "gpio103";

			function = "pci_e1";

			bias-pull-up;

		};



		wake-n {

		wake-n-pins {

			pins = "gpio11";

			function = "gpio";
@@ -932,7 +932,7 @@ 
			bias-pull-up;

		};



		reset-n {

		reset-n-pins {

			pins = "gpio75";

			function = "gpio";
@@ -942,8 +942,8 @@ 
		};

	};



	sdc2_default_state: sdc2-default {

		clk {

	sdc2_default_state: sdc2-default-state {

		clk-pins {

			pins = "sdc2_clk";

			bias-disable;
@@ -954,26 +954,26 @@ 
			drive-strength = <16>;

		};



		cmd {

		cmd-pins {

			pins = "sdc2_cmd";

			bias-pull-up;

			drive-strength = <10>;

		};



		data {

		data-pins {

			pins = "sdc2_data";

			bias-pull-up;

			drive-strength = <10>;

		};

	};



	sdc2_card_det_n: sd-card-det-n {

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

		pins = "gpio126";

		function = "gpio";

		bias-pull-up;

	};



	wcd_intr_default: wcd_intr_default {

	wcd_intr_default: wcd-intr-default-state {

		pins = "gpio54";

		function = "gpio";
@@ -985,6 +985,8 @@ 


&uart3 {

	label = "LS-UART0";

	pinctrl-0 = <&qup_uart3_4pin>;



	status = "disabled";

};
@@ -1130,39 +1132,22 @@ 


/* PINCTRL - additions to nodes defined in sdm845.dtsi */

&qup_spi2_default {

	pinconf {

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

	drive-strength = <16>;

};

};



&qup_uart3_default {

	pinmux {

		pins = "gpio41", "gpio42", "gpio43", "gpio44";

		function = "qup3";

	};

};



&qup_i2c10_default {

	pinconf {

		pins = "gpio55", "gpio56";

	drive-strength = <2>;

	bias-disable;

};

};



&qup_uart9_default {

	pinconf-tx {

		pins = "gpio4";

&qup_uart9_rx {

	drive-strength = <2>;

		bias-disable;

	bias-pull-up;

};



	pinconf-rx {

		pins = "gpio5";

&qup_uart9_tx {

	drive-strength = <2>;

		bias-pull-up;

	};

	bias-disable;

};



&pm8998_gpios {
@@ -1171,8 +1156,6 @@ 


/* PINCTRL - additions to nodes defined in sdm845.dtsi */

&qup_spi0_default {

	config {

	drive-strength = <6>;

	bias-disable;

};
 
};

arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi

+24 −36
Original line number Diff line number Diff line
@@ -553,8 +553,7 @@ 
&tlmm {

	gpio-reserved-ranges = <28 4>, <81 4>;



	sdc2_clk: sdc2-clk {

		pinconf {

	sdc2_clk: sdc2-clk-state {

		pins = "sdc2_clk";

		bias-disable;
@@ -567,36 +566,25 @@ 
		 */

		drive-strength = <16>;

	};

	};



	sdc2_cmd: sdc2-cmd {

		pinconf {

	sdc2_cmd: sdc2-cmd-state {

		pins = "sdc2_cmd";

		bias-pull-up;

		drive-strength = <16>;

	};

	};



	sdc2_data: sdc2-data {

		pinconf {

	sdc2_data: sdc2-data-state {

		pins = "sdc2_data";

		bias-pull-up;

		drive-strength = <16>;

	};

	};



	sd_card_det_n: sd-card-det-n {

		pinmux {

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

		pins = "gpio126";

		function = "gpio";

		};



		pinconf {

			pins = "gpio126";

		bias-pull-up;

	};

};

};



&pm8998_gpios {

	vol_up_pin_a: vol-up-active-state {

arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
};



&tlmm {

	thinq_key_default: thinq-key-default {

	thinq_key_default: thinq-key-default-state {

		pins = "gpio89";

		function = "gpio";

arch/arm64/boot/dts/qcom/sdm845-mtp.dts

+29 −48
Original line number Diff line number Diff line
@@ -719,32 +719,24 @@ 
/* PINCTRL - additions to nodes defined in sdm845.dtsi */



&qup_i2c10_default {

	pinconf {

		pins = "gpio55", "gpio56";

	drive-strength = <2>;

	bias-disable;

};

};



&qup_uart9_default {

	pinconf-tx {

		pins = "gpio4";

&qup_uart9_rx {

	drive-strength = <2>;

		bias-disable;

	bias-pull-up;

};



	pinconf-rx {

		pins = "gpio5";

&qup_uart9_tx {

	drive-strength = <2>;

		bias-pull-up;

	};

	bias-disable;

};



&tlmm {

	gpio-reserved-ranges = <0 4>, <81 4>;



	sdc2_clk: sdc2-clk {

		pinconf {

	sdc2_clk: sdc2-clk-state {

		pins = "sdc2_clk";

		bias-disable;
@@ -754,33 +746,22 @@ 
		 */

		drive-strength = <16>;

	};

	};



	sdc2_cmd: sdc2-cmd {

		pinconf {

	sdc2_cmd: sdc2-cmd-state {

		pins = "sdc2_cmd";

		bias-pull-up;

		drive-strength = <16>;

	};

	};



	sdc2_data: sdc2-data {

		pinconf {

	sdc2_data: sdc2-data-state {

		pins = "sdc2_data";

		bias-pull-up;

		drive-strength = <16>;

	};

	};



	sd_card_det_n: sd-card-det-n {

		pinmux {

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

		pins = "gpio126";

		function = "gpio";

		};



		pinconf {

			pins = "gpio126";

		bias-pull-up;

	};

};
 
};