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

arm64: dts: qcom: msm8916: 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>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221024002356.28261-2-krzysztof.kozlowski@linaro.org
parent 5a134c94

arch/arm64/boot/dts/qcom/apq8016-sbc.dts

+7 −7
Original line number Diff line number Diff line
@@ -718,14 +718,14 @@ &msmgpio { 
		"USR_LED_2_CTRL", /* GPIO 120 */

		"SB_HS_ID";



	msmgpio_leds: msmgpio-leds {

	msmgpio_leds: msmgpio-leds-state {

		pins = "gpio21", "gpio120";

		function = "gpio";



		output-low;

	};



	usb_id_default: usb-id-default {

	usb_id_default: usb-id-default-state {

		pins = "gpio121";

		function = "gpio";
@@ -734,7 +734,7 @@ usb_id_default: usb-id-default { 
		bias-pull-up;

	};



	adv7533_int_active: adv533-int-active {

	adv7533_int_active: adv533-int-active-state {

		pins = "gpio31";

		function = "gpio";
@@ -742,7 +742,7 @@ adv7533_int_active: adv533-int-active { 
		bias-disable;

	};



	adv7533_int_suspend: adv7533-int-suspend {

	adv7533_int_suspend: adv7533-int-suspend-state {

		pins = "gpio31";

		function = "gpio";
@@ -750,7 +750,7 @@ adv7533_int_suspend: adv7533-int-suspend { 
		bias-disable;

	};



	adv7533_switch_active: adv7533-switch-active {

	adv7533_switch_active: adv7533-switch-active-state {

		pins = "gpio32";

		function = "gpio";
@@ -758,7 +758,7 @@ adv7533_switch_active: adv7533-switch-active { 
		bias-disable;

	};



	adv7533_switch_suspend: adv7533-switch-suspend {

	adv7533_switch_suspend: adv7533-switch-suspend-state {

		pins = "gpio32";

		function = "gpio";
@@ -766,7 +766,7 @@ adv7533_switch_suspend: adv7533-switch-suspend { 
		bias-disable;

	};



	msm_key_volp_n_default: msm-key-volp-n-default {

	msm_key_volp_n_default: msm-key-volp-n-default-state {

		pins = "gpio107";

		function = "gpio";

arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts

+7 −7
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ l18 { 
};



&msmgpio {

	accel_int_default: accel-int-default {

	accel_int_default: accel-int-default-state {

		pins = "gpio31";

		function = "gpio";
@@ -268,7 +268,7 @@ accel_int_default: accel-int-default { 
		bias-disable;

	};



	gpio_keys_default: gpio-keys-default {

	gpio_keys_default: gpio-keys-default-state {

		pins = "gpio107";

		function = "gpio";
@@ -276,7 +276,7 @@ gpio_keys_default: gpio-keys-default { 
		bias-pull-up;

	};



	gyro_int_default: gyro-int-default {

	gyro_int_default: gyro-int-default-state {

		pins = "gpio97", "gpio98";

		function = "gpio";
@@ -284,7 +284,7 @@ gyro_int_default: gyro-int-default { 
		bias-disable;

	};



	mag_reset_default: mag-reset-default {

	mag_reset_default: mag-reset-default-state {

		pins = "gpio8";

		function = "gpio";
@@ -292,7 +292,7 @@ mag_reset_default: mag-reset-default { 
		bias-disable;

	};



	proximity_int_default: proximity-int-default {

	proximity_int_default: proximity-int-default-state {

		pins = "gpio12";

		function = "gpio";
@@ -300,7 +300,7 @@ proximity_int_default: proximity-int-default { 
		bias-pull-up;

	};



	ts_int_reset_default: ts-int-reset-default {

	ts_int_reset_default: ts-int-reset-default-state {

		pins = "gpio13", "gpio100";

		function = "gpio";
@@ -308,7 +308,7 @@ ts_int_reset_default: ts-int-reset-default { 
		bias-disable;

	};



	usb_id_default: usb-id-default {

	usb_id_default: usb-id-default-state {

		pins = "gpio69";

		function = "gpio";

arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts

+13 −11
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ l18 { 
};



&msmgpio {

	gpio_keys_default: gpio-keys-default {

	gpio_keys_default: gpio-keys-default-state {

		pins = "gpio107", "gpio117";

		function = "gpio";
@@ -271,7 +271,7 @@ gpio_keys_default: gpio-keys-default { 
		bias-pull-up;

	};



	imu_default: imu-default {

	imu_default: imu-default-state {

		pins = "gpio36";

		function = "gpio";
@@ -279,7 +279,7 @@ imu_default: imu-default { 
		bias-disable;

	};



	mag_reset_default: mag-reset-default {

	mag_reset_default: mag-reset-default-state {

		pins = "gpio112";

		function = "gpio";
@@ -287,7 +287,7 @@ mag_reset_default: mag-reset-default { 
		bias-disable;

	};



	sd_vmmc_en_default: sd-vmmc-en-default {

	sd_vmmc_en_default: sd-vmmc-en-default-state {

		pins = "gpio87";

		function = "gpio";
@@ -295,14 +295,16 @@ sd_vmmc_en_default: sd-vmmc-en-default { 
		bias-disable;

	};



	touchscreen_default: touchscreen-default {

	touchscreen_default: touchscreen-default-state {

		touch-pins {

			pins = "gpio13";

			function = "gpio";



			drive-strength = <2>;

			bias-pull-up;

		};



		reset {

		reset-pins {

			pins = "gpio12";

			function = "gpio";
@@ -311,7 +313,7 @@ reset { 
		};

	};



	usb_id_default: usb-id-default {

	usb_id_default: usb-id-default-state {

		pins = "gpio110";

		function = "gpio";

arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts

+10 −10
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ l18 { 
};



&msmgpio {

	accel_irq_default: accel-irq-default {

	accel_irq_default: accel-irq-default-state {

		pins = "gpio115";

		function = "gpio";
@@ -422,7 +422,7 @@ accel_irq_default: accel-irq-default { 
		bias-disable;

	};



	gpio_keys_default: gpio-keys-default {

	gpio_keys_default: gpio-keys-default-state {

		pins = "gpio107";

		function = "gpio";
@@ -430,7 +430,7 @@ gpio_keys_default: gpio-keys-default { 
		bias-pull-up;

	};



	gpio_leds_default: gpio-leds-default {

	gpio_leds_default: gpio-leds-default-state {

		pins = "gpio8", "gpio9", "gpio10";

		function = "gpio";
@@ -438,7 +438,7 @@ gpio_leds_default: gpio-leds-default { 
		bias-disable;

	};



	nfc_default: nfc-default {

	nfc_default: nfc-default-state {

		pins = "gpio2", "gpio20", "gpio21";

		function = "gpio";
@@ -446,7 +446,7 @@ nfc_default: nfc-default { 
		bias-disable;

	};



	mag_reset_default: mag-reset-default {

	mag_reset_default: mag-reset-default-state {

		pins = "gpio36";

		function = "gpio";
@@ -454,7 +454,7 @@ mag_reset_default: mag-reset-default { 
		bias-disable;

	};



	prox_irq_default: prox-irq-default {

	prox_irq_default: prox-irq-default-state {

		pins = "gpio113";

		function = "gpio";
@@ -462,7 +462,7 @@ prox_irq_default: prox-irq-default { 
		bias-disable;

	};



	reg_lcd_en_default: reg-lcd-en-default {

	reg_lcd_en_default: reg-lcd-en-default-state {

		pins = "gpio32", "gpio97";

		function = "gpio";
@@ -470,7 +470,7 @@ reg_lcd_en_default: reg-lcd-en-default { 
		bias-disable;

	};



	sdhc2_cd_default: sdhc2-cd-default {

	sdhc2_cd_default: sdhc2-cd-default-state {

		pins = "gpio56";

		function = "gpio";
@@ -478,7 +478,7 @@ sdhc2_cd_default: sdhc2-cd-default { 
		bias-disable;

	};



	ts_irq_default: ts-irq-default {

	ts_irq_default: ts-irq-default-state {

		pins = "gpio13";

		function = "gpio";
@@ -486,7 +486,7 @@ ts_irq_default: ts-irq-default { 
		bias-disable;

	};



	usb_id_default: usb-id-default {

	usb_id_default: usb-id-default-state {

		pins = "gpio117";

		function = "gpio";

arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts

+8 −8
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ l18 { 
};



&msmgpio {

	accel_int_default: accel-int-default {

	accel_int_default: accel-int-default-state {

		pins = "gpio116";

		function = "gpio";
@@ -375,7 +375,7 @@ accel_int_default: accel-int-default { 
		bias-disable;

	};



	camera_flash_default: camera-flash-default {

	camera_flash_default: camera-flash-default-state {

		pins = "gpio31", "gpio32";

		function = "gpio";
@@ -383,7 +383,7 @@ camera_flash_default: camera-flash-default { 
		bias-disable;

	};



	ctp_pwr_en_default: ctp-pwr-en-default {

	ctp_pwr_en_default: ctp-pwr-en-default-state {

		pins = "gpio17";

		function = "gpio";
@@ -391,7 +391,7 @@ ctp_pwr_en_default: ctp-pwr-en-default { 
		bias-disable;

	};



	gpio_keys_default: gpio-keys-default {

	gpio_keys_default: gpio-keys-default-state {

		pins = "gpio107";

		function = "gpio";
@@ -399,7 +399,7 @@ gpio_keys_default: gpio-keys-default { 
		bias-pull-up;

	};



	gyro_int_default: gyro-int-default {

	gyro_int_default: gyro-int-default-state {

		pins = "gpio22", "gpio23";

		function = "gpio";
@@ -407,7 +407,7 @@ gyro_int_default: gyro-int-default { 
		bias-disable;

	};



	light_int_default: light-int-default {

	light_int_default: light-int-default-state {

		pins = "gpio115";

		function = "gpio";
@@ -415,7 +415,7 @@ light_int_default: light-int-default { 
		bias-disable;

	};



	magn_int_default: magn-int-default {

	magn_int_default: magn-int-default-state {

		pins = "gpio113";

		function = "gpio";
@@ -423,7 +423,7 @@ magn_int_default: magn-int-default { 
		bias-disable;

	};



	tp_int_default: tp-int-default {

	tp_int_default: tp-int-default-state {

		pins = "gpio13";

		function = "gpio";