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

arm64: dts: qcom: msm8998: 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 avatarKonrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221013210612.95994-3-krzysztof.kozlowski@linaro.org
parent 46546f28

arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ bluetooth { 
};



&blsp1_uart3_on {

	rx {

	rx-pins {

		/delete-property/ bias-disable;

		/*

		 * Configure a pull-up on 45 (RX). This is needed to
@@ -46,7 +46,7 @@ rx { 
		bias-pull-up;

	};



	cts {

	cts-pins {

		/delete-property/ bias-disable;

		/*

		 * Configure a pull-down on 47 (CTS) to match the pull
@@ -357,8 +357,9 @@ &sdhc2 { 
&tlmm {

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



	touchpad: touchpad-pin {

	touchpad: touchpad-pin-state {

		pins = "gpio123";

		function = "gpio";

		bias-pull-up;

	};

};

arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts

+8 −8
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ bluetooth { 
};



&blsp1_uart3_on {

	rx {

	rx-pins {

		/delete-property/ bias-disable;

		/*

		 * Configure a pull-up on 45 (RX). This is needed to
@@ -227,7 +227,7 @@ rx { 
		bias-pull-up;

	};



	cts {

	cts-pins {

		/delete-property/ bias-disable;

		/*

		 * Configure a pull-down on 47 (CTS) to match the pull
@@ -615,14 +615,14 @@ &remoteproc_slpi { 
&tlmm {

	gpio-reserved-ranges = <0 4>;



	mdp_vsync_n: mdp-vsync-n {

	mdp_vsync_n: mdp-vsync-n-state {

		pins = "gpio10";

		function = "mdp_vsync_a";

		bias-pull-down;

		drive-strength = <2>;

	};



	gpio_kb_pins_extra: gpio-kb-pins-extra {

	gpio_kb_pins_extra: gpio-kb-pins-extra-state {

		pins = "gpio21", "gpio32", "gpio33", "gpio114",

		       "gpio128", "gpio129";

		function = "gpio";
@@ -630,21 +630,21 @@ gpio_kb_pins_extra: gpio-kb-pins-extra { 
		bias-pull-up;

	};



	ts_vio_default: ts-vio-def {

	ts_vio_default: ts-vio-def-state {

		pins = "gpio81";

		function = "gpio";

		bias-disable;

		drive-strength = <2>;

	};



	ts_rst_n: ts-rst-n {

	ts_rst_n: ts-rst-n-state {

		pins = "gpio89";

		function = "gpio";

		bias-pull-up;

		drive-strength = <8>;

	};



	hall_sensor1_default: hall-sensor1-def {

	hall_sensor1_default: hall-sensor1-def-state {

		pins = "gpio124";

		function = "gpio";

		bias-disable;
@@ -652,7 +652,7 @@ hall_sensor1_default: hall-sensor1-def { 
		input-enable;

	};



	ts_int_n: ts-int-n {

	ts_int_n: ts-int-n-state {

		pins = "gpio125";

		function = "gpio";

		bias-disable;

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

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ bluetooth { 
};



&blsp1_uart3_on {

	rx {

	rx-pins {

		/delete-property/ bias-disable;

		/*

		 * Configure a pull-up on 45 (RX). This is needed to
@@ -57,7 +57,7 @@ rx { 
		bias-pull-up;

	};



	cts {

	cts-pins {

		/delete-property/ bias-disable;

		/*

		 * Configure a pull-down on 47 (CTS) to match the pull

arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts

+4 −6
Original line number Diff line number Diff line
@@ -33,11 +33,9 @@ button-backlight { 


&pmi8998_gpio {

	button_backlight_default: button-backlight-state {

		pinconf {

		pins = "gpio5";

		function = "gpio";

		bias-pull-down;

		qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;

	};

};
 
};

arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ bluetooth { 
};



&blsp1_uart3_on {

	rx {

	rx-pins {

		/delete-property/ bias-disable;

		/*

		 * Configure a pull-up on 46 (RX). This is needed to
@@ -244,7 +244,7 @@ rx { 
		bias-pull-up;

	};



	cts {

	cts-pins {

		/delete-property/ bias-disable;

		/*

		 * Configure a pull-down on 47 (CTS) to match the pull
@@ -492,7 +492,7 @@ vreg_bob: bob { 
&tlmm {

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



	hall_sensor_default: hall-sensor-default {

	hall_sensor_default: hall-sensor-default-state {

		pins = "gpio124";

		function = "gpio";

		drive-strength = <2>;
@@ -500,28 +500,28 @@ hall_sensor_default: hall-sensor-default { 
		input-enable;

	};



	ts_int_active: ts-int-active {

	ts_int_active: ts-int-active-state {

		pins = "gpio125";

		function = "gpio";

		drive-strength = <8>;

		bias-pull-up;

	};



	ts_reset_active: ts-reset-active {

	ts_reset_active: ts-reset-active-state {

		pins = "gpio89";

		function = "gpio";

		drive-strength = <8>;

		bias-pull-up;

	};



	nfc_int_active: nfc-int-active {

	nfc_int_active: nfc-int-active-state {

		pins = "gpio92";

		function = "gpio";

		drive-strength = <6>;

		bias-pull-up;

	};



	nfc_enable_active: nfc-enable-active {

	nfc_enable_active: nfc-enable-active-state {

		pins = "gpio12", "gpio116";

		function = "gpio";

		drive-strength = <6>;