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

arm64: dts: qcom: sdm630: 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/20221011190231.76784-3-krzysztof.kozlowski@linaro.org
parent 06783c3a

arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts

+4 −2
Original line number Diff line number Diff line
@@ -401,16 +401,18 @@ vreg_bob: bob { 
};



&sdc2_state_on {

	sd-cd {

	sd-cd-pins {

		pins = "gpio54";

		function = "gpio";

		bias-pull-up;

		drive-strength = <2>;

	};

};



&sdc2_state_off {

	sd-cd {

	sd-cd-pins {

		pins = "gpio54";

		function = "gpio";

		bias-disable;

		drive-strength = <2>;

	};

arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi

+11 −7
Original line number Diff line number Diff line
@@ -577,16 +577,18 @@ vreg_l19a_3p3: l19 { 
};



&sdc2_state_on {

	sd-cd {

	sd-cd-pins {

		pins = "gpio54";

		function = "gpio";

		bias-pull-up;

		drive-strength = <2>;

	};

};



&sdc2_state_off {

	sd-cd {

	sd-cd-pins {

		pins = "gpio54";

		function = "gpio";

		bias-disable;

		drive-strength = <2>;

	};
@@ -615,33 +617,35 @@ &sdhc_2 { 
&tlmm {

	gpio-reserved-ranges = <8 4>;



	ts_int_active: ts-int-active {

	ts_int_active: ts-int-active-state {

		pins = "gpio45";

		function = "gpio";

		drive-strength = <8>;

		bias-pull-up;

	};



	ts_lcd_id_active: ts-lcd-id-active {

	ts_lcd_id_active: ts-lcd-id-active-state {

		pins = "gpio56";

		function = "gpio";

		drive-strength = <8>;

		bias-disable;

	};



	imx300_vana_default: imx300-vana-default {

	imx300_vana_default: imx300-vana-default-state {

		pins = "gpio50";

		function = "gpio";

		bias-disable;

		drive-strength = <2>;

	};



	imx219_vana_default: imx219-vana-default {

	imx219_vana_default: imx219-vana-default-state {

		pins = "gpio51";

		function = "gpio";

		bias-disable;

		drive-strength = <2>;

	};



	cam_vdig_default: cam-vdig-default {

	cam_vdig_default: cam-vdig-default-state {

		pins = "gpio52";

		function = "gpio";

		bias-disable;

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

+55 −66
Original line number Diff line number Diff line
@@ -721,35 +721,36 @@ tlmm: pinctrl@3100000 { 
			interrupt-controller;

			#interrupt-cells = <2>;



			blsp1_uart1_default: blsp1-uart1-default {

			blsp1_uart1_default: blsp1-uart1-default-state {

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

				function = "blsp_uart1";

				drive-strength = <2>;

				bias-disable;

			};



			blsp1_uart1_sleep: blsp1-uart1-sleep {

			blsp1_uart1_sleep: blsp1-uart1-sleep-state {

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

				function = "gpio";

				drive-strength = <2>;

				bias-disable;

			};



			blsp1_uart2_default: blsp1-uart2-default {

			blsp1_uart2_default: blsp1-uart2-default-state {

				pins = "gpio4", "gpio5";

				function = "blsp_uart2";

				drive-strength = <2>;

				bias-disable;

			};



			blsp2_uart1_default: blsp2-uart1-active {

				tx-rts {

			blsp2_uart1_default: blsp2-uart1-active-state {

				tx-rts-pins {

					pins = "gpio16", "gpio19";

					function = "blsp_uart5";

					drive-strength = <2>;

					bias-disable;

				};



				rx {

				rx-pins {

					/*

					 * Avoid garbage data while BT module

					 * is powered off or not driving signal
@@ -760,7 +761,7 @@ rx { 
					bias-pull-up;

				};



				cts {

				cts-pins {

					/* Match the pull of the BT module */

					pins = "gpio18";

					function = "blsp_uart5";
@@ -769,15 +770,15 @@ cts { 
				};

			};



			blsp2_uart1_sleep: blsp2-uart1-sleep {

				tx {

			blsp2_uart1_sleep: blsp2-uart1-sleep-state {

				tx-pins {

					pins = "gpio16";

					function = "gpio";

					drive-strength = <2>;

					bias-pull-up;

				};



				rx-cts-rts {

				rx-cts-rts-pins {

					pins = "gpio17", "gpio18", "gpio19";

					function = "gpio";

					drive-strength = <2>;
@@ -785,228 +786,216 @@ rx-cts-rts { 
				};

			};



			i2c1_default: i2c1-default {

			i2c1_default: i2c1-default-state {

				pins = "gpio2", "gpio3";

				function = "blsp_i2c1";

				drive-strength = <2>;

				bias-disable;

			};



			i2c1_sleep: i2c1-sleep {

			i2c1_sleep: i2c1-sleep-state {

				pins = "gpio2", "gpio3";

				function = "blsp_i2c1";

				drive-strength = <2>;

				bias-pull-up;

			};



			i2c2_default: i2c2-default {

			i2c2_default: i2c2-default-state {

				pins = "gpio6", "gpio7";

				function = "blsp_i2c2";

				drive-strength = <2>;

				bias-disable;

			};



			i2c2_sleep: i2c2-sleep {

			i2c2_sleep: i2c2-sleep-state {

				pins = "gpio6", "gpio7";

				function = "blsp_i2c2";

				drive-strength = <2>;

				bias-pull-up;

			};



			i2c3_default: i2c3-default {

			i2c3_default: i2c3-default-state {

				pins = "gpio10", "gpio11";

				function = "blsp_i2c3";

				drive-strength = <2>;

				bias-disable;

			};



			i2c3_sleep: i2c3-sleep {

			i2c3_sleep: i2c3-sleep-state {

				pins = "gpio10", "gpio11";

				function = "blsp_i2c3";

				drive-strength = <2>;

				bias-pull-up;

			};



			i2c4_default: i2c4-default {

			i2c4_default: i2c4-default-state {

				pins = "gpio14", "gpio15";

				function = "blsp_i2c4";

				drive-strength = <2>;

				bias-disable;

			};



			i2c4_sleep: i2c4-sleep {

			i2c4_sleep: i2c4-sleep-state {

				pins = "gpio14", "gpio15";

				function = "blsp_i2c4";

				drive-strength = <2>;

				bias-pull-up;

			};



			i2c5_default: i2c5-default {

			i2c5_default: i2c5-default-state {

				pins = "gpio18", "gpio19";

				function = "blsp_i2c5";

				drive-strength = <2>;

				bias-disable;

			};



			i2c5_sleep: i2c5-sleep {

			i2c5_sleep: i2c5-sleep-state {

				pins = "gpio18", "gpio19";

				function = "blsp_i2c5";

				drive-strength = <2>;

				bias-pull-up;

			};



			i2c6_default: i2c6-default {

			i2c6_default: i2c6-default-state {

				pins = "gpio22", "gpio23";

				function = "blsp_i2c6";

				drive-strength = <2>;

				bias-disable;

			};



			i2c6_sleep: i2c6-sleep {

			i2c6_sleep: i2c6-sleep-state {

				pins = "gpio22", "gpio23";

				function = "blsp_i2c6";

				drive-strength = <2>;

				bias-pull-up;

			};



			i2c7_default: i2c7-default {

			i2c7_default: i2c7-default-state {

				pins = "gpio26", "gpio27";

				function = "blsp_i2c7";

				drive-strength = <2>;

				bias-disable;

			};



			i2c7_sleep: i2c7-sleep {

			i2c7_sleep: i2c7-sleep-state {

				pins = "gpio26", "gpio27";

				function = "blsp_i2c7";

				drive-strength = <2>;

				bias-pull-up;

			};



			i2c8_default: i2c8-default {

			i2c8_default: i2c8-default-state {

				pins = "gpio30", "gpio31";

				function = "blsp_i2c8_a";

				drive-strength = <2>;

				bias-disable;

			};



			i2c8_sleep: i2c8-sleep {

			i2c8_sleep: i2c8-sleep-state {

				pins = "gpio30", "gpio31";

				function = "blsp_i2c8_a";

				drive-strength = <2>;

				bias-pull-up;

			};



			cci0_default: cci0_default {

				pinmux {

			cci0_default: cci0-default-state {

				pins = "gpio36","gpio37";

				function = "cci_i2c";

				};



				pinconf {

					pins = "gpio36","gpio37";

				bias-pull-up;

				drive-strength = <2>;

			};

			};



			cci1_default: cci1_default {

				pinmux {

			cci1_default: cci1-default-state {

				pins = "gpio38","gpio39";

				function = "cci_i2c";

				};



				pinconf {

					pins = "gpio38","gpio39";

				bias-pull-up;

				drive-strength = <2>;

			};

			};



			sdc1_state_on: sdc1-on {

				clk {

			sdc1_state_on: sdc1-on-state {

				clk-pins {

					pins = "sdc1_clk";

					bias-disable;

					drive-strength = <16>;

				};



				cmd {

				cmd-pins {

					pins = "sdc1_cmd";

					bias-pull-up;

					drive-strength = <10>;

				};



				data {

				data-pins {

					pins = "sdc1_data";

					bias-pull-up;

					drive-strength = <10>;

				};



				rclk {

				rclk-pins {

					pins = "sdc1_rclk";

					bias-pull-down;

				};

			};



			sdc1_state_off: sdc1-off {

				clk {

			sdc1_state_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>;

				};



				rclk {

				rclk-pins {

					pins = "sdc1_rclk";

					bias-pull-down;

				};

			};



			sdc2_state_on: sdc2-on {

				clk {

			sdc2_state_on: sdc2-on-state {

				clk-pins {

					pins = "sdc2_clk";

					bias-disable;

					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_state_off: sdc2-off {

				clk {

			sdc2_state_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>;

arch/arm64/boot/dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ / { 
};



&sdc2_state_on {

	clk {

	clk-pins {

		drive-strength = <14>;

	};

};

arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts

+4 −2
Original line number Diff line number Diff line
@@ -372,16 +372,18 @@ &pm660l_wled { 
};



&sdc2_state_on {

	sd-cd {

	sd-cd-pins {

		pins = "gpio54";

		function = "gpio";

		bias-pull-up;

		drive-strength = <2>;

	};

};



&sdc2_state_off {

	sd-cd {

	sd-cd-pins {

		pins = "gpio54";

		function = "gpio";

		bias-disable;

		drive-strength = <2>;

	};