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

arm64: dts: qcom: sc7280: 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>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220912061746.6311-40-krzysztof.kozlowski@linaro.org
parent a7374752

arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi

+22 −22
Original line number Diff line number Diff line
@@ -725,27 +725,27 @@ ap_ec_spi: &spi10 { 
	pinctrl-names = "default";

	pinctrl-0 = <&bios_flash_wp_od>;



	amp_en: amp-en {

	amp_en: amp-en-pins {

		pins = "gpio63";

		function = "gpio";

		bias-disable;

		drive-strength = <2>;

	};



	ap_ec_int_l: ap-ec-int-l {

	ap_ec_int_l: ap-ec-int-l-pins {

		pins = "gpio18";

		function = "gpio";

		bias-pull-up;

	};



	bios_flash_wp_od: bios-flash-wp-od {

	bios_flash_wp_od: bios-flash-wp-od-pins {

		pins = "gpio16";

		function = "gpio";

		/* Has external pull */

		bias-disable;

	};



	en_fp_rails: en-fp-rails {

	en_fp_rails: en-fp-rails-pins {

		pins = "gpio77";

		function = "gpio";

		bias-disable;
@@ -753,60 +753,60 @@ ap_ec_spi: &spi10 { 
		output-high;

	};



	en_pp3300_codec: en-pp3300-codec {

	en_pp3300_codec: en-pp3300-codec-pins {

		pins = "gpio105";

		function = "gpio";

		bias-disable;

		drive-strength = <2>;

	};



	en_pp3300_dx_edp: en-pp3300-dx-edp {

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

		pins = "gpio80";

		function = "gpio";

		bias-disable;

		drive-strength = <2>;

	};



	fp_rst_l: fp-rst-l {

	fp_rst_l: fp-rst-l-pins {

		pins = "gpio78";

		function = "gpio";

		bias-disable;

		drive-strength = <2>;

	};



	fp_to_ap_irq_l: fp-to-ap-irq-l {

	fp_to_ap_irq_l: fp-to-ap-irq-l-pins {

		pins = "gpio61";

		function = "gpio";

		/* Has external pullup */

		bias-disable;

	};



	fpmcu_boot0: fpmcu-boot0 {

	fpmcu_boot0: fpmcu-boot0-pins {

		pins = "gpio68";

		function = "gpio";

		bias-disable;

	};



	gsc_ap_int_odl: gsc-ap-int-odl {

	gsc_ap_int_odl: gsc-ap-int-odl-pins {

		pins = "gpio104";

		function = "gpio";

		bias-pull-up;

	};



	hp_irq: hp-irq {

	hp_irq: hp-irq-pins {

		pins = "gpio101";

		function = "gpio";

		bias-pull-up;

	};



	hub_en: hub-en {

	hub_en: hub-en-pins {

		pins = "gpio157";

		function = "gpio";

		bias-disable;

		drive-strength = <2>;

	};



	pe_wake_odl: pe-wake-odl {

	pe_wake_odl: pe-wake-odl-pins {

		pins = "gpio3";

		function = "gpio";

		/* Has external pull */
@@ -815,45 +815,45 @@ ap_ec_spi: &spi10 { 
	};



	/* For ap_spi_fp */

	qup_spi9_cs_gpio_init_high: qup-spi9-cs-gpio-init-high {

	qup_spi9_cs_gpio_init_high: qup-spi9-cs-gpio-init-high-pins {

		pins = "gpio39";

		function = "gpio";

		output-high;

	};



	/* For ap_ec_spi */

	qup_spi10_cs_gpio_init_high: qup-spi10-cs-gpio-init-high {

	qup_spi10_cs_gpio_init_high: qup-spi10-cs-gpio-init-high-pins {

		pins = "gpio43";

		function = "gpio";

		output-high;

	};



	sar0_irq_odl: sar0-irq-odl {

	sar0_irq_odl: sar0-irq-odl-pins {

		pins = "gpio141";

		function = "gpio";

		bias-pull-up;

	};



	sar1_irq_odl: sar1-irq-odl {

	sar1_irq_odl: sar1-irq-odl-pins {

		pins = "gpio140";

		function = "gpio";

		bias-pull-up;

	};



	sd_cd_odl: sd-cd-odl {

	sd_cd_odl: sd-cd-odl-pins {

		pins = "gpio91";

		function = "gpio";

		bias-pull-up;

	};



	ssd_en: ssd-en {

	ssd_en: ssd-en-pins {

		pins = "gpio51";

		function = "gpio";

		bias-disable;

		drive-strength = <2>;

	};



	ssd_rst_l: ssd-rst-l {

	ssd_rst_l: ssd-rst-l-pins {

		pins = "gpio2";

		function = "gpio";

		bias-disable;
@@ -861,14 +861,14 @@ ap_ec_spi: &spi10 { 
		output-low;

	};



	tp_int_odl: tp-int-odl {

	tp_int_odl: tp-int-odl-pins {

		pins = "gpio7";

		function = "gpio";

		/* Has external pullup */

		bias-disable;

	};



	wf_cam_en: wf-cam-en {

	wf_cam_en: wf-cam-en-pins {

		pins = "gpio119";

		function = "gpio";

		/* Has external pulldown */

arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -79,26 +79,26 @@ ap_h1_spi: &spi14 { 
};



&tlmm {

	ap_ec_int_l: ap-ec-int-l {

	ap_ec_int_l: ap-ec-int-l-pins {

		pins = "gpio18";

		function = "gpio";

		input-enable;

		bias-pull-up;

	};



	h1_ap_int_odl: h1-ap-int-odl {

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

		pins = "gpio104";

		function = "gpio";

		input-enable;

		bias-pull-up;

	};



	qup_spi10_cs_gpio_init_high: qup-spi10-cs-gpio-init-high {

	qup_spi10_cs_gpio_init_high: qup-spi10-cs-gpio-init-high-pins {

		pins = "gpio43";

		output-high;

	};



	qup_spi14_cs_gpio_init_high: qup-spi14-cs-gpio-init-high {

	qup_spi14_cs_gpio_init_high: qup-spi14-cs-gpio-init-high-pins {

		pins = "gpio59";

		output-high;

	};

arch/arm64/boot/dts/qcom/sc7280-idp.dtsi

+10 −10
Original line number Diff line number Diff line
@@ -753,18 +753,18 @@ 
		drive-strength = <2>;

	};



	bt_en: bt-en {

	bt_en: bt-en-pins {

		pins = "gpio85";

		function = "gpio";

		output-low;

		bias-disable;

	};



	nvme_pwren: nvme-pwren {

	nvme_pwren: nvme-pwren-pins {

		function = "gpio";

	};



	pcie1_reset_n: pcie1-reset-n {

	pcie1_reset_n: pcie1-reset-n-pins {

		pins = "gpio2";

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

	};



	pcie1_wake_n: pcie1-wake-n {

	pcie1_wake_n: pcie1-wake-n-pins {

		pins = "gpio3";

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

	};



	qup_uart7_sleep_cts: qup-uart7-sleep-cts {

	qup_uart7_sleep_cts: qup-uart7-sleep-cts-pins {

		pins = "gpio28";

		function = "gpio";

		/*
@@ -794,7 +794,7 @@ 
		bias-bus-hold;

	};



	qup_uart7_sleep_rts: qup-uart7-sleep-rts {

	qup_uart7_sleep_rts: qup-uart7-sleep-rts-pins {

		pins = "gpio29";

		function = "gpio";

		/*
@@ -806,7 +806,7 @@ 
		bias-pull-down;

	};



	qup_uart7_sleep_tx: qup-uart7-sleep-tx {

	qup_uart7_sleep_tx: qup-uart7-sleep-tx-pins {

		pins = "gpio30";

		function = "gpio";

		/*
@@ -816,7 +816,7 @@ 
		bias-pull-up;

	};



	qup_uart7_sleep_rx: qup-uart7-sleep-rx {

	qup_uart7_sleep_rx: qup-uart7-sleep-rx-pins {

		pins = "gpio31";

		function = "gpio";

		/*
@@ -827,13 +827,13 @@ 
		bias-pull-up;

	};



	sd_cd: sd-cd {

	sd_cd: sd-cd-pins {

		pins = "gpio91";

		function = "gpio";

		bias-pull-up;

	};



	sw_ctrl: sw-ctrl {

	sw_ctrl: sw-ctrl-pins {

		pins = "gpio86";

		function = "gpio";

		bias-pull-down;

arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ mos_bt_uart: &uart7 { 
};



&tlmm {

	mos_bt_en: mos-bt-en {

	mos_bt_en: mos-bt-en-pins {

		pins = "gpio85";

		function = "gpio";

		drive-strength = <2>;
@@ -603,7 +603,7 @@ mos_bt_uart: &uart7 { 
	};



	/* For mos_bt_uart */

	qup_uart7_sleep_cts: qup-uart7-sleep-cts {

	qup_uart7_sleep_cts: qup-uart7-sleep-cts-pins {

		pins = "gpio28";

		function = "gpio";

		/*
@@ -617,7 +617,7 @@ mos_bt_uart: &uart7 { 
	};



	/* For mos_bt_uart */

	qup_uart7_sleep_rts: qup-uart7-sleep-rts {

	qup_uart7_sleep_rts: qup-uart7-sleep-rts-pins {

		pins = "gpio29";

		function = "gpio";

		/*
@@ -630,7 +630,7 @@ mos_bt_uart: &uart7 { 
	};



	/* For mos_bt_uart */

	qup_uart7_sleep_rx: qup-uart7-sleep-rx {

	qup_uart7_sleep_rx: qup-uart7-sleep-rx-pins {

		pins = "gpio31";

		function = "gpio";

		/*
@@ -642,7 +642,7 @@ mos_bt_uart: &uart7 { 
	};



	/* For mos_bt_uart */

	qup_uart7_sleep_tx: qup-uart7-sleep-tx {

	qup_uart7_sleep_tx: qup-uart7-sleep-tx-pins {

		pins = "gpio30";

		function = "gpio";

		/*
@@ -652,13 +652,13 @@ mos_bt_uart: &uart7 { 
		bias-pull-up;

	};



	ts_int_conn: ts-int-conn {

	ts_int_conn: ts-int-conn-pins {

		pins = "gpio55";

		function = "gpio";

		bias-pull-up;

	};



	ts_rst_conn: ts-rst-conn {

	ts_rst_conn: ts-rst-conn-pins {

		pins = "gpio54";

		function = "gpio";

		drive-strength = <2>;

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

+158 −158

File changed.

Preview size limit exceeded, changes collapsed.