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

arm64: dts: qcom: sm8250: 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.

Drop also unneeded split between mux and config.

Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
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/20220930192954.242546-2-krzysztof.kozlowski@linaro.org
parent e7e24786

arch/arm64/boot/dts/qcom/qrb5165-rb5.dts

+6 −6
Original line number Diff line number Diff line
@@ -1210,33 +1210,33 @@ &tlmm { 
		"HST_WLAN_UART_TX",

		"HST_WLAN_UART_RX";



	lt9611_irq_pin: lt9611-irq {

	lt9611_irq_pin: lt9611-irq-state {

		pins = "gpio63";

		function = "gpio";

		bias-disable;

	};



	sdc2_default_state: sdc2-default {

		clk {

	sdc2_default_state: sdc2-default-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_card_det_n: sd-card-det-n {

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

		pins = "gpio77";

		function = "gpio";

		bias-pull-up;

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

+13 −25
Original line number Diff line number Diff line
@@ -799,33 +799,21 @@ wcd_tx: wcd9380-tx@0,3 { 
&tlmm {

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



	wcd938x_reset_default: wcd938x_reset_default {

		mux {

	wcd938x_reset_default: wcd938x-reset-default-state {

		pins = "gpio32";

		function = "gpio";

		};



		config {

			pins = "gpio32";

		drive-strength = <16>;

		output-high;

	};

	};



	wcd938x_reset_sleep: wcd938x_reset_sleep {

		mux {

	wcd938x_reset_sleep: wcd938x-reset-sleep-state {

		pins = "gpio32";

		function = "gpio";

		};



		config {

			pins = "gpio32";

		drive-strength = <16>;

		bias-disable;

		output-low;

	};

};

};



&txmacro {

	status = "okay";

arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -582,34 +582,34 @@ &slpi { 
&tlmm {

	gpio-reserved-ranges = <40 4>, <52 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;

		};

	};



	mdm2ap_default: mdm2ap-default {

	mdm2ap_default: mdm2ap-default-state {

		pins = "gpio1", "gpio3";

		function = "gpio";

		drive-strength = <8>;

		bias-disable;

	};



	ts_int_default: ts-int-default {

	ts_int_default: ts-int-default-state {

		pins = "gpio39";

		function = "gpio";

		drive-strength = <2>;
@@ -617,14 +617,14 @@ ts_int_default: ts-int-default { 
		input-enable;

	};



	ap2mdm_default: ap2mdm-default {

	ap2mdm_default: ap2mdm-default-state {

		pins = "gpio56", "gpio57";

		function = "gpio";

		drive-strength = <16>;

		bias-disable;

	};



	sdc2_card_det_n: sd-card-det-n {

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

		pins = "gpio77";

		function = "gpio";

		bias-pull-up;

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

+212 −344

File changed.

Preview size limit exceeded, changes collapsed.