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

ARM: dts: qcom: msm8974: 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.  All
nodes for GPIOs must also define the function property.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221017012225.8579-2-krzysztof.kozlowski@linaro.org
parent bd40a8c7

arch/arm/boot/dts/qcom-apq8074-dragonboard.dts

+7 −7
Original line number Diff line number Diff line
@@ -272,34 +272,34 @@ &sdhc_2 { 
};



&tlmm {

	sdc1_on: sdc1-on {

		clk {

	sdc1_on: sdc1-on-state {

		clk-pins {

			pins = "sdc1_clk";

			drive-strength = <16>;

			bias-disable;

		};



		cmd-data {

		cmd-data-pins {

			pins = "sdc1_cmd", "sdc1_data";

			drive-strength = <10>;

			bias-pull-up;

		};

	};



	sdc2_on: sdc2-on {

		clk {

	sdc2_on: sdc2-on-state {

		clk-pins {

			pins = "sdc2_clk";

			drive-strength = <10>;

			bias-disable;

		};



		cmd-data {

		cmd-data-pins {

			pins = "sdc2_cmd", "sdc2_data";

			drive-strength = <6>;

			bias-pull-up;

		};



		cd {

		cd-pins {

			pins = "gpio62";

			function = "gpio";

			drive-strength = <2>;

arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ &smbb { 
};



&tlmm {

	ts_int_pin: touch-int {

	ts_int_pin: touch-int-state {

		pins = "gpio61";

		function = "gpio";

		drive-strength = <2>;
@@ -450,34 +450,34 @@ ts_int_pin: touch-int { 
		input-enable;

	};



	sdc1_on: sdc1-on {

		clk {

	sdc1_on: sdc1-on-state {

		clk-pins {

			pins = "sdc1_clk";

			drive-strength = <16>;

			bias-disable;

		};



		cmd-data {

		cmd-data-pins {

			pins = "sdc1_cmd", "sdc1_data";

			drive-strength = <10>;

			bias-pull-up;

		};

	};



	sdc2_on: sdc-on {

		clk {

	sdc2_on: sdc-on-state {

		clk-pins {

			pins = "sdc2_clk";

			drive-strength = <10>;

			bias-disable;

		};



		cmd-data {

		cmd-data-pins {

			pins = "sdc2_cmd", "sdc2_data";

			drive-strength = <6>;

			bias-pull-up;

		};



		cd {

		cd-pins {

			pins = "gpio62";

			function = "gpio";

			drive-strength = <2>;

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

+39 −38
Original line number Diff line number Diff line
@@ -1254,61 +1254,62 @@ tlmm: pinctrl@fd510000 { 
			#interrupt-cells = <2>;

			interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;



			sdc1_off: sdc1-off {

				clk {

			sdc1_off: sdc1-off-state {

				clk-pins {

					pins = "sdc1_clk";

					bias-disable;

					drive-strength = <2>;

				};



				cmd {

				cmd-pins {

					pins = "sdc1_cmd";

					bias-pull-up;

					drive-strength = <2>;

				};



				data {

				data-pins {

					pins = "sdc1_data";

					bias-pull-up;

					drive-strength = <2>;

				};

			};



			sdc2_off: sdc2-off {

				clk {

			sdc2_off: sdc2-off-state {

				clk-pins {

					pins = "sdc2_clk";

					bias-disable;

					drive-strength = <2>;

				};



				cmd {

				cmd-pins {

					pins = "sdc2_cmd";

					bias-pull-up;

					drive-strength = <2>;

				};



				data {

				data-pins {

					pins = "sdc2_data";

					bias-pull-up;

					drive-strength = <2>;

				};



				cd {

				cd-pins {

					pins = "gpio54";

					function = "gpio";

					bias-disable;

					drive-strength = <2>;

				};

			};



			blsp1_uart2_default: blsp1-uart2-default {

				rx {

			blsp1_uart2_default: blsp1-uart2-default-state {

				rx-pins {

					pins = "gpio5";

					function = "blsp_uart2";

					drive-strength = <2>;

					bias-pull-up;

				};



				tx {

				tx-pins {

					pins = "gpio4";

					function = "blsp_uart2";

					drive-strength = <4>;
@@ -1316,15 +1317,15 @@ tx { 
				};

			};



			blsp2_uart1_default: blsp2-uart1-default {

				tx-rts {

			blsp2_uart1_default: blsp2-uart1-default-state {

				tx-rts-pins {

					pins = "gpio41", "gpio44";

					function = "blsp_uart7";

					drive-strength = <2>;

					bias-disable;

				};



				rx-cts {

				rx-cts-pins {

					pins = "gpio42", "gpio43";

					function = "blsp_uart7";

					drive-strength = <2>;
@@ -1332,22 +1333,22 @@ rx-cts { 
				};

			};



			blsp2_uart1_sleep: blsp2-uart1-sleep {

			blsp2_uart1_sleep: blsp2-uart1-sleep-state {

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

				function = "gpio";

				drive-strength = <2>;

				bias-pull-down;

			};



			blsp2_uart4_default: blsp2-uart4-default {

				tx-rts {

			blsp2_uart4_default: blsp2-uart4-default-state {

				tx-rts-pins {

					pins = "gpio53", "gpio56";

					function = "blsp_uart10";

					drive-strength = <2>;

					bias-disable;

				};



				rx-cts {

				rx-cts-pins {

					pins = "gpio54", "gpio55";

					function = "blsp_uart10";

					drive-strength = <2>;
@@ -1355,42 +1356,42 @@ rx-cts { 
				};

			};



			blsp1_i2c1_default: blsp1-i2c1-default {

			blsp1_i2c1_default: blsp1-i2c1-default-state {

				pins = "gpio2", "gpio3";

				function = "blsp_i2c1";

				drive-strength = <2>;

				bias-disable;

			};



			blsp1_i2c1_sleep: blsp1-i2c1-sleep {

			blsp1_i2c1_sleep: blsp1-i2c1-sleep-state {

				pins = "gpio2", "gpio3";

				function = "blsp_i2c1";

				drive-strength = <2>;

				bias-pull-up;

			};



			blsp1_i2c2_default: blsp1-i2c2-default {

			blsp1_i2c2_default: blsp1-i2c2-default-state {

				pins = "gpio6", "gpio7";

				function = "blsp_i2c2";

				drive-strength = <2>;

				bias-disable;

			};



			blsp1_i2c2_sleep: blsp1-i2c2-sleep {

			blsp1_i2c2_sleep: blsp1-i2c2-sleep-state {

				pins = "gpio6", "gpio7";

				function = "blsp_i2c2";

				drive-strength = <2>;

				bias-pull-up;

			};



			blsp1_i2c3_default: blsp1-i2c3-default {

			blsp1_i2c3_default: blsp1-i2c3-default-state {

				pins = "gpio10", "gpio11";

				function = "blsp_i2c3";

				drive-strength = <2>;

				bias-disable;

			};



			blsp1_i2c3_sleep: blsp1-i2c3-sleep {

			blsp1_i2c3_sleep: blsp1-i2c3-sleep-state {

				pins = "gpio10", "gpio11";

				function = "blsp_i2c3";

				drive-strength = <2>;
@@ -1401,14 +1402,14 @@ blsp1_i2c3_sleep: blsp1-i2c3-sleep { 


			/* BLSP1_I2C5 info is missing */



			blsp1_i2c6_default: blsp1-i2c6-default {

			blsp1_i2c6_default: blsp1-i2c6-default-state {

				pins = "gpio29", "gpio30";

				function = "blsp_i2c6";

				drive-strength = <2>;

				bias-disable;

			};



			blsp1_i2c6_sleep: blsp1-i2c6-sleep {

			blsp1_i2c6_sleep: blsp1-i2c6-sleep-state {

				pins = "gpio29", "gpio30";

				function = "blsp_i2c6";

				drive-strength = <2>;
@@ -1418,14 +1419,14 @@ blsp1_i2c6_sleep: blsp1-i2c6-sleep { 


			/* BLSP2_I2C1 info is missing */



			blsp2_i2c2_default: blsp2-i2c2-default {

			blsp2_i2c2_default: blsp2-i2c2-default-state {

				pins = "gpio47", "gpio48";

				function = "blsp_i2c8";

				drive-strength = <2>;

				bias-disable;

			};



			blsp2_i2c2_sleep: blsp2-i2c2-sleep {

			blsp2_i2c2_sleep: blsp2-i2c2-sleep-state {

				pins = "gpio47", "gpio48";

				function = "blsp_i2c8";

				drive-strength = <2>;
@@ -1436,28 +1437,28 @@ blsp2_i2c2_sleep: blsp2-i2c2-sleep { 


			/* BLSP2_I2C4 info is missing */



			blsp2_i2c5_default: blsp2-i2c5-default {

			blsp2_i2c5_default: blsp2-i2c5-default-state {

				pins = "gpio83", "gpio84";

				function = "blsp_i2c11";

				drive-strength = <2>;

				bias-disable;

			};



			blsp2_i2c5_sleep: blsp2-i2c5-sleep {

			blsp2_i2c5_sleep: blsp2-i2c5-sleep-state {

				pins = "gpio83", "gpio84";

				function = "blsp_i2c11";

				drive-strength = <2>;

				bias-pull-up;

			};



			blsp2_i2c6_default: blsp2-i2c6-default {

			blsp2_i2c6_default: blsp2-i2c6-default-state {

				pins = "gpio87", "gpio88";

				function = "blsp_i2c12";

				drive-strength = <2>;

				bias-disable;

			};



			blsp2_i2c6_sleep: blsp2-i2c6-sleep {

			blsp2_i2c6_sleep: blsp2-i2c6-sleep-state {

				pins = "gpio87", "gpio88";

				function = "blsp_i2c12";

				drive-strength = <2>;
@@ -1496,20 +1497,20 @@ cci_i2c1_sleep: cci-i2c1-sleep-pins { 
				};

			};



			spi8_default: spi8_default {

				mosi {

			spi8_default: spi8_default-state {

				mosi-pins {

					pins = "gpio45";

					function = "blsp_spi8";

				};

				miso {

				miso-pins {

					pins = "gpio46";

					function = "blsp_spi8";

				};

				cs {

				cs-pins {

					pins = "gpio47";

					function = "blsp_spi8";

				};

				clk {

				clk-pins {

					pins = "gpio48";

					function = "blsp_spi8";

				};

arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts

+10 −10
Original line number Diff line number Diff line
@@ -409,36 +409,36 @@ &smbb { 
};



&tlmm {

	sdc1_on: sdc1-on {

		clk {

	sdc1_on: sdc1-on-state {

		clk-pins {

			pins = "sdc1_clk";

			drive-strength = <16>;

			bias-disable;

		};



		cmd-data {

		cmd-data-pins {

			pins = "sdc1_cmd", "sdc1_data";

			drive-strength = <10>;

			bias-pull-up;

		};

	};



	sdc2_on: sdc2-on {

		clk {

	sdc2_on: sdc2-on-state {

		clk-pins {

			pins = "sdc2_clk";

			drive-strength = <10>;

			bias-disable;

		};



		cmd-data {

		cmd-data-pins {

			pins = "sdc2_cmd", "sdc2_data";

			drive-strength = <6>;

			bias-pull-up;

		};

	};



	wcnss_pin_a: wcnss-pin-active {

		wlan {

	wcnss_pin_a: wcnss-pin-active-state {

		wlan-pins {

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

			function = "wlan";
@@ -446,7 +446,7 @@ wlan { 
			bias-pull-down;

		};



		bt {

		bt-pins {

			pins = "gpio35", "gpio43", "gpio44";

			function = "bt";
@@ -454,7 +454,7 @@ bt { 
			bias-pull-down;

		};



		fm {

		fm-pins {

			pins = "gpio41", "gpio42";

			function = "fm";

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

+18 −18
Original line number Diff line number Diff line
@@ -707,57 +707,57 @@ &sdhc_3 { 


&tlmm {

	/* This seems suspicious, but somebody with this device should look into it. */

	blsp2_uart2_pins_active: blsp2-uart2-pins-active {

	blsp2_uart2_pins_active: blsp2-uart2-pins-active-state {

		pins = "gpio45", "gpio46", "gpio47", "gpio48";

		function = "blsp_uart8";

		drive-strength = <8>;

		bias-disable;

	};



	blsp2_uart2_pins_sleep: blsp2-uart2-pins-sleep {

	blsp2_uart2_pins_sleep: blsp2-uart2-pins-sleep-state {

		pins = "gpio45", "gpio46", "gpio47", "gpio48";

		function = "gpio";

		drive-strength = <2>;

		bias-pull-down;

	};



	bt_pins: bt-pins {

		hostwake {

	bt_pins: bt-pins-state {

		hostwake-pins {

			pins = "gpio75";

			function = "gpio";

			drive-strength = <16>;

			input-enable;

		};



		devwake {

		devwake-pins {

			pins = "gpio91";

			function = "gpio";

			drive-strength = <2>;

		};

	};



	sdc1_on: sdhc1-on {

		clk {

	sdc1_on: sdhc1-on-state {

		clk-pins {

			pins = "sdc1_clk";

			drive-strength = <4>;

			bias-disable;

		};



		cmd-data {

		cmd-data-pins {

			pins = "sdc1_cmd", "sdc1_data";

			drive-strength = <4>;

			bias-pull-up;

		};

	};



	sdc3_on: sdc3-on {

	sdc3_on: sdc3-on-state {

		pins = "gpio35", "gpio36", "gpio37", "gpio38", "gpio39", "gpio40";

		function = "sdc3";

		drive-strength = <8>;

		bias-disable;

	};



	sdhc3_cd_pin: sdc3-cd-on {

	sdhc3_cd_pin: sdc3-cd-on-state {

		pins = "gpio62";

		function = "gpio";
@@ -765,49 +765,49 @@ sdhc3_cd_pin: sdc3-cd-on { 
		bias-disable;

	};



	sdc2_on: sdhc2-on {

		clk {

	sdc2_on: sdhc2-on-state {

		clk-pins {

			pins = "sdc2_clk";

			drive-strength = <6>;

			bias-disable;

		};



		cmd-data {

		cmd-data-pins {

			pins = "sdc2_cmd", "sdc2_data";

			drive-strength = <6>;

			bias-pull-up;

		};

	};



	i2c_touchkey_pins: i2c-touchkey {

	i2c_touchkey_pins: i2c-touchkey-state {

		pins = "gpio95", "gpio96";

		function = "gpio";

		input-enable;

		bias-pull-up;

	};



	i2c_led_gpioex_pins: i2c-led-gpioex {

	i2c_led_gpioex_pins: i2c-led-gpioex-state {

		pins = "gpio120", "gpio121";

		function = "gpio";

		input-enable;

		bias-pull-down;

	};



	gpioex_pin: gpioex {

	gpioex_pin: gpioex-state {

		pins = "gpio145";

		function = "gpio";

		bias-pull-up;

		drive-strength = <2>;

	};



	wifi_pin: wifi {

	wifi_pin: wifi-state {

		pins = "gpio92";

		function = "gpio";

		input-enable;

		bias-pull-down;

	};



	panel_te_pin: panel {

	panel_te_pin: panel-state {

		pins = "gpio12";

		function = "mdp_vsync";

		drive-strength = <2>;