linux-gpio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema
  2022-10-24  0:23 Krzysztof Kozlowski
@ 2022-10-24  0:23 ` Krzysztof Kozlowski
  2022-10-24  8:07   ` Neil Armstrong
  2022-11-04 21:20   ` Konrad Dybcio
  0 siblings, 2 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-24  0:23 UTC (permalink / raw)
  To: Bjorn Andersson, Andy Gross, Konrad Dybcio, Linus Walleij,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, linux-gpio,
	devicetree, linux-kernel
  Cc: Krzysztof Kozlowski

DT schema expects TLMM pin configuration nodes to be named with
'-state' suffix and their optional children with '-pins' suffix.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

---

Not tested on hardware.
---
 arch/arm64/boot/dts/qcom/apq8016-sbc.dts      |  14 +-
 .../boot/dts/qcom/msm8916-alcatel-idol347.dts |  14 +-
 .../arm64/boot/dts/qcom/msm8916-asus-z00l.dts |  24 +-
 .../arm64/boot/dts/qcom/msm8916-huawei-g7.dts |  20 +-
 .../boot/dts/qcom/msm8916-longcheer-l8150.dts |  16 +-
 .../boot/dts/qcom/msm8916-longcheer-l8910.dts |   8 +-
 arch/arm64/boot/dts/qcom/msm8916-pins.dtsi    | 274 +++++++++---------
 .../qcom/msm8916-samsung-a2015-common.dtsi    |  61 ++--
 .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts |   6 +-
 .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts |   2 +-
 .../qcom/msm8916-samsung-e2015-common.dtsi    |   4 +-
 .../dts/qcom/msm8916-samsung-grandmax.dts     |   2 +-
 .../boot/dts/qcom/msm8916-samsung-j5.dts      |   2 +-
 .../dts/qcom/msm8916-samsung-serranove.dts    |  41 +--
 .../dts/qcom/msm8916-wingtech-wt88047.dts     |  21 +-
 15 files changed, 259 insertions(+), 250 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index 1b613098fb4a..9ebc506810f6 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -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";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index 3dc9619fde6e..668f8ff53229 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -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";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
index dd92070a1211..3618704a5330 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
@@ -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 {
-		pins = "gpio13";
-		function = "gpio";
+	touchscreen_default: touchscreen-default-state {
+		touch-pins {
+			pins = "gpio13";
+			function = "gpio";
 
-		drive-strength = <2>;
-		bias-pull-up;
+			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";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index 9e470c67274e..a6a7d870f586 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -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";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index d85e7f7c0835..31214570be4b 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -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";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index b4812f093b17..3899e11b9843 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -234,7 +234,7 @@ l18 {
 };
 
 &msmgpio {
-	button_backlight_default: button-backlight-default {
+	button_backlight_default: button-backlight-default-state {
 		pins = "gpio17";
 		function = "gpio";
 
@@ -242,7 +242,7 @@ button_backlight_default: button-backlight-default {
 		bias-disable;
 	};
 
-	gpio_keys_default: gpio-keys-default {
+	gpio_keys_default: gpio-keys-default-state {
 		pins = "gpio107";
 		function = "gpio";
 
@@ -250,7 +250,7 @@ gpio_keys_default: gpio-keys-default {
 		bias-pull-up;
 	};
 
-	mag_reset_default: mag-reset-default {
+	mag_reset_default: mag-reset-default-state {
 		pins = "gpio111";
 		function = "gpio";
 
@@ -258,7 +258,7 @@ mag_reset_default: mag-reset-default {
 		bias-disable;
 	};
 
-	usb_id_default: usb-id-default {
+	usb_id_default: usb-id-default-state {
 		pins = "gpio110";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
index 7dedb91b9930..db9e448d0a64 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
@@ -5,7 +5,7 @@
 
 &msmgpio {
 
-	blsp1_uart1_default: blsp1-uart1-default {
+	blsp1_uart1_default: blsp1-uart1-default-state {
 		//	TX, RX, CTS_N, RTS_N
 		pins = "gpio0", "gpio1", "gpio2", "gpio3";
 		function = "blsp_uart1";
@@ -14,7 +14,7 @@ blsp1_uart1_default: blsp1-uart1-default {
 		bias-disable;
 	};
 
-	blsp1_uart1_sleep: blsp1-uart1-sleep {
+	blsp1_uart1_sleep: blsp1-uart1-sleep-state {
 		pins = "gpio0", "gpio1", "gpio2", "gpio3";
 		function = "gpio";
 
@@ -22,7 +22,7 @@ blsp1_uart1_sleep: blsp1-uart1-sleep {
 		bias-pull-down;
 	};
 
-	blsp1_uart2_default: blsp1-uart2-default {
+	blsp1_uart2_default: blsp1-uart2-default-state {
 		pins = "gpio4", "gpio5";
 		function = "blsp_uart2";
 
@@ -30,7 +30,7 @@ blsp1_uart2_default: blsp1-uart2-default {
 		bias-disable;
 	};
 
-	blsp1_uart2_sleep: blsp1-uart2-sleep {
+	blsp1_uart2_sleep: blsp1-uart2-sleep-state {
 		pins = "gpio4", "gpio5";
 		function = "gpio";
 
@@ -38,14 +38,15 @@ blsp1_uart2_sleep: blsp1-uart2-sleep {
 		bias-pull-down;
 	};
 
-	spi1_default: spi1-default {
-		pins = "gpio0", "gpio1", "gpio3";
-		function = "blsp_spi1";
+	spi1_default: spi1-default-state {
+		spi-pins {
+			pins = "gpio0", "gpio1", "gpio3";
+			function = "blsp_spi1";
 
-		drive-strength = <12>;
-		bias-disable;
-
-		cs {
+			drive-strength = <12>;
+			bias-disable;
+		};
+		cs-pins {
 			pins = "gpio2";
 			function = "gpio";
 
@@ -55,7 +56,7 @@ cs {
 		};
 	};
 
-	spi1_sleep: spi1-sleep {
+	spi1_sleep: spi1-sleep-state {
 		pins = "gpio0", "gpio1", "gpio2", "gpio3";
 		function = "gpio";
 
@@ -63,14 +64,15 @@ spi1_sleep: spi1-sleep {
 		bias-pull-down;
 	};
 
-	spi2_default: spi2-default {
-		pins = "gpio4", "gpio5", "gpio7";
-		function = "blsp_spi2";
+	spi2_default: spi2-default-state {
+		spi-pins {
+			pins = "gpio4", "gpio5", "gpio7";
+			function = "blsp_spi2";
 
-		drive-strength = <12>;
-		bias-disable;
-
-		cs {
+			drive-strength = <12>;
+			bias-disable;
+		};
+		cs-pins {
 			pins = "gpio6";
 			function = "gpio";
 
@@ -80,7 +82,7 @@ cs {
 		};
 	};
 
-	spi2_sleep: spi2-sleep {
+	spi2_sleep: spi2-sleep-state {
 		pins = "gpio4", "gpio5", "gpio6", "gpio7";
 		function = "gpio";
 
@@ -88,14 +90,15 @@ spi2_sleep: spi2-sleep {
 		bias-pull-down;
 	};
 
-	spi3_default: spi3-default {
-		pins = "gpio8", "gpio9", "gpio11";
-		function = "blsp_spi3";
+	spi3_default: spi3-default-state {
+		spi-pins {
+			pins = "gpio8", "gpio9", "gpio11";
+			function = "blsp_spi3";
 
-		drive-strength = <12>;
-		bias-disable;
-
-		cs {
+			drive-strength = <12>;
+			bias-disable;
+		};
+		cs-pins {
 			pins = "gpio10";
 			function = "gpio";
 
@@ -105,7 +108,7 @@ cs {
 		};
 	};
 
-	spi3_sleep: spi3-sleep {
+	spi3_sleep: spi3-sleep-state {
 		pins = "gpio8", "gpio9", "gpio10", "gpio11";
 		function = "gpio";
 
@@ -113,14 +116,15 @@ spi3_sleep: spi3-sleep {
 		bias-pull-down;
 	};
 
-	spi4_default: spi4-default {
-		pins = "gpio12", "gpio13", "gpio15";
-		function = "blsp_spi4";
-
-		drive-strength = <12>;
-		bias-disable;
+	spi4_default: spi4-default-state {
+		spi-pins {
+			pins = "gpio12", "gpio13", "gpio15";
+			function = "blsp_spi4";
 
-		cs {
+			drive-strength = <12>;
+			bias-disable;
+		};
+		cs-pins {
 			pins = "gpio14";
 			function = "gpio";
 
@@ -130,7 +134,7 @@ cs {
 		};
 	};
 
-	spi4_sleep: spi4-sleep {
+	spi4_sleep: spi4-sleep-state {
 		pins = "gpio12", "gpio13", "gpio14", "gpio15";
 		function = "gpio";
 
@@ -138,14 +142,15 @@ spi4_sleep: spi4-sleep {
 		bias-pull-down;
 	};
 
-	spi5_default: spi5-default {
-		pins = "gpio16", "gpio17", "gpio19";
-		function = "blsp_spi5";
+	spi5_default: spi5-default-state {
+		spi-pins {
+			pins = "gpio16", "gpio17", "gpio19";
+			function = "blsp_spi5";
 
-		drive-strength = <12>;
-		bias-disable;
-
-		cs {
+			drive-strength = <12>;
+			bias-disable;
+		};
+		cs-pins {
 			pins = "gpio18";
 			function = "gpio";
 
@@ -155,7 +160,7 @@ cs {
 		};
 	};
 
-	spi5_sleep: spi5-sleep {
+	spi5_sleep: spi5-sleep-state {
 		pins = "gpio16", "gpio17", "gpio18", "gpio19";
 		function = "gpio";
 
@@ -163,14 +168,15 @@ spi5_sleep: spi5-sleep {
 		bias-pull-down;
 	};
 
-	spi6_default: spi6-default {
-		pins = "gpio20", "gpio21", "gpio23";
-		function = "blsp_spi6";
-
-		drive-strength = <12>;
-		bias-disable;
+	spi6_default: spi6-default-state {
+		spi-pins {
+			pins = "gpio20", "gpio21", "gpio23";
+			function = "blsp_spi6";
 
-		cs {
+			drive-strength = <12>;
+			bias-disable;
+		};
+		cs-pins {
 			pins = "gpio22";
 			function = "gpio";
 
@@ -180,7 +186,7 @@ cs {
 		};
 	};
 
-	spi6_sleep: spi6-sleep {
+	spi6_sleep: spi6-sleep-state {
 		pins = "gpio20", "gpio21", "gpio22", "gpio23";
 		function = "gpio";
 
@@ -188,7 +194,7 @@ spi6_sleep: spi6-sleep {
 		bias-pull-down;
 	};
 
-	i2c1_default: i2c1-default {
+	i2c1_default: i2c1-default-state {
 		pins = "gpio2", "gpio3";
 		function = "blsp_i2c1";
 
@@ -196,7 +202,7 @@ i2c1_default: i2c1-default {
 		bias-disable;
 	};
 
-	i2c1_sleep: i2c1-sleep {
+	i2c1_sleep: i2c1-sleep-state {
 		pins = "gpio2", "gpio3";
 		function = "gpio";
 
@@ -204,7 +210,7 @@ i2c1_sleep: i2c1-sleep {
 		bias-disable;
 	};
 
-	i2c2_default: i2c2-default {
+	i2c2_default: i2c2-default-state {
 		pins = "gpio6", "gpio7";
 		function = "blsp_i2c2";
 
@@ -212,7 +218,7 @@ i2c2_default: i2c2-default {
 		bias-disable;
 	};
 
-	i2c2_sleep: i2c2-sleep {
+	i2c2_sleep: i2c2-sleep-state {
 		pins = "gpio6", "gpio7";
 		function = "gpio";
 
@@ -220,7 +226,7 @@ i2c2_sleep: i2c2-sleep {
 		bias-disable;
 	};
 
-	i2c3_default: i2c3-default {
+	i2c3_default: i2c3-default-state {
 		pins = "gpio10", "gpio11";
 		function = "blsp_i2c3";
 
@@ -228,7 +234,7 @@ i2c3_default: i2c3-default {
 		bias-disable;
 	};
 
-	i2c3_sleep: i2c3-sleep {
+	i2c3_sleep: i2c3-sleep-state {
 		pins = "gpio10", "gpio11";
 		function = "gpio";
 
@@ -236,7 +242,7 @@ i2c3_sleep: i2c3-sleep {
 		bias-disable;
 	};
 
-	i2c4_default: i2c4-default {
+	i2c4_default: i2c4-default-state {
 		pins = "gpio14", "gpio15";
 		function = "blsp_i2c4";
 
@@ -244,7 +250,7 @@ i2c4_default: i2c4-default {
 		bias-disable;
 	};
 
-	i2c4_sleep: i2c4-sleep {
+	i2c4_sleep: i2c4-sleep-state {
 		pins = "gpio14", "gpio15";
 		function = "gpio";
 
@@ -252,7 +258,7 @@ i2c4_sleep: i2c4-sleep {
 		bias-disable;
 	};
 
-	i2c5_default: i2c5-default {
+	i2c5_default: i2c5-default-state {
 		pins = "gpio18", "gpio19";
 		function = "blsp_i2c5";
 
@@ -260,7 +266,7 @@ i2c5_default: i2c5-default {
 		bias-disable;
 	};
 
-	i2c5_sleep: i2c5-sleep {
+	i2c5_sleep: i2c5-sleep-state {
 		pins = "gpio18", "gpio19";
 		function = "gpio";
 
@@ -268,7 +274,7 @@ i2c5_sleep: i2c5-sleep {
 		bias-disable;
 	};
 
-	i2c6_default: i2c6-default {
+	i2c6_default: i2c6-default-state {
 		pins = "gpio22", "gpio23";
 		function = "blsp_i2c6";
 
@@ -276,7 +282,7 @@ i2c6_default: i2c6-default {
 		bias-disable;
 	};
 
-	i2c6_sleep: i2c6-sleep {
+	i2c6_sleep: i2c6-sleep-state {
 		pins = "gpio22", "gpio23";
 		function = "gpio";
 
@@ -284,14 +290,14 @@ i2c6_sleep: i2c6-sleep {
 		bias-disable;
 	};
 
-	pmx-sdc1-clk {
-		sdc1_clk_on: clk-on {
+	pmx-sdc1-clk-state {
+		sdc1_clk_on: clk-on-pins {
 			pins = "sdc1_clk";
 
 			bias-disable;
 			drive-strength = <16>;
 		};
-		sdc1_clk_off: clk-off {
+		sdc1_clk_off: clk-off-pins {
 			pins = "sdc1_clk";
 
 			bias-disable;
@@ -299,14 +305,14 @@ sdc1_clk_off: clk-off {
 		};
 	};
 
-	pmx-sdc1-cmd {
-		sdc1_cmd_on: cmd-on {
+	pmx-sdc1-cmd-state {
+		sdc1_cmd_on: cmd-on-pins {
 			pins = "sdc1_cmd";
 
 			bias-pull-up;
 			drive-strength = <10>;
 		};
-		sdc1_cmd_off: cmd-off {
+		sdc1_cmd_off: cmd-off-pins {
 			pins = "sdc1_cmd";
 
 			bias-pull-up;
@@ -314,14 +320,14 @@ sdc1_cmd_off: cmd-off {
 		};
 	};
 
-	pmx-sdc1-data {
-		sdc1_data_on: data-on {
+	pmx-sdc1-data-state {
+		sdc1_data_on: data-on-pins {
 			pins = "sdc1_data";
 
 			bias-pull-up;
 			drive-strength = <10>;
 		};
-		sdc1_data_off: data-off {
+		sdc1_data_off: data-off-pins {
 			pins = "sdc1_data";
 
 			bias-pull-up;
@@ -329,14 +335,14 @@ sdc1_data_off: data-off {
 		};
 	};
 
-	pmx-sdc2-clk {
-		sdc2_clk_on: clk-on {
+	pmx-sdc2-clk-state {
+		sdc2_clk_on: clk-on-pins {
 			pins = "sdc2_clk";
 
 			bias-disable;
 			drive-strength = <16>;
 		};
-		sdc2_clk_off: clk-off {
+		sdc2_clk_off: clk-off-pins {
 			pins = "sdc2_clk";
 
 			bias-disable;
@@ -344,14 +350,14 @@ sdc2_clk_off: clk-off {
 		};
 	};
 
-	pmx-sdc2-cmd {
-		sdc2_cmd_on: cmd-on {
+	pmx-sdc2-cmd-state {
+		sdc2_cmd_on: cmd-on-pins {
 			pins = "sdc2_cmd";
 
 			bias-pull-up;
 			drive-strength = <10>;
 		};
-		sdc2_cmd_off: cmd-off {
+		sdc2_cmd_off: cmd-off-pins {
 			pins = "sdc2_cmd";
 
 			bias-pull-up;
@@ -359,14 +365,14 @@ sdc2_cmd_off: cmd-off {
 		};
 	};
 
-	pmx-sdc2-data {
-		sdc2_data_on: data-on {
+	pmx-sdc2-data-state {
+		sdc2_data_on: data-on-pins {
 			pins = "sdc2_data";
 
 			bias-pull-up;
 			drive-strength = <10>;
 		};
-		sdc2_data_off: data-off {
+		sdc2_data_off: data-off-pins {
 			pins = "sdc2_data";
 
 			bias-pull-up;
@@ -374,15 +380,15 @@ sdc2_data_off: data-off {
 		};
 	};
 
-	pmx-sdc2-cd-pin {
-		sdc2_cd_on: cd-on {
+	pmx-sdc2-cd-pin-state {
+		sdc2_cd_on: cd-on-pins {
 			pins = "gpio38";
 			function = "gpio";
 
 			drive-strength = <2>;
 			bias-pull-up;
 		};
-		sdc2_cd_off: cd-off {
+		sdc2_cd_off: cd-off-pins {
 			pins = "gpio38";
 			function = "gpio";
 
@@ -391,8 +397,8 @@ sdc2_cd_off: cd-off {
 		};
 	};
 
-	cdc-pdm-lines {
-		cdc_pdm_lines_act: pdm-lines-on {
+	cdc-pdm-lines-state {
+		cdc_pdm_lines_act: pdm-lines-on-pins {
 			pins = "gpio63", "gpio64", "gpio65", "gpio66",
 			       "gpio67", "gpio68";
 			function = "cdc_pdm0";
@@ -400,7 +406,7 @@ cdc_pdm_lines_act: pdm-lines-on {
 			drive-strength = <8>;
 			bias-disable;
 		};
-		cdc_pdm_lines_sus: pdm-lines-off {
+		cdc_pdm_lines_sus: pdm-lines-off-pins {
 			pins = "gpio63", "gpio64", "gpio65", "gpio66",
 			       "gpio67", "gpio68";
 			function = "cdc_pdm0";
@@ -410,15 +416,15 @@ cdc_pdm_lines_sus: pdm-lines-off {
 		};
 	};
 
-	ext-pri-tlmm-lines {
-		ext_pri_tlmm_lines_act: ext-pa-on {
+	ext-pri-tlmm-lines-state {
+		ext_pri_tlmm_lines_act: ext-pa-on-pins {
 			pins = "gpio113", "gpio114", "gpio115", "gpio116";
 			function = "pri_mi2s";
 
 			drive-strength = <8>;
 			bias-disable;
 		};
-		ext_pri_tlmm_lines_sus: ext-pa-off {
+		ext_pri_tlmm_lines_sus: ext-pa-off-pins {
 			pins = "gpio113", "gpio114", "gpio115", "gpio116";
 			function = "pri_mi2s";
 
@@ -427,15 +433,15 @@ ext_pri_tlmm_lines_sus: ext-pa-off {
 		};
 	};
 
-	ext-pri-ws-line {
-		ext_pri_ws_act: ext-pa-on {
+	ext-pri-ws-line-state {
+		ext_pri_ws_act: ext-pa-on-pins {
 			pins = "gpio110";
 			function = "pri_mi2s_ws";
 
 			drive-strength = <8>;
 			bias-disable;
 		};
-		ext_pri_ws_sus: ext-pa-off {
+		ext_pri_ws_sus: ext-pa-off-pins {
 			pins = "gpio110";
 			function = "pri_mi2s_ws";
 
@@ -444,15 +450,15 @@ ext_pri_ws_sus: ext-pa-off {
 		};
 	};
 
-	ext-mclk-tlmm-lines {
-		ext_mclk_tlmm_lines_act: mclk-lines-on {
+	ext-mclk-tlmm-lines-state {
+		ext_mclk_tlmm_lines_act: mclk-lines-on-pins {
 			pins = "gpio116";
 			function = "pri_mi2s";
 
 			drive-strength = <8>;
 			bias-disable;
 		};
-		ext_mclk_tlmm_lines_sus: mclk-lines-off {
+		ext_mclk_tlmm_lines_sus: mclk-lines-off-pins {
 			pins = "gpio116";
 			function = "pri_mi2s";
 
@@ -462,15 +468,15 @@ ext_mclk_tlmm_lines_sus: mclk-lines-off {
 	};
 
 	/* secondary Mi2S */
-	ext-sec-tlmm-lines {
-		ext_sec_tlmm_lines_act: tlmm-lines-on {
+	ext-sec-tlmm-lines-state {
+		ext_sec_tlmm_lines_act: tlmm-lines-on-pins {
 			pins = "gpio112", "gpio117", "gpio118", "gpio119";
 			function = "sec_mi2s";
 
 			drive-strength = <8>;
 			bias-disable;
 		};
-		ext_sec_tlmm_lines_sus: tlmm-lines-off {
+		ext_sec_tlmm_lines_sus: tlmm-lines-off-pins {
 			pins = "gpio112", "gpio117", "gpio118", "gpio119";
 			function = "sec_mi2s";
 
@@ -479,40 +485,38 @@ ext_sec_tlmm_lines_sus: tlmm-lines-off {
 		};
 	};
 
-	cdc-dmic-lines {
-		cdc_dmic_lines_act: dmic-lines-on {
-			clk {
-				pins = "gpio0";
-				function = "dmic0_clk";
+	cdc_dmic_lines_act: cdc-dmic-lines-on-state {
+		clk-pins {
+			pins = "gpio0";
+			function = "dmic0_clk";
 
-				drive-strength = <8>;
-			};
-			data {
-				pins = "gpio1";
-				function = "dmic0_data";
+			drive-strength = <8>;
+		};
+		data-pins {
+			pins = "gpio1";
+			function = "dmic0_data";
 
-				drive-strength = <8>;
-			};
+			drive-strength = <8>;
 		};
-		cdc_dmic_lines_sus: dmic-lines-off {
-			clk {
-				pins = "gpio0";
-				function = "dmic0_clk";
+	};
+	cdc_dmic_lines_sus: cdc-dmic-lines-off-state {
+		clk-pins {
+			pins = "gpio0";
+			function = "dmic0_clk";
 
-				drive-strength = <2>;
-				bias-disable;
-			};
-			data {
-				pins = "gpio1";
-				function = "dmic0_data";
+			drive-strength = <2>;
+			bias-disable;
+		};
+		data-pins {
+			pins = "gpio1";
+			function = "dmic0_data";
 
-				drive-strength = <2>;
-				bias-disable;
-			};
+			drive-strength = <2>;
+			bias-disable;
 		};
 	};
 
-	wcnss_pin_a: wcnss-active {
+	wcnss_pin_a: wcnss-active-state {
 		pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44";
 		function = "wcss_wlan";
 
@@ -520,7 +524,7 @@ wcnss_pin_a: wcnss-active {
 		bias-pull-up;
 	};
 
-	cci0_default: cci0-default {
+	cci0_default: cci0-default-state {
 		pins = "gpio29", "gpio30";
 		function = "cci_i2c";
 
@@ -528,22 +532,22 @@ cci0_default: cci0-default {
 		bias-disable;
 	};
 
-	camera_front_default: camera-front-default {
-		pwdn {
+	camera_front_default: camera-front-default-state {
+		pwdn-pins {
 			pins = "gpio33";
 			function = "gpio";
 
 			drive-strength = <16>;
 			bias-disable;
 		};
-		rst {
+		rst-pins {
 			pins = "gpio28";
 			function = "gpio";
 
 			drive-strength = <16>;
 			bias-disable;
 		};
-		mclk1 {
+		mclk1-pins {
 			pins = "gpio27";
 			function = "cam_mclk1";
 
@@ -552,22 +556,22 @@ mclk1 {
 		};
 	};
 
-	camera_rear_default: camera-rear-default {
-		pwdn {
+	camera_rear_default: camera-rear-default-state {
+		pwdn-pins {
 			pins = "gpio34";
 			function = "gpio";
 
 			drive-strength = <16>;
 			bias-disable;
 		};
-		rst {
+		rst-pins {
 			pins = "gpio35";
 			function = "gpio";
 
 			drive-strength = <16>;
 			bias-disable;
 		};
-		mclk0 {
+		mclk0-pins {
 			pins = "gpio26";
 			function = "cam_mclk0";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index 5f7cec347a4f..d701260c78b0 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -348,7 +348,7 @@ l18 {
 };
 
 &msmgpio {
-	accel_int_default: accel-int-default {
+	accel_int_default: accel-int-default-state {
 		pins = "gpio115";
 		function = "gpio";
 
@@ -356,7 +356,7 @@ accel_int_default: accel-int-default {
 		bias-disable;
 	};
 
-	fg_alert_default: fg-alert-default {
+	fg_alert_default: fg-alert-default-state {
 		pins = "gpio121";
 		function = "gpio";
 
@@ -364,7 +364,7 @@ fg_alert_default: fg-alert-default {
 		bias-disable;
 	};
 
-	gpio_keys_default: gpio-keys-default {
+	gpio_keys_default: gpio-keys-default-state {
 		pins = "gpio107", "gpio109";
 		function = "gpio";
 
@@ -372,7 +372,7 @@ gpio_keys_default: gpio-keys-default {
 		bias-pull-up;
 	};
 
-	gpio_hall_sensor_default: gpio-hall-sensor-default {
+	gpio_hall_sensor_default: gpio-hall-sensor-default-state {
 		pins = "gpio52";
 		function = "gpio";
 
@@ -380,24 +380,23 @@ gpio_hall_sensor_default: gpio-hall-sensor-default {
 		bias-disable;
 	};
 
-	mdss {
-		mdss_default: mdss-default {
-			pins = "gpio25";
-			function = "gpio";
+	mdss_default: mdss-default-state {
+		pins = "gpio25";
+		function = "gpio";
 
-			drive-strength = <8>;
-			bias-disable;
-		};
-		mdss_sleep: mdss-sleep {
-			pins = "gpio25";
-			function = "gpio";
+		drive-strength = <8>;
+		bias-disable;
+	};
 
-			drive-strength = <2>;
-			bias-pull-down;
-		};
+	mdss_sleep: mdss-sleep-state {
+		pins = "gpio25";
+		function = "gpio";
+
+		drive-strength = <2>;
+		bias-pull-down;
 	};
 
-	muic_i2c_default: muic-i2c-default {
+	muic_i2c_default: muic-i2c-default-state {
 		pins = "gpio105", "gpio106";
 		function = "gpio";
 
@@ -405,7 +404,7 @@ muic_i2c_default: muic-i2c-default {
 		bias-disable;
 	};
 
-	muic_int_default: muic-int-default {
+	muic_int_default: muic-int-default-state {
 		pins = "gpio12";
 		function = "gpio";
 
@@ -413,14 +412,16 @@ muic_int_default: muic-int-default {
 		bias-disable;
 	};
 
-	nfc_default: nfc-default {
-		pins = "gpio20", "gpio49";
-		function = "gpio";
+	nfc_default: nfc-default-state {
+		nfc-pins {
+			pins = "gpio20", "gpio49";
+			function = "gpio";
 
-		drive-strength = <2>;
-		bias-disable;
+			drive-strength = <2>;
+			bias-disable;
+		};
 
-		irq {
+		irq-pins {
 			pins = "gpio21";
 			function = "gpio";
 
@@ -429,7 +430,7 @@ irq {
 		};
 	};
 
-	nfc_i2c_default: nfc-i2c-default {
+	nfc_i2c_default: nfc-i2c-default-state {
 		pins = "gpio0", "gpio1";
 		function = "gpio";
 
@@ -437,7 +438,7 @@ nfc_i2c_default: nfc-i2c-default {
 		bias-disable;
 	};
 
-	tkey_default: tkey-default {
+	tkey_default: tkey-default-state {
 		pins = "gpio98";
 		function = "gpio";
 
@@ -445,7 +446,7 @@ tkey_default: tkey-default {
 		bias-disable;
 	};
 
-	tkey_i2c_default: tkey-i2c-default {
+	tkey_i2c_default: tkey-i2c-default-state {
 		pins = "gpio16", "gpio17";
 		function = "gpio";
 
@@ -453,7 +454,7 @@ tkey_i2c_default: tkey-i2c-default {
 		bias-disable;
 	};
 
-	tsp_en_default: tsp-en-default {
+	tsp_en_default: tsp-en-default-state {
 		pins = "gpio73";
 		function = "gpio";
 
@@ -461,7 +462,7 @@ tsp_en_default: tsp-en-default {
 		bias-disable;
 	};
 
-	ts_int_default: ts-int-default {
+	ts_int_default: ts-int-default-state {
 		pins = "gpio13";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
index 6db5f78ca286..0733b73b6dd1 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
@@ -105,7 +105,7 @@ &dsi0_out {
 };
 
 &msmgpio {
-	panel_vdd3_default: panel-vdd3-default {
+	panel_vdd3_default: panel-vdd3-default-state {
 		pins = "gpio9";
 		function = "gpio";
 
@@ -113,7 +113,7 @@ panel_vdd3_default: panel-vdd3-default {
 		bias-disable;
 	};
 
-	tkey_en_default: tkey-en-default {
+	tkey_en_default: tkey-en-default-state {
 		pins = "gpio86";
 		function = "gpio";
 
@@ -121,7 +121,7 @@ tkey_en_default: tkey-en-default {
 		bias-disable;
 	};
 
-	tkey_led_en_default: tkey-led-en-default {
+	tkey_led_en_default: tkey-led-en-default-state {
 		pins = "gpio60";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
index 5fb8ecd0c9ca..5131bb1f6ba3 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
@@ -62,7 +62,7 @@ &touchkey {
 };
 
 &msmgpio {
-	tkey_en_default: tkey-en-default {
+	tkey_en_default: tkey-en-default-state {
 		pins = "gpio97";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
index 542010fdfb8a..450986e09c33 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
@@ -67,7 +67,7 @@ &touchkey {
 };
 
 &msmgpio {
-	motor_en_default: motor-en-default {
+	motor_en_default: motor-en-default-state {
 		pins = "gpio76";
 		function = "gpio";
 
@@ -75,7 +75,7 @@ motor_en_default: motor-en-default {
 		bias-disable;
 	};
 
-	tkey_en_default: tkey-en-default {
+	tkey_en_default: tkey-en-default-state {
 		pins = "gpio97";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
index bc7134698978..a3d572d851ef 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
@@ -46,7 +46,7 @@ &reg_touch_key {
 };
 
 &msmgpio {
-	gpio_leds_default: gpio-led-default {
+	gpio_leds_default: gpio-led-default-state {
 		pins = "gpio60";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
index eabeed18cfaa..7ac49a021563 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
@@ -199,7 +199,7 @@ l18 {
 };
 
 &msmgpio {
-	gpio_keys_default: gpio-keys-default {
+	gpio_keys_default: gpio-keys-default-state {
 		pins = "gpio107", "gpio109";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
index bbd6bb3f4fd7..f0ee5ed7cf81 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
@@ -422,7 +422,7 @@ l18 {
 };
 
 &msmgpio {
-	fg_alert_default: fg-alert-default {
+	fg_alert_default: fg-alert-default-state {
 		pins = "gpio121";
 		function = "gpio";
 
@@ -430,7 +430,7 @@ fg_alert_default: fg-alert-default {
 		bias-disable;
 	};
 
-	gpio_keys_default: gpio-keys-default {
+	gpio_keys_default: gpio-keys-default-state {
 		pins = "gpio107", "gpio109";
 		function = "gpio";
 
@@ -438,7 +438,7 @@ gpio_keys_default: gpio-keys-default {
 		bias-pull-up;
 	};
 
-	gpio_hall_sensor_default: gpio-hall-sensor-default {
+	gpio_hall_sensor_default: gpio-hall-sensor-default-state {
 		pins = "gpio52";
 		function = "gpio";
 
@@ -446,7 +446,7 @@ gpio_hall_sensor_default: gpio-hall-sensor-default {
 		bias-disable;
 	};
 
-	imu_irq_default: imu-irq-default {
+	imu_irq_default: imu-irq-default-state {
 		pins = "gpio115";
 		function = "gpio";
 
@@ -454,7 +454,7 @@ imu_irq_default: imu-irq-default {
 		bias-disable;
 	};
 
-	muic_i2c_default: muic-i2c-default {
+	muic_i2c_default: muic-i2c-default-state {
 		pins = "gpio105", "gpio106";
 		function = "gpio";
 
@@ -462,7 +462,7 @@ muic_i2c_default: muic-i2c-default {
 		bias-disable;
 	};
 
-	muic_irq_default: muic-irq-default {
+	muic_irq_default: muic-irq-default-state {
 		pins = "gpio12";
 		function = "gpio";
 
@@ -470,14 +470,15 @@ muic_irq_default: muic-irq-default {
 		bias-disable;
 	};
 
-	nfc_default: nfc-default {
-		pins = "gpio20", "gpio49";
-		function = "gpio";
-
-		drive-strength = <2>;
-		bias-disable;
+	nfc_default: nfc-default-state {
+		nfc-pins {
+			pins = "gpio20", "gpio49";
+			function = "gpio";
 
-		irq {
+			drive-strength = <2>;
+			bias-disable;
+		};
+		irq-pins {
 			pins = "gpio21";
 			function = "gpio";
 
@@ -486,7 +487,7 @@ irq {
 		};
 	};
 
-	nfc_i2c_default: nfc-i2c-default {
+	nfc_i2c_default: nfc-i2c-default-state {
 		pins = "gpio0", "gpio1";
 		function = "gpio";
 
@@ -494,7 +495,7 @@ nfc_i2c_default: nfc-i2c-default {
 		bias-disable;
 	};
 
-	tkey_default: tkey-default {
+	tkey_default: tkey-default-state {
 		pins = "gpio98";
 		function = "gpio";
 
@@ -502,7 +503,7 @@ tkey_default: tkey-default {
 		bias-disable;
 	};
 
-	tkey_en_default: tkey-en-default {
+	tkey_en_default: tkey-en-default-state {
 		pins = "gpio86";
 		function = "gpio";
 
@@ -510,7 +511,7 @@ tkey_en_default: tkey-en-default {
 		bias-disable;
 	};
 
-	tkey_i2c_default: tkey-i2c-default {
+	tkey_i2c_default: tkey-i2c-default-state {
 		pins = "gpio16", "gpio17";
 		function = "gpio";
 
@@ -518,7 +519,7 @@ tkey_i2c_default: tkey-i2c-default {
 		bias-disable;
 	};
 
-	tkey_led_en_default: tkey-led-en-default {
+	tkey_led_en_default: tkey-led-en-default-state {
 		pins = "gpio60";
 		function = "gpio";
 
@@ -526,7 +527,7 @@ tkey_led_en_default: tkey-led-en-default {
 		bias-disable;
 	};
 
-	tsp_en_default: tsp-en-default {
+	tsp_en_default: tsp-en-default-state {
 		pins = "gpio73";
 		function = "gpio";
 
@@ -534,7 +535,7 @@ tsp_en_default: tsp-en-default {
 		bias-disable;
 	};
 
-	tsp_irq_default: tsp-irq-default {
+	tsp_irq_default: tsp-irq-default-state {
 		pins = "gpio13";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index 84a352dcf9a2..399326b8f99e 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -272,7 +272,7 @@ l18 {
 };
 
 &msmgpio {
-	gpio_keys_default: gpio-keys-default {
+	gpio_keys_default: gpio-keys-default-state {
 		pins = "gpio107";
 		function = "gpio";
 
@@ -280,7 +280,7 @@ gpio_keys_default: gpio-keys-default {
 		bias-pull-up;
 	};
 
-	imu_default: imu-default {
+	imu_default: imu-default-state {
 		pins = "gpio115";
 		function = "gpio";
 
@@ -288,14 +288,15 @@ imu_default: imu-default {
 		bias-disable;
 	};
 
-	touchscreen_default: touchscreen-default {
-		pins = "gpio13";
-		function = "gpio";
-
-		drive-strength = <2>;
-		bias-pull-up;
+	touchscreen_default: touchscreen-default-state {
+		touchscreen-pins {
+			pins = "gpio13";
+			function = "gpio";
 
-		reset {
+			drive-strength = <2>;
+			bias-pull-up;
+		};
+		reset-pins {
 			pins = "gpio12";
 			function = "gpio";
 
@@ -304,7 +305,7 @@ reset {
 		};
 	};
 
-	usb_id_default: usb-id-default {
+	usb_id_default: usb-id-default-state {
 		pins = "gpio110";
 		function = "gpio";
 
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/2] arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema
  2022-10-24  0:23 ` [PATCH 2/2] arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema Krzysztof Kozlowski
@ 2022-10-24  8:07   ` Neil Armstrong
  2022-11-04 21:20   ` Konrad Dybcio
  1 sibling, 0 replies; 8+ messages in thread
From: Neil Armstrong @ 2022-10-24  8:07 UTC (permalink / raw)
  To: Krzysztof Kozlowski, Bjorn Andersson, Andy Gross, Konrad Dybcio,
	Linus Walleij, Rob Herring, Krzysztof Kozlowski, linux-arm-msm,
	linux-gpio, devicetree, linux-kernel

On 24/10/2022 02:23, Krzysztof Kozlowski wrote:
> DT schema expects TLMM pin configuration nodes to be named with
> '-state' suffix and their optional children with '-pins' suffix.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
> ---
> 
> Not tested on hardware.
> ---
>   arch/arm64/boot/dts/qcom/apq8016-sbc.dts      |  14 +-
>   .../boot/dts/qcom/msm8916-alcatel-idol347.dts |  14 +-
>   .../arm64/boot/dts/qcom/msm8916-asus-z00l.dts |  24 +-
>   .../arm64/boot/dts/qcom/msm8916-huawei-g7.dts |  20 +-
>   .../boot/dts/qcom/msm8916-longcheer-l8150.dts |  16 +-
>   .../boot/dts/qcom/msm8916-longcheer-l8910.dts |   8 +-
>   arch/arm64/boot/dts/qcom/msm8916-pins.dtsi    | 274 +++++++++---------
>   .../qcom/msm8916-samsung-a2015-common.dtsi    |  61 ++--
>   .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts |   6 +-
>   .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts |   2 +-
>   .../qcom/msm8916-samsung-e2015-common.dtsi    |   4 +-
>   .../dts/qcom/msm8916-samsung-grandmax.dts     |   2 +-
>   .../boot/dts/qcom/msm8916-samsung-j5.dts      |   2 +-
>   .../dts/qcom/msm8916-samsung-serranove.dts    |  41 +--
>   .../dts/qcom/msm8916-wingtech-wt88047.dts     |  21 +-
>   15 files changed, 259 insertions(+), 250 deletions(-)
> 

<snip>

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/2] arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema
  2022-10-24  0:23 ` [PATCH 2/2] arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema Krzysztof Kozlowski
  2022-10-24  8:07   ` Neil Armstrong
@ 2022-11-04 21:20   ` Konrad Dybcio
  1 sibling, 0 replies; 8+ messages in thread
From: Konrad Dybcio @ 2022-11-04 21:20 UTC (permalink / raw)
  To: Krzysztof Kozlowski, Bjorn Andersson, Andy Gross, Linus Walleij,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, linux-gpio,
	devicetree, linux-kernel



On 24/10/2022 02:23, Krzysztof Kozlowski wrote:
> DT schema expects TLMM pin configuration nodes to be named with
> '-state' suffix and their optional children with '-pins' suffix.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>

Konrad
> 
> Not tested on hardware.
> ---
>   arch/arm64/boot/dts/qcom/apq8016-sbc.dts      |  14 +-
>   .../boot/dts/qcom/msm8916-alcatel-idol347.dts |  14 +-
>   .../arm64/boot/dts/qcom/msm8916-asus-z00l.dts |  24 +-
>   .../arm64/boot/dts/qcom/msm8916-huawei-g7.dts |  20 +-
>   .../boot/dts/qcom/msm8916-longcheer-l8150.dts |  16 +-
>   .../boot/dts/qcom/msm8916-longcheer-l8910.dts |   8 +-
>   arch/arm64/boot/dts/qcom/msm8916-pins.dtsi    | 274 +++++++++---------
>   .../qcom/msm8916-samsung-a2015-common.dtsi    |  61 ++--
>   .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts |   6 +-
>   .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts |   2 +-
>   .../qcom/msm8916-samsung-e2015-common.dtsi    |   4 +-
>   .../dts/qcom/msm8916-samsung-grandmax.dts     |   2 +-
>   .../boot/dts/qcom/msm8916-samsung-j5.dts      |   2 +-
>   .../dts/qcom/msm8916-samsung-serranove.dts    |  41 +--
>   .../dts/qcom/msm8916-wingtech-wt88047.dts     |  21 +-
>   15 files changed, 259 insertions(+), 250 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
> index 1b613098fb4a..9ebc506810f6 100644
> --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
> +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
> @@ -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";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
> index 3dc9619fde6e..668f8ff53229 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
> @@ -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";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
> index dd92070a1211..3618704a5330 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
> @@ -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 {
> -		pins = "gpio13";
> -		function = "gpio";
> +	touchscreen_default: touchscreen-default-state {
> +		touch-pins {
> +			pins = "gpio13";
> +			function = "gpio";
>   
> -		drive-strength = <2>;
> -		bias-pull-up;
> +			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";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
> index 9e470c67274e..a6a7d870f586 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
> @@ -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";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
> index d85e7f7c0835..31214570be4b 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
> @@ -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";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
> index b4812f093b17..3899e11b9843 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
> @@ -234,7 +234,7 @@ l18 {
>   };
>   
>   &msmgpio {
> -	button_backlight_default: button-backlight-default {
> +	button_backlight_default: button-backlight-default-state {
>   		pins = "gpio17";
>   		function = "gpio";
>   
> @@ -242,7 +242,7 @@ button_backlight_default: button-backlight-default {
>   		bias-disable;
>   	};
>   
> -	gpio_keys_default: gpio-keys-default {
> +	gpio_keys_default: gpio-keys-default-state {
>   		pins = "gpio107";
>   		function = "gpio";
>   
> @@ -250,7 +250,7 @@ gpio_keys_default: gpio-keys-default {
>   		bias-pull-up;
>   	};
>   
> -	mag_reset_default: mag-reset-default {
> +	mag_reset_default: mag-reset-default-state {
>   		pins = "gpio111";
>   		function = "gpio";
>   
> @@ -258,7 +258,7 @@ mag_reset_default: mag-reset-default {
>   		bias-disable;
>   	};
>   
> -	usb_id_default: usb-id-default {
> +	usb_id_default: usb-id-default-state {
>   		pins = "gpio110";
>   		function = "gpio";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
> index 7dedb91b9930..db9e448d0a64 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
> @@ -5,7 +5,7 @@
>   
>   &msmgpio {
>   
> -	blsp1_uart1_default: blsp1-uart1-default {
> +	blsp1_uart1_default: blsp1-uart1-default-state {
>   		//	TX, RX, CTS_N, RTS_N
>   		pins = "gpio0", "gpio1", "gpio2", "gpio3";
>   		function = "blsp_uart1";
> @@ -14,7 +14,7 @@ blsp1_uart1_default: blsp1-uart1-default {
>   		bias-disable;
>   	};
>   
> -	blsp1_uart1_sleep: blsp1-uart1-sleep {
> +	blsp1_uart1_sleep: blsp1-uart1-sleep-state {
>   		pins = "gpio0", "gpio1", "gpio2", "gpio3";
>   		function = "gpio";
>   
> @@ -22,7 +22,7 @@ blsp1_uart1_sleep: blsp1-uart1-sleep {
>   		bias-pull-down;
>   	};
>   
> -	blsp1_uart2_default: blsp1-uart2-default {
> +	blsp1_uart2_default: blsp1-uart2-default-state {
>   		pins = "gpio4", "gpio5";
>   		function = "blsp_uart2";
>   
> @@ -30,7 +30,7 @@ blsp1_uart2_default: blsp1-uart2-default {
>   		bias-disable;
>   	};
>   
> -	blsp1_uart2_sleep: blsp1-uart2-sleep {
> +	blsp1_uart2_sleep: blsp1-uart2-sleep-state {
>   		pins = "gpio4", "gpio5";
>   		function = "gpio";
>   
> @@ -38,14 +38,15 @@ blsp1_uart2_sleep: blsp1-uart2-sleep {
>   		bias-pull-down;
>   	};
>   
> -	spi1_default: spi1-default {
> -		pins = "gpio0", "gpio1", "gpio3";
> -		function = "blsp_spi1";
> +	spi1_default: spi1-default-state {
> +		spi-pins {
> +			pins = "gpio0", "gpio1", "gpio3";
> +			function = "blsp_spi1";
>   
> -		drive-strength = <12>;
> -		bias-disable;
> -
> -		cs {
> +			drive-strength = <12>;
> +			bias-disable;
> +		};
> +		cs-pins {
>   			pins = "gpio2";
>   			function = "gpio";
>   
> @@ -55,7 +56,7 @@ cs {
>   		};
>   	};
>   
> -	spi1_sleep: spi1-sleep {
> +	spi1_sleep: spi1-sleep-state {
>   		pins = "gpio0", "gpio1", "gpio2", "gpio3";
>   		function = "gpio";
>   
> @@ -63,14 +64,15 @@ spi1_sleep: spi1-sleep {
>   		bias-pull-down;
>   	};
>   
> -	spi2_default: spi2-default {
> -		pins = "gpio4", "gpio5", "gpio7";
> -		function = "blsp_spi2";
> +	spi2_default: spi2-default-state {
> +		spi-pins {
> +			pins = "gpio4", "gpio5", "gpio7";
> +			function = "blsp_spi2";
>   
> -		drive-strength = <12>;
> -		bias-disable;
> -
> -		cs {
> +			drive-strength = <12>;
> +			bias-disable;
> +		};
> +		cs-pins {
>   			pins = "gpio6";
>   			function = "gpio";
>   
> @@ -80,7 +82,7 @@ cs {
>   		};
>   	};
>   
> -	spi2_sleep: spi2-sleep {
> +	spi2_sleep: spi2-sleep-state {
>   		pins = "gpio4", "gpio5", "gpio6", "gpio7";
>   		function = "gpio";
>   
> @@ -88,14 +90,15 @@ spi2_sleep: spi2-sleep {
>   		bias-pull-down;
>   	};
>   
> -	spi3_default: spi3-default {
> -		pins = "gpio8", "gpio9", "gpio11";
> -		function = "blsp_spi3";
> +	spi3_default: spi3-default-state {
> +		spi-pins {
> +			pins = "gpio8", "gpio9", "gpio11";
> +			function = "blsp_spi3";
>   
> -		drive-strength = <12>;
> -		bias-disable;
> -
> -		cs {
> +			drive-strength = <12>;
> +			bias-disable;
> +		};
> +		cs-pins {
>   			pins = "gpio10";
>   			function = "gpio";
>   
> @@ -105,7 +108,7 @@ cs {
>   		};
>   	};
>   
> -	spi3_sleep: spi3-sleep {
> +	spi3_sleep: spi3-sleep-state {
>   		pins = "gpio8", "gpio9", "gpio10", "gpio11";
>   		function = "gpio";
>   
> @@ -113,14 +116,15 @@ spi3_sleep: spi3-sleep {
>   		bias-pull-down;
>   	};
>   
> -	spi4_default: spi4-default {
> -		pins = "gpio12", "gpio13", "gpio15";
> -		function = "blsp_spi4";
> -
> -		drive-strength = <12>;
> -		bias-disable;
> +	spi4_default: spi4-default-state {
> +		spi-pins {
> +			pins = "gpio12", "gpio13", "gpio15";
> +			function = "blsp_spi4";
>   
> -		cs {
> +			drive-strength = <12>;
> +			bias-disable;
> +		};
> +		cs-pins {
>   			pins = "gpio14";
>   			function = "gpio";
>   
> @@ -130,7 +134,7 @@ cs {
>   		};
>   	};
>   
> -	spi4_sleep: spi4-sleep {
> +	spi4_sleep: spi4-sleep-state {
>   		pins = "gpio12", "gpio13", "gpio14", "gpio15";
>   		function = "gpio";
>   
> @@ -138,14 +142,15 @@ spi4_sleep: spi4-sleep {
>   		bias-pull-down;
>   	};
>   
> -	spi5_default: spi5-default {
> -		pins = "gpio16", "gpio17", "gpio19";
> -		function = "blsp_spi5";
> +	spi5_default: spi5-default-state {
> +		spi-pins {
> +			pins = "gpio16", "gpio17", "gpio19";
> +			function = "blsp_spi5";
>   
> -		drive-strength = <12>;
> -		bias-disable;
> -
> -		cs {
> +			drive-strength = <12>;
> +			bias-disable;
> +		};
> +		cs-pins {
>   			pins = "gpio18";
>   			function = "gpio";
>   
> @@ -155,7 +160,7 @@ cs {
>   		};
>   	};
>   
> -	spi5_sleep: spi5-sleep {
> +	spi5_sleep: spi5-sleep-state {
>   		pins = "gpio16", "gpio17", "gpio18", "gpio19";
>   		function = "gpio";
>   
> @@ -163,14 +168,15 @@ spi5_sleep: spi5-sleep {
>   		bias-pull-down;
>   	};
>   
> -	spi6_default: spi6-default {
> -		pins = "gpio20", "gpio21", "gpio23";
> -		function = "blsp_spi6";
> -
> -		drive-strength = <12>;
> -		bias-disable;
> +	spi6_default: spi6-default-state {
> +		spi-pins {
> +			pins = "gpio20", "gpio21", "gpio23";
> +			function = "blsp_spi6";
>   
> -		cs {
> +			drive-strength = <12>;
> +			bias-disable;
> +		};
> +		cs-pins {
>   			pins = "gpio22";
>   			function = "gpio";
>   
> @@ -180,7 +186,7 @@ cs {
>   		};
>   	};
>   
> -	spi6_sleep: spi6-sleep {
> +	spi6_sleep: spi6-sleep-state {
>   		pins = "gpio20", "gpio21", "gpio22", "gpio23";
>   		function = "gpio";
>   
> @@ -188,7 +194,7 @@ spi6_sleep: spi6-sleep {
>   		bias-pull-down;
>   	};
>   
> -	i2c1_default: i2c1-default {
> +	i2c1_default: i2c1-default-state {
>   		pins = "gpio2", "gpio3";
>   		function = "blsp_i2c1";
>   
> @@ -196,7 +202,7 @@ i2c1_default: i2c1-default {
>   		bias-disable;
>   	};
>   
> -	i2c1_sleep: i2c1-sleep {
> +	i2c1_sleep: i2c1-sleep-state {
>   		pins = "gpio2", "gpio3";
>   		function = "gpio";
>   
> @@ -204,7 +210,7 @@ i2c1_sleep: i2c1-sleep {
>   		bias-disable;
>   	};
>   
> -	i2c2_default: i2c2-default {
> +	i2c2_default: i2c2-default-state {
>   		pins = "gpio6", "gpio7";
>   		function = "blsp_i2c2";
>   
> @@ -212,7 +218,7 @@ i2c2_default: i2c2-default {
>   		bias-disable;
>   	};
>   
> -	i2c2_sleep: i2c2-sleep {
> +	i2c2_sleep: i2c2-sleep-state {
>   		pins = "gpio6", "gpio7";
>   		function = "gpio";
>   
> @@ -220,7 +226,7 @@ i2c2_sleep: i2c2-sleep {
>   		bias-disable;
>   	};
>   
> -	i2c3_default: i2c3-default {
> +	i2c3_default: i2c3-default-state {
>   		pins = "gpio10", "gpio11";
>   		function = "blsp_i2c3";
>   
> @@ -228,7 +234,7 @@ i2c3_default: i2c3-default {
>   		bias-disable;
>   	};
>   
> -	i2c3_sleep: i2c3-sleep {
> +	i2c3_sleep: i2c3-sleep-state {
>   		pins = "gpio10", "gpio11";
>   		function = "gpio";
>   
> @@ -236,7 +242,7 @@ i2c3_sleep: i2c3-sleep {
>   		bias-disable;
>   	};
>   
> -	i2c4_default: i2c4-default {
> +	i2c4_default: i2c4-default-state {
>   		pins = "gpio14", "gpio15";
>   		function = "blsp_i2c4";
>   
> @@ -244,7 +250,7 @@ i2c4_default: i2c4-default {
>   		bias-disable;
>   	};
>   
> -	i2c4_sleep: i2c4-sleep {
> +	i2c4_sleep: i2c4-sleep-state {
>   		pins = "gpio14", "gpio15";
>   		function = "gpio";
>   
> @@ -252,7 +258,7 @@ i2c4_sleep: i2c4-sleep {
>   		bias-disable;
>   	};
>   
> -	i2c5_default: i2c5-default {
> +	i2c5_default: i2c5-default-state {
>   		pins = "gpio18", "gpio19";
>   		function = "blsp_i2c5";
>   
> @@ -260,7 +266,7 @@ i2c5_default: i2c5-default {
>   		bias-disable;
>   	};
>   
> -	i2c5_sleep: i2c5-sleep {
> +	i2c5_sleep: i2c5-sleep-state {
>   		pins = "gpio18", "gpio19";
>   		function = "gpio";
>   
> @@ -268,7 +274,7 @@ i2c5_sleep: i2c5-sleep {
>   		bias-disable;
>   	};
>   
> -	i2c6_default: i2c6-default {
> +	i2c6_default: i2c6-default-state {
>   		pins = "gpio22", "gpio23";
>   		function = "blsp_i2c6";
>   
> @@ -276,7 +282,7 @@ i2c6_default: i2c6-default {
>   		bias-disable;
>   	};
>   
> -	i2c6_sleep: i2c6-sleep {
> +	i2c6_sleep: i2c6-sleep-state {
>   		pins = "gpio22", "gpio23";
>   		function = "gpio";
>   
> @@ -284,14 +290,14 @@ i2c6_sleep: i2c6-sleep {
>   		bias-disable;
>   	};
>   
> -	pmx-sdc1-clk {
> -		sdc1_clk_on: clk-on {
> +	pmx-sdc1-clk-state {
> +		sdc1_clk_on: clk-on-pins {
>   			pins = "sdc1_clk";
>   
>   			bias-disable;
>   			drive-strength = <16>;
>   		};
> -		sdc1_clk_off: clk-off {
> +		sdc1_clk_off: clk-off-pins {
>   			pins = "sdc1_clk";
>   
>   			bias-disable;
> @@ -299,14 +305,14 @@ sdc1_clk_off: clk-off {
>   		};
>   	};
>   
> -	pmx-sdc1-cmd {
> -		sdc1_cmd_on: cmd-on {
> +	pmx-sdc1-cmd-state {
> +		sdc1_cmd_on: cmd-on-pins {
>   			pins = "sdc1_cmd";
>   
>   			bias-pull-up;
>   			drive-strength = <10>;
>   		};
> -		sdc1_cmd_off: cmd-off {
> +		sdc1_cmd_off: cmd-off-pins {
>   			pins = "sdc1_cmd";
>   
>   			bias-pull-up;
> @@ -314,14 +320,14 @@ sdc1_cmd_off: cmd-off {
>   		};
>   	};
>   
> -	pmx-sdc1-data {
> -		sdc1_data_on: data-on {
> +	pmx-sdc1-data-state {
> +		sdc1_data_on: data-on-pins {
>   			pins = "sdc1_data";
>   
>   			bias-pull-up;
>   			drive-strength = <10>;
>   		};
> -		sdc1_data_off: data-off {
> +		sdc1_data_off: data-off-pins {
>   			pins = "sdc1_data";
>   
>   			bias-pull-up;
> @@ -329,14 +335,14 @@ sdc1_data_off: data-off {
>   		};
>   	};
>   
> -	pmx-sdc2-clk {
> -		sdc2_clk_on: clk-on {
> +	pmx-sdc2-clk-state {
> +		sdc2_clk_on: clk-on-pins {
>   			pins = "sdc2_clk";
>   
>   			bias-disable;
>   			drive-strength = <16>;
>   		};
> -		sdc2_clk_off: clk-off {
> +		sdc2_clk_off: clk-off-pins {
>   			pins = "sdc2_clk";
>   
>   			bias-disable;
> @@ -344,14 +350,14 @@ sdc2_clk_off: clk-off {
>   		};
>   	};
>   
> -	pmx-sdc2-cmd {
> -		sdc2_cmd_on: cmd-on {
> +	pmx-sdc2-cmd-state {
> +		sdc2_cmd_on: cmd-on-pins {
>   			pins = "sdc2_cmd";
>   
>   			bias-pull-up;
>   			drive-strength = <10>;
>   		};
> -		sdc2_cmd_off: cmd-off {
> +		sdc2_cmd_off: cmd-off-pins {
>   			pins = "sdc2_cmd";
>   
>   			bias-pull-up;
> @@ -359,14 +365,14 @@ sdc2_cmd_off: cmd-off {
>   		};
>   	};
>   
> -	pmx-sdc2-data {
> -		sdc2_data_on: data-on {
> +	pmx-sdc2-data-state {
> +		sdc2_data_on: data-on-pins {
>   			pins = "sdc2_data";
>   
>   			bias-pull-up;
>   			drive-strength = <10>;
>   		};
> -		sdc2_data_off: data-off {
> +		sdc2_data_off: data-off-pins {
>   			pins = "sdc2_data";
>   
>   			bias-pull-up;
> @@ -374,15 +380,15 @@ sdc2_data_off: data-off {
>   		};
>   	};
>   
> -	pmx-sdc2-cd-pin {
> -		sdc2_cd_on: cd-on {
> +	pmx-sdc2-cd-pin-state {
> +		sdc2_cd_on: cd-on-pins {
>   			pins = "gpio38";
>   			function = "gpio";
>   
>   			drive-strength = <2>;
>   			bias-pull-up;
>   		};
> -		sdc2_cd_off: cd-off {
> +		sdc2_cd_off: cd-off-pins {
>   			pins = "gpio38";
>   			function = "gpio";
>   
> @@ -391,8 +397,8 @@ sdc2_cd_off: cd-off {
>   		};
>   	};
>   
> -	cdc-pdm-lines {
> -		cdc_pdm_lines_act: pdm-lines-on {
> +	cdc-pdm-lines-state {
> +		cdc_pdm_lines_act: pdm-lines-on-pins {
>   			pins = "gpio63", "gpio64", "gpio65", "gpio66",
>   			       "gpio67", "gpio68";
>   			function = "cdc_pdm0";
> @@ -400,7 +406,7 @@ cdc_pdm_lines_act: pdm-lines-on {
>   			drive-strength = <8>;
>   			bias-disable;
>   		};
> -		cdc_pdm_lines_sus: pdm-lines-off {
> +		cdc_pdm_lines_sus: pdm-lines-off-pins {
>   			pins = "gpio63", "gpio64", "gpio65", "gpio66",
>   			       "gpio67", "gpio68";
>   			function = "cdc_pdm0";
> @@ -410,15 +416,15 @@ cdc_pdm_lines_sus: pdm-lines-off {
>   		};
>   	};
>   
> -	ext-pri-tlmm-lines {
> -		ext_pri_tlmm_lines_act: ext-pa-on {
> +	ext-pri-tlmm-lines-state {
> +		ext_pri_tlmm_lines_act: ext-pa-on-pins {
>   			pins = "gpio113", "gpio114", "gpio115", "gpio116";
>   			function = "pri_mi2s";
>   
>   			drive-strength = <8>;
>   			bias-disable;
>   		};
> -		ext_pri_tlmm_lines_sus: ext-pa-off {
> +		ext_pri_tlmm_lines_sus: ext-pa-off-pins {
>   			pins = "gpio113", "gpio114", "gpio115", "gpio116";
>   			function = "pri_mi2s";
>   
> @@ -427,15 +433,15 @@ ext_pri_tlmm_lines_sus: ext-pa-off {
>   		};
>   	};
>   
> -	ext-pri-ws-line {
> -		ext_pri_ws_act: ext-pa-on {
> +	ext-pri-ws-line-state {
> +		ext_pri_ws_act: ext-pa-on-pins {
>   			pins = "gpio110";
>   			function = "pri_mi2s_ws";
>   
>   			drive-strength = <8>;
>   			bias-disable;
>   		};
> -		ext_pri_ws_sus: ext-pa-off {
> +		ext_pri_ws_sus: ext-pa-off-pins {
>   			pins = "gpio110";
>   			function = "pri_mi2s_ws";
>   
> @@ -444,15 +450,15 @@ ext_pri_ws_sus: ext-pa-off {
>   		};
>   	};
>   
> -	ext-mclk-tlmm-lines {
> -		ext_mclk_tlmm_lines_act: mclk-lines-on {
> +	ext-mclk-tlmm-lines-state {
> +		ext_mclk_tlmm_lines_act: mclk-lines-on-pins {
>   			pins = "gpio116";
>   			function = "pri_mi2s";
>   
>   			drive-strength = <8>;
>   			bias-disable;
>   		};
> -		ext_mclk_tlmm_lines_sus: mclk-lines-off {
> +		ext_mclk_tlmm_lines_sus: mclk-lines-off-pins {
>   			pins = "gpio116";
>   			function = "pri_mi2s";
>   
> @@ -462,15 +468,15 @@ ext_mclk_tlmm_lines_sus: mclk-lines-off {
>   	};
>   
>   	/* secondary Mi2S */
> -	ext-sec-tlmm-lines {
> -		ext_sec_tlmm_lines_act: tlmm-lines-on {
> +	ext-sec-tlmm-lines-state {
> +		ext_sec_tlmm_lines_act: tlmm-lines-on-pins {
>   			pins = "gpio112", "gpio117", "gpio118", "gpio119";
>   			function = "sec_mi2s";
>   
>   			drive-strength = <8>;
>   			bias-disable;
>   		};
> -		ext_sec_tlmm_lines_sus: tlmm-lines-off {
> +		ext_sec_tlmm_lines_sus: tlmm-lines-off-pins {
>   			pins = "gpio112", "gpio117", "gpio118", "gpio119";
>   			function = "sec_mi2s";
>   
> @@ -479,40 +485,38 @@ ext_sec_tlmm_lines_sus: tlmm-lines-off {
>   		};
>   	};
>   
> -	cdc-dmic-lines {
> -		cdc_dmic_lines_act: dmic-lines-on {
> -			clk {
> -				pins = "gpio0";
> -				function = "dmic0_clk";
> +	cdc_dmic_lines_act: cdc-dmic-lines-on-state {
> +		clk-pins {
> +			pins = "gpio0";
> +			function = "dmic0_clk";
>   
> -				drive-strength = <8>;
> -			};
> -			data {
> -				pins = "gpio1";
> -				function = "dmic0_data";
> +			drive-strength = <8>;
> +		};
> +		data-pins {
> +			pins = "gpio1";
> +			function = "dmic0_data";
>   
> -				drive-strength = <8>;
> -			};
> +			drive-strength = <8>;
>   		};
> -		cdc_dmic_lines_sus: dmic-lines-off {
> -			clk {
> -				pins = "gpio0";
> -				function = "dmic0_clk";
> +	};
> +	cdc_dmic_lines_sus: cdc-dmic-lines-off-state {
> +		clk-pins {
> +			pins = "gpio0";
> +			function = "dmic0_clk";
>   
> -				drive-strength = <2>;
> -				bias-disable;
> -			};
> -			data {
> -				pins = "gpio1";
> -				function = "dmic0_data";
> +			drive-strength = <2>;
> +			bias-disable;
> +		};
> +		data-pins {
> +			pins = "gpio1";
> +			function = "dmic0_data";
>   
> -				drive-strength = <2>;
> -				bias-disable;
> -			};
> +			drive-strength = <2>;
> +			bias-disable;
>   		};
>   	};
>   
> -	wcnss_pin_a: wcnss-active {
> +	wcnss_pin_a: wcnss-active-state {
>   		pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44";
>   		function = "wcss_wlan";
>   
> @@ -520,7 +524,7 @@ wcnss_pin_a: wcnss-active {
>   		bias-pull-up;
>   	};
>   
> -	cci0_default: cci0-default {
> +	cci0_default: cci0-default-state {
>   		pins = "gpio29", "gpio30";
>   		function = "cci_i2c";
>   
> @@ -528,22 +532,22 @@ cci0_default: cci0-default {
>   		bias-disable;
>   	};
>   
> -	camera_front_default: camera-front-default {
> -		pwdn {
> +	camera_front_default: camera-front-default-state {
> +		pwdn-pins {
>   			pins = "gpio33";
>   			function = "gpio";
>   
>   			drive-strength = <16>;
>   			bias-disable;
>   		};
> -		rst {
> +		rst-pins {
>   			pins = "gpio28";
>   			function = "gpio";
>   
>   			drive-strength = <16>;
>   			bias-disable;
>   		};
> -		mclk1 {
> +		mclk1-pins {
>   			pins = "gpio27";
>   			function = "cam_mclk1";
>   
> @@ -552,22 +556,22 @@ mclk1 {
>   		};
>   	};
>   
> -	camera_rear_default: camera-rear-default {
> -		pwdn {
> +	camera_rear_default: camera-rear-default-state {
> +		pwdn-pins {
>   			pins = "gpio34";
>   			function = "gpio";
>   
>   			drive-strength = <16>;
>   			bias-disable;
>   		};
> -		rst {
> +		rst-pins {
>   			pins = "gpio35";
>   			function = "gpio";
>   
>   			drive-strength = <16>;
>   			bias-disable;
>   		};
> -		mclk0 {
> +		mclk0-pins {
>   			pins = "gpio26";
>   			function = "cam_mclk0";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
> index 5f7cec347a4f..d701260c78b0 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
> @@ -348,7 +348,7 @@ l18 {
>   };
>   
>   &msmgpio {
> -	accel_int_default: accel-int-default {
> +	accel_int_default: accel-int-default-state {
>   		pins = "gpio115";
>   		function = "gpio";
>   
> @@ -356,7 +356,7 @@ accel_int_default: accel-int-default {
>   		bias-disable;
>   	};
>   
> -	fg_alert_default: fg-alert-default {
> +	fg_alert_default: fg-alert-default-state {
>   		pins = "gpio121";
>   		function = "gpio";
>   
> @@ -364,7 +364,7 @@ fg_alert_default: fg-alert-default {
>   		bias-disable;
>   	};
>   
> -	gpio_keys_default: gpio-keys-default {
> +	gpio_keys_default: gpio-keys-default-state {
>   		pins = "gpio107", "gpio109";
>   		function = "gpio";
>   
> @@ -372,7 +372,7 @@ gpio_keys_default: gpio-keys-default {
>   		bias-pull-up;
>   	};
>   
> -	gpio_hall_sensor_default: gpio-hall-sensor-default {
> +	gpio_hall_sensor_default: gpio-hall-sensor-default-state {
>   		pins = "gpio52";
>   		function = "gpio";
>   
> @@ -380,24 +380,23 @@ gpio_hall_sensor_default: gpio-hall-sensor-default {
>   		bias-disable;
>   	};
>   
> -	mdss {
> -		mdss_default: mdss-default {
> -			pins = "gpio25";
> -			function = "gpio";
> +	mdss_default: mdss-default-state {
> +		pins = "gpio25";
> +		function = "gpio";
>   
> -			drive-strength = <8>;
> -			bias-disable;
> -		};
> -		mdss_sleep: mdss-sleep {
> -			pins = "gpio25";
> -			function = "gpio";
> +		drive-strength = <8>;
> +		bias-disable;
> +	};
>   
> -			drive-strength = <2>;
> -			bias-pull-down;
> -		};
> +	mdss_sleep: mdss-sleep-state {
> +		pins = "gpio25";
> +		function = "gpio";
> +
> +		drive-strength = <2>;
> +		bias-pull-down;
>   	};
>   
> -	muic_i2c_default: muic-i2c-default {
> +	muic_i2c_default: muic-i2c-default-state {
>   		pins = "gpio105", "gpio106";
>   		function = "gpio";
>   
> @@ -405,7 +404,7 @@ muic_i2c_default: muic-i2c-default {
>   		bias-disable;
>   	};
>   
> -	muic_int_default: muic-int-default {
> +	muic_int_default: muic-int-default-state {
>   		pins = "gpio12";
>   		function = "gpio";
>   
> @@ -413,14 +412,16 @@ muic_int_default: muic-int-default {
>   		bias-disable;
>   	};
>   
> -	nfc_default: nfc-default {
> -		pins = "gpio20", "gpio49";
> -		function = "gpio";
> +	nfc_default: nfc-default-state {
> +		nfc-pins {
> +			pins = "gpio20", "gpio49";
> +			function = "gpio";
>   
> -		drive-strength = <2>;
> -		bias-disable;
> +			drive-strength = <2>;
> +			bias-disable;
> +		};
>   
> -		irq {
> +		irq-pins {
>   			pins = "gpio21";
>   			function = "gpio";
>   
> @@ -429,7 +430,7 @@ irq {
>   		};
>   	};
>   
> -	nfc_i2c_default: nfc-i2c-default {
> +	nfc_i2c_default: nfc-i2c-default-state {
>   		pins = "gpio0", "gpio1";
>   		function = "gpio";
>   
> @@ -437,7 +438,7 @@ nfc_i2c_default: nfc-i2c-default {
>   		bias-disable;
>   	};
>   
> -	tkey_default: tkey-default {
> +	tkey_default: tkey-default-state {
>   		pins = "gpio98";
>   		function = "gpio";
>   
> @@ -445,7 +446,7 @@ tkey_default: tkey-default {
>   		bias-disable;
>   	};
>   
> -	tkey_i2c_default: tkey-i2c-default {
> +	tkey_i2c_default: tkey-i2c-default-state {
>   		pins = "gpio16", "gpio17";
>   		function = "gpio";
>   
> @@ -453,7 +454,7 @@ tkey_i2c_default: tkey-i2c-default {
>   		bias-disable;
>   	};
>   
> -	tsp_en_default: tsp-en-default {
> +	tsp_en_default: tsp-en-default-state {
>   		pins = "gpio73";
>   		function = "gpio";
>   
> @@ -461,7 +462,7 @@ tsp_en_default: tsp-en-default {
>   		bias-disable;
>   	};
>   
> -	ts_int_default: ts-int-default {
> +	ts_int_default: ts-int-default-state {
>   		pins = "gpio13";
>   		function = "gpio";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
> index 6db5f78ca286..0733b73b6dd1 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
> @@ -105,7 +105,7 @@ &dsi0_out {
>   };
>   
>   &msmgpio {
> -	panel_vdd3_default: panel-vdd3-default {
> +	panel_vdd3_default: panel-vdd3-default-state {
>   		pins = "gpio9";
>   		function = "gpio";
>   
> @@ -113,7 +113,7 @@ panel_vdd3_default: panel-vdd3-default {
>   		bias-disable;
>   	};
>   
> -	tkey_en_default: tkey-en-default {
> +	tkey_en_default: tkey-en-default-state {
>   		pins = "gpio86";
>   		function = "gpio";
>   
> @@ -121,7 +121,7 @@ tkey_en_default: tkey-en-default {
>   		bias-disable;
>   	};
>   
> -	tkey_led_en_default: tkey-led-en-default {
> +	tkey_led_en_default: tkey-led-en-default-state {
>   		pins = "gpio60";
>   		function = "gpio";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
> index 5fb8ecd0c9ca..5131bb1f6ba3 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
> @@ -62,7 +62,7 @@ &touchkey {
>   };
>   
>   &msmgpio {
> -	tkey_en_default: tkey-en-default {
> +	tkey_en_default: tkey-en-default-state {
>   		pins = "gpio97";
>   		function = "gpio";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
> index 542010fdfb8a..450986e09c33 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
> @@ -67,7 +67,7 @@ &touchkey {
>   };
>   
>   &msmgpio {
> -	motor_en_default: motor-en-default {
> +	motor_en_default: motor-en-default-state {
>   		pins = "gpio76";
>   		function = "gpio";
>   
> @@ -75,7 +75,7 @@ motor_en_default: motor-en-default {
>   		bias-disable;
>   	};
>   
> -	tkey_en_default: tkey-en-default {
> +	tkey_en_default: tkey-en-default-state {
>   		pins = "gpio97";
>   		function = "gpio";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
> index bc7134698978..a3d572d851ef 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
> @@ -46,7 +46,7 @@ &reg_touch_key {
>   };
>   
>   &msmgpio {
> -	gpio_leds_default: gpio-led-default {
> +	gpio_leds_default: gpio-led-default-state {
>   		pins = "gpio60";
>   		function = "gpio";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
> index eabeed18cfaa..7ac49a021563 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
> @@ -199,7 +199,7 @@ l18 {
>   };
>   
>   &msmgpio {
> -	gpio_keys_default: gpio-keys-default {
> +	gpio_keys_default: gpio-keys-default-state {
>   		pins = "gpio107", "gpio109";
>   		function = "gpio";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
> index bbd6bb3f4fd7..f0ee5ed7cf81 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
> @@ -422,7 +422,7 @@ l18 {
>   };
>   
>   &msmgpio {
> -	fg_alert_default: fg-alert-default {
> +	fg_alert_default: fg-alert-default-state {
>   		pins = "gpio121";
>   		function = "gpio";
>   
> @@ -430,7 +430,7 @@ fg_alert_default: fg-alert-default {
>   		bias-disable;
>   	};
>   
> -	gpio_keys_default: gpio-keys-default {
> +	gpio_keys_default: gpio-keys-default-state {
>   		pins = "gpio107", "gpio109";
>   		function = "gpio";
>   
> @@ -438,7 +438,7 @@ gpio_keys_default: gpio-keys-default {
>   		bias-pull-up;
>   	};
>   
> -	gpio_hall_sensor_default: gpio-hall-sensor-default {
> +	gpio_hall_sensor_default: gpio-hall-sensor-default-state {
>   		pins = "gpio52";
>   		function = "gpio";
>   
> @@ -446,7 +446,7 @@ gpio_hall_sensor_default: gpio-hall-sensor-default {
>   		bias-disable;
>   	};
>   
> -	imu_irq_default: imu-irq-default {
> +	imu_irq_default: imu-irq-default-state {
>   		pins = "gpio115";
>   		function = "gpio";
>   
> @@ -454,7 +454,7 @@ imu_irq_default: imu-irq-default {
>   		bias-disable;
>   	};
>   
> -	muic_i2c_default: muic-i2c-default {
> +	muic_i2c_default: muic-i2c-default-state {
>   		pins = "gpio105", "gpio106";
>   		function = "gpio";
>   
> @@ -462,7 +462,7 @@ muic_i2c_default: muic-i2c-default {
>   		bias-disable;
>   	};
>   
> -	muic_irq_default: muic-irq-default {
> +	muic_irq_default: muic-irq-default-state {
>   		pins = "gpio12";
>   		function = "gpio";
>   
> @@ -470,14 +470,15 @@ muic_irq_default: muic-irq-default {
>   		bias-disable;
>   	};
>   
> -	nfc_default: nfc-default {
> -		pins = "gpio20", "gpio49";
> -		function = "gpio";
> -
> -		drive-strength = <2>;
> -		bias-disable;
> +	nfc_default: nfc-default-state {
> +		nfc-pins {
> +			pins = "gpio20", "gpio49";
> +			function = "gpio";
>   
> -		irq {
> +			drive-strength = <2>;
> +			bias-disable;
> +		};
> +		irq-pins {
>   			pins = "gpio21";
>   			function = "gpio";
>   
> @@ -486,7 +487,7 @@ irq {
>   		};
>   	};
>   
> -	nfc_i2c_default: nfc-i2c-default {
> +	nfc_i2c_default: nfc-i2c-default-state {
>   		pins = "gpio0", "gpio1";
>   		function = "gpio";
>   
> @@ -494,7 +495,7 @@ nfc_i2c_default: nfc-i2c-default {
>   		bias-disable;
>   	};
>   
> -	tkey_default: tkey-default {
> +	tkey_default: tkey-default-state {
>   		pins = "gpio98";
>   		function = "gpio";
>   
> @@ -502,7 +503,7 @@ tkey_default: tkey-default {
>   		bias-disable;
>   	};
>   
> -	tkey_en_default: tkey-en-default {
> +	tkey_en_default: tkey-en-default-state {
>   		pins = "gpio86";
>   		function = "gpio";
>   
> @@ -510,7 +511,7 @@ tkey_en_default: tkey-en-default {
>   		bias-disable;
>   	};
>   
> -	tkey_i2c_default: tkey-i2c-default {
> +	tkey_i2c_default: tkey-i2c-default-state {
>   		pins = "gpio16", "gpio17";
>   		function = "gpio";
>   
> @@ -518,7 +519,7 @@ tkey_i2c_default: tkey-i2c-default {
>   		bias-disable;
>   	};
>   
> -	tkey_led_en_default: tkey-led-en-default {
> +	tkey_led_en_default: tkey-led-en-default-state {
>   		pins = "gpio60";
>   		function = "gpio";
>   
> @@ -526,7 +527,7 @@ tkey_led_en_default: tkey-led-en-default {
>   		bias-disable;
>   	};
>   
> -	tsp_en_default: tsp-en-default {
> +	tsp_en_default: tsp-en-default-state {
>   		pins = "gpio73";
>   		function = "gpio";
>   
> @@ -534,7 +535,7 @@ tsp_en_default: tsp-en-default {
>   		bias-disable;
>   	};
>   
> -	tsp_irq_default: tsp-irq-default {
> +	tsp_irq_default: tsp-irq-default-state {
>   		pins = "gpio13";
>   		function = "gpio";
>   
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
> index 84a352dcf9a2..399326b8f99e 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
> @@ -272,7 +272,7 @@ l18 {
>   };
>   
>   &msmgpio {
> -	gpio_keys_default: gpio-keys-default {
> +	gpio_keys_default: gpio-keys-default-state {
>   		pins = "gpio107";
>   		function = "gpio";
>   
> @@ -280,7 +280,7 @@ gpio_keys_default: gpio-keys-default {
>   		bias-pull-up;
>   	};
>   
> -	imu_default: imu-default {
> +	imu_default: imu-default-state {
>   		pins = "gpio115";
>   		function = "gpio";
>   
> @@ -288,14 +288,15 @@ imu_default: imu-default {
>   		bias-disable;
>   	};
>   
> -	touchscreen_default: touchscreen-default {
> -		pins = "gpio13";
> -		function = "gpio";
> -
> -		drive-strength = <2>;
> -		bias-pull-up;
> +	touchscreen_default: touchscreen-default-state {
> +		touchscreen-pins {
> +			pins = "gpio13";
> +			function = "gpio";
>   
> -		reset {
> +			drive-strength = <2>;
> +			bias-pull-up;
> +		};
> +		reset-pins {
>   			pins = "gpio12";
>   			function = "gpio";
>   
> @@ -304,7 +305,7 @@ reset {
>   		};
>   	};
>   
> -	usb_id_default: usb-id-default {
> +	usb_id_default: usb-id-default-state {
>   		pins = "gpio110";
>   		function = "gpio";
>   

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8916: convert to dtschema
@ 2022-11-09 10:44 Krzysztof Kozlowski
  2022-11-09 10:44 ` [PATCH 2/2] arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema Krzysztof Kozlowski
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-11-09 10:44 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Linus Walleij,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, linux-gpio,
	devicetree, linux-kernel
  Cc: Krzysztof Kozlowski

Convert Qualcomm MSM8916 pin controller bindings to DT schema.  Keep the
parsing of pin configuration subnodes consistent with other Qualcomm
schemas (children named with '-state' suffix, their children with
'-pins').

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../bindings/pinctrl/qcom,msm8916-pinctrl.txt | 195 ------------------
 .../pinctrl/qcom,msm8916-pinctrl.yaml         | 166 +++++++++++++++
 2 files changed, 166 insertions(+), 195 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt
 create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.yaml

diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt
deleted file mode 100644
index 3354a63296d9..000000000000
--- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt
+++ /dev/null
@@ -1,195 +0,0 @@
-Qualcomm MSM8916 TLMM block
-
-This binding describes the Top Level Mode Multiplexer block found in the
-MSM8916 platform.
-
-- compatible:
-	Usage: required
-	Value type: <string>
-	Definition: must be "qcom,msm8916-pinctrl"
-
-- reg:
-	Usage: required
-	Value type: <prop-encoded-array>
-	Definition: the base address and size of the TLMM register space.
-
-- interrupts:
-	Usage: required
-	Value type: <prop-encoded-array>
-	Definition: should specify the TLMM summary IRQ.
-
-- interrupt-controller:
-	Usage: required
-	Value type: <none>
-	Definition: identifies this node as an interrupt controller
-
-- #interrupt-cells:
-	Usage: required
-	Value type: <u32>
-	Definition: must be 2. Specifying the pin number and flags, as defined
-		    in <dt-bindings/interrupt-controller/irq.h>
-
-- gpio-controller:
-	Usage: required
-	Value type: <none>
-	Definition: identifies this node as a gpio controller
-
-- #gpio-cells:
-	Usage: required
-	Value type: <u32>
-	Definition: must be 2. Specifying the pin number and flags, as defined
-		    in <dt-bindings/gpio/gpio.h>
-
-- gpio-ranges:
-	Usage: required
-	Definition:  see ../gpio/gpio.txt
-
-- gpio-reserved-ranges:
-	Usage: optional
-	Definition: see ../gpio/gpio.txt
-
-Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for
-a general description of GPIO and interrupt bindings.
-
-Please refer to pinctrl-bindings.txt in this directory for details of the
-common pinctrl bindings used by client devices, including the meaning of the
-phrase "pin configuration node".
-
-The pin configuration nodes act as a container for an arbitrary number of
-subnodes. Each of these subnodes represents some desired configuration for a
-pin, a group, or a list of pins or groups. This configuration can include the
-mux function to select on those pin(s)/group(s), and various pin configuration
-parameters, such as pull-up, drive strength, etc.
-
-
-PIN CONFIGURATION NODES:
-
-The name of each subnode is not important; all subnodes should be enumerated
-and processed purely based on their content.
-
-Each subnode only affects those parameters that are explicitly listed. In
-other words, a subnode that lists a mux function but no pin configuration
-parameters implies no information about any pin configuration parameters.
-Similarly, a pin subnode that describes a pullup parameter implies no
-information about e.g. the mux function.
-
-
-The following generic properties as defined in pinctrl-bindings.txt are valid
-to specify in a pin configuration subnode:
-
-- pins:
-	Usage: required
-	Value type: <string-array>
-	Definition: List of gpio pins affected by the properties specified in
-		    this subnode.  Valid pins are:
-		    gpio0-gpio121,
-		    sdc1_clk,
-		    sdc1_cmd,
-		    sdc1_data
-		    sdc2_clk,
-		    sdc2_cmd,
-		    sdc2_data,
-		    qdsd_cmd,
-		    qdsd_data0,
-		    qdsd_data1,
-		    qdsd_data2,
-		    qdsd_data3
-
-- function:
-	Usage: required
-	Value type: <string>
-	Definition: Specify the alternative function to be configured for the
-		    specified pins. Functions are only valid for gpio pins.
-		    Valid values are:
-	adsp_ext, alsp_int, atest_bbrx0, atest_bbrx1, atest_char, atest_char0,
-	atest_char1, atest_char2, atest_char3, atest_combodac, atest_gpsadc0,
-	atest_gpsadc1, atest_tsens, atest_wlan0, atest_wlan1, backlight_en,
-	bimc_dte0,bimc_dte1, blsp_i2c1, blsp_i2c2, blsp_i2c3, blsp_i2c4,
-	blsp_i2c5, blsp_i2c6, blsp_spi1, blsp_spi1_cs1, blsp_spi1_cs2,
-	blsp_spi1_cs3, blsp_spi2, blsp_spi2_cs1, blsp_spi2_cs2, blsp_spi2_cs3,
-	blsp_spi3, blsp_spi3_cs1, blsp_spi3_cs2, blsp_spi3_cs3, blsp_spi4,
-	blsp_spi5, blsp_spi6, blsp_uart1, blsp_uart2, blsp_uim1, blsp_uim2,
-	cam1_rst, cam1_standby, cam_mclk0, cam_mclk1, cci_async, cci_i2c,
-	cci_timer0, cci_timer1, cci_timer2, cdc_pdm0, codec_mad, dbg_out,
-	display_5v, dmic0_clk, dmic0_data, dsi_rst, ebi0_wrcdc, euro_us,
-	ext_lpass, flash_strobe, gcc_gp1_clk_a, gcc_gp1_clk_b, gcc_gp2_clk_a,
-	gcc_gp2_clk_b, gcc_gp3_clk_a, gcc_gp3_clk_b, gpio, gsm0_tx0, gsm0_tx1,
-	gsm1_tx0, gsm1_tx1, gyro_accl, kpsns0, kpsns1, kpsns2, ldo_en,
-	ldo_update, mag_int, mdp_vsync, modem_tsync, m_voc, nav_pps, nav_tsync,
-	pa_indicator, pbs0, pbs1, pbs2, pri_mi2s, pri_mi2s_ws, prng_rosc,
-	pwr_crypto_enabled_a, pwr_crypto_enabled_b, pwr_modem_enabled_a,
-	pwr_modem_enabled_b, pwr_nav_enabled_a, pwr_nav_enabled_b,
-	qdss_ctitrig_in_a0, qdss_ctitrig_in_a1, qdss_ctitrig_in_b0,
-	qdss_ctitrig_in_b1, qdss_ctitrig_out_a0, qdss_ctitrig_out_a1,
-	qdss_ctitrig_out_b0, qdss_ctitrig_out_b1, qdss_traceclk_a,
-	qdss_traceclk_b, qdss_tracectl_a, qdss_tracectl_b, qdss_tracedata_a,
-	qdss_tracedata_b, reset_n, sd_card, sd_write, sec_mi2s, smb_int,
-	ssbi_wtr0, ssbi_wtr1, uim1, uim2, uim3, uim_batt, wcss_bt, wcss_fm,
-	wcss_wlan, webcam1_rst
-
-- bias-disable:
-	Usage: optional
-	Value type: <none>
-	Definition: The specified pins should be configured as no pull.
-
-- bias-pull-down:
-	Usage: optional
-	Value type: <none>
-	Definition: The specified pins should be configured as pull down.
-
-- bias-pull-up:
-	Usage: optional
-	Value type: <none>
-	Definition: The specified pins should be configured as pull up.
-
-- output-high:
-	Usage: optional
-	Value type: <none>
-	Definition: The specified pins are configured in output mode, driven
-		    high.
-		    Not valid for sdc pins.
-
-- output-low:
-	Usage: optional
-	Value type: <none>
-	Definition: The specified pins are configured in output mode, driven
-		    low.
-		    Not valid for sdc pins.
-
-- drive-strength:
-	Usage: optional
-	Value type: <u32>
-	Definition: Selects the drive strength for the specified pins, in mA.
-		    Valid values are: 2, 4, 6, 8, 10, 12, 14 and 16
-
-Example:
-
-	tlmm: pinctrl@1000000 {
-		compatible = "qcom,msm8916-pinctrl";
-		reg = <0x1000000 0x300000>;
-		interrupts = <0 208 0>;
-		gpio-controller;
-		#gpio-cells = <2>;
-		gpio-ranges = <&tlmm 0 0 122>;
-		interrupt-controller;
-		#interrupt-cells = <2>;
-
-		uart2: uart2-default {
-			mux {
-				pins = "gpio4", "gpio5";
-				function = "blsp_uart2";
-			};
-
-			tx {
-				pins = "gpio4";
-				drive-strength = <4>;
-				bias-disable;
-			};
-
-			rx {
-				pins = "gpio5";
-				drive-strength = <2>;
-				bias-pull-up;
-			};
-		};
-	};
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.yaml
new file mode 100644
index 000000000000..7ab5995fbbbf
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.yaml
@@ -0,0 +1,166 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pinctrl/qcom,msm8916-pinctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm MSM8916 TLMM pin controller
+
+maintainers:
+  - Bjorn Andersson <andersson@kernel.org>
+  - Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+
+description:
+  Top Level Mode Multiplexer pin controller in Qualcomm MSM8916 SoC.
+
+properties:
+  compatible:
+    const: qcom,msm8916-pinctrl
+
+  reg:
+    maxItems: 1
+
+  interrupts: true
+  interrupt-controller: true
+  "#interrupt-cells": true
+  gpio-controller: true
+  "#gpio-cells": true
+  gpio-ranges: true
+  wakeup-parent: true
+
+  gpio-reserved-ranges:
+    minItems: 1
+    maxItems: 61
+
+  gpio-line-names:
+    maxItems: 122
+
+patternProperties:
+  "-state$":
+    oneOf:
+      - $ref: "#/$defs/qcom-msm8916-tlmm-state"
+      - patternProperties:
+          "-pins$":
+            $ref: "#/$defs/qcom-msm8916-tlmm-state"
+        additionalProperties: false
+
+$defs:
+  qcom-msm8916-tlmm-state:
+    type: object
+    description:
+      Pinctrl node's client devices use subnodes for desired pin configuration.
+      Client device subnodes use below standard properties.
+    $ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state
+
+    properties:
+      pins:
+        description:
+          List of gpio pins affected by the properties specified in this
+          subnode.
+        items:
+          oneOf:
+            - pattern: "^gpio([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-1])$"
+            - enum: [ qdsd_cmd, qdsd_data0, qdsd_data1, qdsd_data2, qdsd_data3,
+                      sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, sdc2_cmd,
+                      sdc2_data ]
+        minItems: 1
+        maxItems: 36
+
+      function:
+        description:
+          Specify the alternative function to be configured for the specified
+          pins.
+
+        enum: [ gpio, adsp_ext, alsp_int, atest_bbrx0, atest_bbrx1, atest_char,
+                atest_char0, atest_char1, atest_char2, atest_char3,
+                atest_combodac, atest_gpsadc0, atest_gpsadc1, atest_tsens,
+                atest_wlan0, atest_wlan1, backlight_en, bimc_dte0, bimc_dte1,
+                blsp_i2c1, blsp_i2c2, blsp_i2c3, blsp_i2c4, blsp_i2c5,
+                blsp_i2c6, blsp_spi1, blsp_spi1_cs1, blsp_spi1_cs2,
+                blsp_spi1_cs3, blsp_spi2, blsp_spi2_cs1, blsp_spi2_cs2,
+                blsp_spi2_cs3, blsp_spi3, blsp_spi3_cs1, blsp_spi3_cs2,
+                blsp_spi3_cs3, blsp_spi4, blsp_spi5, blsp_spi6, blsp_uart1,
+                blsp_uart2, blsp_uim1, blsp_uim2, cam1_rst, cam1_standby,
+                cam_mclk0, cam_mclk1, cci_async, cci_i2c, cci_timer0,
+                cci_timer1, cci_timer2, cdc_pdm0, codec_mad, dbg_out,
+                display_5v, dmic0_clk, dmic0_data, dsi_rst, ebi0_wrcdc,
+                euro_us, ext_lpass, flash_strobe, gcc_gp1_clk_a, gcc_gp1_clk_b,
+                gcc_gp2_clk_a, gcc_gp2_clk_b, gcc_gp3_clk_a, gcc_gp3_clk_b,
+                gsm0_tx0, gsm0_tx1, gsm1_tx0, gsm1_tx1, gyro_accl, kpsns0,
+                kpsns1, kpsns2, ldo_en, ldo_update, mag_int, mdp_vsync,
+                modem_tsync, m_voc, nav_pps, nav_tsync, pa_indicator, pbs0,
+                pbs1, pbs2, pri_mi2s, pri_mi2s_ws, prng_rosc,
+                pwr_crypto_enabled_a, pwr_crypto_enabled_b,
+                pwr_modem_enabled_a, pwr_modem_enabled_b, pwr_nav_enabled_a,
+                pwr_nav_enabled_b, qdss_ctitrig_in_a0, qdss_ctitrig_in_a1,
+                qdss_ctitrig_in_b0, qdss_ctitrig_in_b1, qdss_ctitrig_out_a0,
+                qdss_ctitrig_out_a1, qdss_ctitrig_out_b0, qdss_ctitrig_out_b1,
+                qdss_traceclk_a, qdss_traceclk_b, qdss_tracectl_a,
+                qdss_tracectl_b, qdss_tracedata_a, qdss_tracedata_b, reset_n,
+                sd_card, sd_write, sec_mi2s, smb_int, ssbi_wtr0, ssbi_wtr1,
+                uim1, uim2, uim3, uim_batt, wcss_bt, wcss_fm, wcss_wlan,
+                webcam1_rst ]
+
+      bias-pull-down: true
+      bias-pull-up: true
+      bias-disable: true
+      drive-strength: true
+      input-enable: true
+      output-high: true
+      output-low: true
+
+    required:
+      - pins
+
+    additionalProperties: false
+
+allOf:
+  - $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+    msmgpio: pinctrl@1000000 {
+        compatible = "qcom,msm8916-pinctrl";
+        reg = <0x01000000 0x300000>;
+        interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
+        gpio-controller;
+        gpio-ranges = <&msmgpio 0 0 122>;
+        #gpio-cells = <2>;
+        interrupt-controller;
+        #interrupt-cells = <2>;
+
+        spi1-default-state {
+            spi-pins {
+                pins = "gpio0", "gpio1", "gpio3";
+                function = "blsp_spi1";
+
+                drive-strength = <12>;
+                bias-disable;
+            };
+
+            cs-pins {
+                pins = "gpio2";
+                function = "gpio";
+
+                drive-strength = <16>;
+                bias-disable;
+                output-high;
+            };
+        };
+
+        spi1-sleep-state {
+            pins = "gpio0", "gpio1", "gpio2", "gpio3";
+            function = "gpio";
+
+            drive-strength = <2>;
+            bias-pull-down;
+        };
+    };
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/2] arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema
  2022-11-09 10:44 [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8916: convert to dtschema Krzysztof Kozlowski
@ 2022-11-09 10:44 ` Krzysztof Kozlowski
  2022-11-09 10:46   ` Krzysztof Kozlowski
  2022-11-09 10:46 ` [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8916: convert to dtschema Krzysztof Kozlowski
  2022-11-09 12:59 ` Rob Herring
  2 siblings, 1 reply; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-11-09 10:44 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Linus Walleij,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, linux-gpio,
	devicetree, linux-kernel
  Cc: Krzysztof Kozlowski

DT schema expects TLMM pin configuration nodes to be named with
'-state' suffix and their optional children with '-pins' suffix.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/apq8016-sbc.dts      |  14 +-
 .../boot/dts/qcom/msm8916-alcatel-idol347.dts |  14 +-
 .../arm64/boot/dts/qcom/msm8916-asus-z00l.dts |  24 +-
 .../arm64/boot/dts/qcom/msm8916-huawei-g7.dts |  20 +-
 .../boot/dts/qcom/msm8916-longcheer-l8150.dts |  16 +-
 .../boot/dts/qcom/msm8916-longcheer-l8910.dts |   8 +-
 arch/arm64/boot/dts/qcom/msm8916-pins.dtsi    | 268 +++++++++---------
 .../qcom/msm8916-samsung-a2015-common.dtsi    |  61 ++--
 .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts |   6 +-
 .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts |   2 +-
 .../qcom/msm8916-samsung-e2015-common.dtsi    |   4 +-
 .../dts/qcom/msm8916-samsung-grandmax.dts     |   2 +-
 .../boot/dts/qcom/msm8916-samsung-j5.dts      |   2 +-
 .../dts/qcom/msm8916-samsung-serranove.dts    |  40 +--
 .../dts/qcom/msm8916-wingtech-wt88047.dts     |  20 +-
 15 files changed, 259 insertions(+), 242 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index 1b613098fb4a..9ebc506810f6 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -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";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index 3dc9619fde6e..668f8ff53229 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -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";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
index dd92070a1211..3618704a5330 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
@@ -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 {
-		pins = "gpio13";
-		function = "gpio";
+	touchscreen_default: touchscreen-default-state {
+		touch-pins {
+			pins = "gpio13";
+			function = "gpio";
 
-		drive-strength = <2>;
-		bias-pull-up;
+			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";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index 9e470c67274e..a6a7d870f586 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -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";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index d85e7f7c0835..31214570be4b 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -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";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index b4812f093b17..3899e11b9843 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -234,7 +234,7 @@ l18 {
 };
 
 &msmgpio {
-	button_backlight_default: button-backlight-default {
+	button_backlight_default: button-backlight-default-state {
 		pins = "gpio17";
 		function = "gpio";
 
@@ -242,7 +242,7 @@ button_backlight_default: button-backlight-default {
 		bias-disable;
 	};
 
-	gpio_keys_default: gpio-keys-default {
+	gpio_keys_default: gpio-keys-default-state {
 		pins = "gpio107";
 		function = "gpio";
 
@@ -250,7 +250,7 @@ gpio_keys_default: gpio-keys-default {
 		bias-pull-up;
 	};
 
-	mag_reset_default: mag-reset-default {
+	mag_reset_default: mag-reset-default-state {
 		pins = "gpio111";
 		function = "gpio";
 
@@ -258,7 +258,7 @@ mag_reset_default: mag-reset-default {
 		bias-disable;
 	};
 
-	usb_id_default: usb-id-default {
+	usb_id_default: usb-id-default-state {
 		pins = "gpio110";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
index 7dedb91b9930..8dc245e59a6e 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
@@ -5,7 +5,7 @@
 
 &msmgpio {
 
-	blsp1_uart1_default: blsp1-uart1-default {
+	blsp1_uart1_default: blsp1-uart1-default-state {
 		//	TX, RX, CTS_N, RTS_N
 		pins = "gpio0", "gpio1", "gpio2", "gpio3";
 		function = "blsp_uart1";
@@ -14,7 +14,7 @@ blsp1_uart1_default: blsp1-uart1-default {
 		bias-disable;
 	};
 
-	blsp1_uart1_sleep: blsp1-uart1-sleep {
+	blsp1_uart1_sleep: blsp1-uart1-sleep-state {
 		pins = "gpio0", "gpio1", "gpio2", "gpio3";
 		function = "gpio";
 
@@ -22,7 +22,7 @@ blsp1_uart1_sleep: blsp1-uart1-sleep {
 		bias-pull-down;
 	};
 
-	blsp1_uart2_default: blsp1-uart2-default {
+	blsp1_uart2_default: blsp1-uart2-default-state {
 		pins = "gpio4", "gpio5";
 		function = "blsp_uart2";
 
@@ -30,7 +30,7 @@ blsp1_uart2_default: blsp1-uart2-default {
 		bias-disable;
 	};
 
-	blsp1_uart2_sleep: blsp1-uart2-sleep {
+	blsp1_uart2_sleep: blsp1-uart2-sleep-state {
 		pins = "gpio4", "gpio5";
 		function = "gpio";
 
@@ -38,14 +38,16 @@ blsp1_uart2_sleep: blsp1-uart2-sleep {
 		bias-pull-down;
 	};
 
-	spi1_default: spi1-default {
-		pins = "gpio0", "gpio1", "gpio3";
-		function = "blsp_spi1";
+	spi1_default: spi1-default-state {
+		spi-pins {
+			pins = "gpio0", "gpio1", "gpio3";
+			function = "blsp_spi1";
 
-		drive-strength = <12>;
-		bias-disable;
+			drive-strength = <12>;
+			bias-disable;
+		};
 
-		cs {
+		cs-pins {
 			pins = "gpio2";
 			function = "gpio";
 
@@ -55,7 +57,7 @@ cs {
 		};
 	};
 
-	spi1_sleep: spi1-sleep {
+	spi1_sleep: spi1-sleep-state {
 		pins = "gpio0", "gpio1", "gpio2", "gpio3";
 		function = "gpio";
 
@@ -63,14 +65,16 @@ spi1_sleep: spi1-sleep {
 		bias-pull-down;
 	};
 
-	spi2_default: spi2-default {
-		pins = "gpio4", "gpio5", "gpio7";
-		function = "blsp_spi2";
+	spi2_default: spi2-default-state {
+		spi-pins {
+			pins = "gpio4", "gpio5", "gpio7";
+			function = "blsp_spi2";
 
-		drive-strength = <12>;
-		bias-disable;
+			drive-strength = <12>;
+			bias-disable;
+		};
 
-		cs {
+		cs-pins {
 			pins = "gpio6";
 			function = "gpio";
 
@@ -80,7 +84,7 @@ cs {
 		};
 	};
 
-	spi2_sleep: spi2-sleep {
+	spi2_sleep: spi2-sleep-state {
 		pins = "gpio4", "gpio5", "gpio6", "gpio7";
 		function = "gpio";
 
@@ -88,14 +92,16 @@ spi2_sleep: spi2-sleep {
 		bias-pull-down;
 	};
 
-	spi3_default: spi3-default {
-		pins = "gpio8", "gpio9", "gpio11";
-		function = "blsp_spi3";
+	spi3_default: spi3-default-state {
+		spi-pins {
+			pins = "gpio8", "gpio9", "gpio11";
+			function = "blsp_spi3";
 
-		drive-strength = <12>;
-		bias-disable;
+			drive-strength = <12>;
+			bias-disable;
+		};
 
-		cs {
+		cs-pins {
 			pins = "gpio10";
 			function = "gpio";
 
@@ -105,7 +111,7 @@ cs {
 		};
 	};
 
-	spi3_sleep: spi3-sleep {
+	spi3_sleep: spi3-sleep-state {
 		pins = "gpio8", "gpio9", "gpio10", "gpio11";
 		function = "gpio";
 
@@ -113,14 +119,16 @@ spi3_sleep: spi3-sleep {
 		bias-pull-down;
 	};
 
-	spi4_default: spi4-default {
-		pins = "gpio12", "gpio13", "gpio15";
-		function = "blsp_spi4";
+	spi4_default: spi4-default-state {
+		spi-pins {
+			pins = "gpio12", "gpio13", "gpio15";
+			function = "blsp_spi4";
 
-		drive-strength = <12>;
-		bias-disable;
+			drive-strength = <12>;
+			bias-disable;
+		};
 
-		cs {
+		cs-pins {
 			pins = "gpio14";
 			function = "gpio";
 
@@ -130,7 +138,7 @@ cs {
 		};
 	};
 
-	spi4_sleep: spi4-sleep {
+	spi4_sleep: spi4-sleep-state {
 		pins = "gpio12", "gpio13", "gpio14", "gpio15";
 		function = "gpio";
 
@@ -138,14 +146,16 @@ spi4_sleep: spi4-sleep {
 		bias-pull-down;
 	};
 
-	spi5_default: spi5-default {
-		pins = "gpio16", "gpio17", "gpio19";
-		function = "blsp_spi5";
+	spi5_default: spi5-default-state {
+		spi-pins {
+			pins = "gpio16", "gpio17", "gpio19";
+			function = "blsp_spi5";
 
-		drive-strength = <12>;
-		bias-disable;
+			drive-strength = <12>;
+			bias-disable;
+		};
 
-		cs {
+		cs-pins {
 			pins = "gpio18";
 			function = "gpio";
 
@@ -155,7 +165,7 @@ cs {
 		};
 	};
 
-	spi5_sleep: spi5-sleep {
+	spi5_sleep: spi5-sleep-state {
 		pins = "gpio16", "gpio17", "gpio18", "gpio19";
 		function = "gpio";
 
@@ -163,14 +173,16 @@ spi5_sleep: spi5-sleep {
 		bias-pull-down;
 	};
 
-	spi6_default: spi6-default {
-		pins = "gpio20", "gpio21", "gpio23";
-		function = "blsp_spi6";
+	spi6_default: spi6-default-state {
+		spi-pins {
+			pins = "gpio20", "gpio21", "gpio23";
+			function = "blsp_spi6";
 
-		drive-strength = <12>;
-		bias-disable;
+			drive-strength = <12>;
+			bias-disable;
+		};
 
-		cs {
+		cs-pins {
 			pins = "gpio22";
 			function = "gpio";
 
@@ -180,7 +192,7 @@ cs {
 		};
 	};
 
-	spi6_sleep: spi6-sleep {
+	spi6_sleep: spi6-sleep-state {
 		pins = "gpio20", "gpio21", "gpio22", "gpio23";
 		function = "gpio";
 
@@ -188,7 +200,7 @@ spi6_sleep: spi6-sleep {
 		bias-pull-down;
 	};
 
-	i2c1_default: i2c1-default {
+	i2c1_default: i2c1-default-state {
 		pins = "gpio2", "gpio3";
 		function = "blsp_i2c1";
 
@@ -196,7 +208,7 @@ i2c1_default: i2c1-default {
 		bias-disable;
 	};
 
-	i2c1_sleep: i2c1-sleep {
+	i2c1_sleep: i2c1-sleep-state {
 		pins = "gpio2", "gpio3";
 		function = "gpio";
 
@@ -204,7 +216,7 @@ i2c1_sleep: i2c1-sleep {
 		bias-disable;
 	};
 
-	i2c2_default: i2c2-default {
+	i2c2_default: i2c2-default-state {
 		pins = "gpio6", "gpio7";
 		function = "blsp_i2c2";
 
@@ -212,7 +224,7 @@ i2c2_default: i2c2-default {
 		bias-disable;
 	};
 
-	i2c2_sleep: i2c2-sleep {
+	i2c2_sleep: i2c2-sleep-state {
 		pins = "gpio6", "gpio7";
 		function = "gpio";
 
@@ -220,7 +232,7 @@ i2c2_sleep: i2c2-sleep {
 		bias-disable;
 	};
 
-	i2c3_default: i2c3-default {
+	i2c3_default: i2c3-default-state {
 		pins = "gpio10", "gpio11";
 		function = "blsp_i2c3";
 
@@ -228,7 +240,7 @@ i2c3_default: i2c3-default {
 		bias-disable;
 	};
 
-	i2c3_sleep: i2c3-sleep {
+	i2c3_sleep: i2c3-sleep-state {
 		pins = "gpio10", "gpio11";
 		function = "gpio";
 
@@ -236,7 +248,7 @@ i2c3_sleep: i2c3-sleep {
 		bias-disable;
 	};
 
-	i2c4_default: i2c4-default {
+	i2c4_default: i2c4-default-state {
 		pins = "gpio14", "gpio15";
 		function = "blsp_i2c4";
 
@@ -244,7 +256,7 @@ i2c4_default: i2c4-default {
 		bias-disable;
 	};
 
-	i2c4_sleep: i2c4-sleep {
+	i2c4_sleep: i2c4-sleep-state {
 		pins = "gpio14", "gpio15";
 		function = "gpio";
 
@@ -252,7 +264,7 @@ i2c4_sleep: i2c4-sleep {
 		bias-disable;
 	};
 
-	i2c5_default: i2c5-default {
+	i2c5_default: i2c5-default-state {
 		pins = "gpio18", "gpio19";
 		function = "blsp_i2c5";
 
@@ -260,7 +272,7 @@ i2c5_default: i2c5-default {
 		bias-disable;
 	};
 
-	i2c5_sleep: i2c5-sleep {
+	i2c5_sleep: i2c5-sleep-state {
 		pins = "gpio18", "gpio19";
 		function = "gpio";
 
@@ -268,7 +280,7 @@ i2c5_sleep: i2c5-sleep {
 		bias-disable;
 	};
 
-	i2c6_default: i2c6-default {
+	i2c6_default: i2c6-default-state {
 		pins = "gpio22", "gpio23";
 		function = "blsp_i2c6";
 
@@ -276,7 +288,7 @@ i2c6_default: i2c6-default {
 		bias-disable;
 	};
 
-	i2c6_sleep: i2c6-sleep {
+	i2c6_sleep: i2c6-sleep-state {
 		pins = "gpio22", "gpio23";
 		function = "gpio";
 
@@ -284,14 +296,14 @@ i2c6_sleep: i2c6-sleep {
 		bias-disable;
 	};
 
-	pmx-sdc1-clk {
-		sdc1_clk_on: clk-on {
+	pmx-sdc1-clk-state {
+		sdc1_clk_on: clk-on-pins {
 			pins = "sdc1_clk";
 
 			bias-disable;
 			drive-strength = <16>;
 		};
-		sdc1_clk_off: clk-off {
+		sdc1_clk_off: clk-off-pins {
 			pins = "sdc1_clk";
 
 			bias-disable;
@@ -299,14 +311,14 @@ sdc1_clk_off: clk-off {
 		};
 	};
 
-	pmx-sdc1-cmd {
-		sdc1_cmd_on: cmd-on {
+	pmx-sdc1-cmd-state {
+		sdc1_cmd_on: cmd-on-pins {
 			pins = "sdc1_cmd";
 
 			bias-pull-up;
 			drive-strength = <10>;
 		};
-		sdc1_cmd_off: cmd-off {
+		sdc1_cmd_off: cmd-off-pins {
 			pins = "sdc1_cmd";
 
 			bias-pull-up;
@@ -314,14 +326,14 @@ sdc1_cmd_off: cmd-off {
 		};
 	};
 
-	pmx-sdc1-data {
-		sdc1_data_on: data-on {
+	pmx-sdc1-data-state {
+		sdc1_data_on: data-on-pins {
 			pins = "sdc1_data";
 
 			bias-pull-up;
 			drive-strength = <10>;
 		};
-		sdc1_data_off: data-off {
+		sdc1_data_off: data-off-pins {
 			pins = "sdc1_data";
 
 			bias-pull-up;
@@ -329,14 +341,14 @@ sdc1_data_off: data-off {
 		};
 	};
 
-	pmx-sdc2-clk {
-		sdc2_clk_on: clk-on {
+	pmx-sdc2-clk-state {
+		sdc2_clk_on: clk-on-pins {
 			pins = "sdc2_clk";
 
 			bias-disable;
 			drive-strength = <16>;
 		};
-		sdc2_clk_off: clk-off {
+		sdc2_clk_off: clk-off-pins {
 			pins = "sdc2_clk";
 
 			bias-disable;
@@ -344,14 +356,14 @@ sdc2_clk_off: clk-off {
 		};
 	};
 
-	pmx-sdc2-cmd {
-		sdc2_cmd_on: cmd-on {
+	pmx-sdc2-cmd-state {
+		sdc2_cmd_on: cmd-on-pins {
 			pins = "sdc2_cmd";
 
 			bias-pull-up;
 			drive-strength = <10>;
 		};
-		sdc2_cmd_off: cmd-off {
+		sdc2_cmd_off: cmd-off-pins {
 			pins = "sdc2_cmd";
 
 			bias-pull-up;
@@ -359,14 +371,14 @@ sdc2_cmd_off: cmd-off {
 		};
 	};
 
-	pmx-sdc2-data {
-		sdc2_data_on: data-on {
+	pmx-sdc2-data-state {
+		sdc2_data_on: data-on-pins {
 			pins = "sdc2_data";
 
 			bias-pull-up;
 			drive-strength = <10>;
 		};
-		sdc2_data_off: data-off {
+		sdc2_data_off: data-off-pins {
 			pins = "sdc2_data";
 
 			bias-pull-up;
@@ -374,15 +386,15 @@ sdc2_data_off: data-off {
 		};
 	};
 
-	pmx-sdc2-cd-pin {
-		sdc2_cd_on: cd-on {
+	pmx-sdc2-cd-pin-state {
+		sdc2_cd_on: cd-on-pins {
 			pins = "gpio38";
 			function = "gpio";
 
 			drive-strength = <2>;
 			bias-pull-up;
 		};
-		sdc2_cd_off: cd-off {
+		sdc2_cd_off: cd-off-pins {
 			pins = "gpio38";
 			function = "gpio";
 
@@ -391,8 +403,8 @@ sdc2_cd_off: cd-off {
 		};
 	};
 
-	cdc-pdm-lines {
-		cdc_pdm_lines_act: pdm-lines-on {
+	cdc-pdm-lines-state {
+		cdc_pdm_lines_act: pdm-lines-on-pins {
 			pins = "gpio63", "gpio64", "gpio65", "gpio66",
 			       "gpio67", "gpio68";
 			function = "cdc_pdm0";
@@ -400,7 +412,7 @@ cdc_pdm_lines_act: pdm-lines-on {
 			drive-strength = <8>;
 			bias-disable;
 		};
-		cdc_pdm_lines_sus: pdm-lines-off {
+		cdc_pdm_lines_sus: pdm-lines-off-pins {
 			pins = "gpio63", "gpio64", "gpio65", "gpio66",
 			       "gpio67", "gpio68";
 			function = "cdc_pdm0";
@@ -410,15 +422,15 @@ cdc_pdm_lines_sus: pdm-lines-off {
 		};
 	};
 
-	ext-pri-tlmm-lines {
-		ext_pri_tlmm_lines_act: ext-pa-on {
+	ext-pri-tlmm-lines-state {
+		ext_pri_tlmm_lines_act: ext-pa-on-pins {
 			pins = "gpio113", "gpio114", "gpio115", "gpio116";
 			function = "pri_mi2s";
 
 			drive-strength = <8>;
 			bias-disable;
 		};
-		ext_pri_tlmm_lines_sus: ext-pa-off {
+		ext_pri_tlmm_lines_sus: ext-pa-off-pins {
 			pins = "gpio113", "gpio114", "gpio115", "gpio116";
 			function = "pri_mi2s";
 
@@ -427,15 +439,15 @@ ext_pri_tlmm_lines_sus: ext-pa-off {
 		};
 	};
 
-	ext-pri-ws-line {
-		ext_pri_ws_act: ext-pa-on {
+	ext-pri-ws-line-state {
+		ext_pri_ws_act: ext-pa-on-pins {
 			pins = "gpio110";
 			function = "pri_mi2s_ws";
 
 			drive-strength = <8>;
 			bias-disable;
 		};
-		ext_pri_ws_sus: ext-pa-off {
+		ext_pri_ws_sus: ext-pa-off-pins {
 			pins = "gpio110";
 			function = "pri_mi2s_ws";
 
@@ -444,15 +456,15 @@ ext_pri_ws_sus: ext-pa-off {
 		};
 	};
 
-	ext-mclk-tlmm-lines {
-		ext_mclk_tlmm_lines_act: mclk-lines-on {
+	ext-mclk-tlmm-lines-state {
+		ext_mclk_tlmm_lines_act: mclk-lines-on-pins {
 			pins = "gpio116";
 			function = "pri_mi2s";
 
 			drive-strength = <8>;
 			bias-disable;
 		};
-		ext_mclk_tlmm_lines_sus: mclk-lines-off {
+		ext_mclk_tlmm_lines_sus: mclk-lines-off-pins {
 			pins = "gpio116";
 			function = "pri_mi2s";
 
@@ -462,15 +474,15 @@ ext_mclk_tlmm_lines_sus: mclk-lines-off {
 	};
 
 	/* secondary Mi2S */
-	ext-sec-tlmm-lines {
-		ext_sec_tlmm_lines_act: tlmm-lines-on {
+	ext-sec-tlmm-lines-state {
+		ext_sec_tlmm_lines_act: tlmm-lines-on-pins {
 			pins = "gpio112", "gpio117", "gpio118", "gpio119";
 			function = "sec_mi2s";
 
 			drive-strength = <8>;
 			bias-disable;
 		};
-		ext_sec_tlmm_lines_sus: tlmm-lines-off {
+		ext_sec_tlmm_lines_sus: tlmm-lines-off-pins {
 			pins = "gpio112", "gpio117", "gpio118", "gpio119";
 			function = "sec_mi2s";
 
@@ -479,40 +491,38 @@ ext_sec_tlmm_lines_sus: tlmm-lines-off {
 		};
 	};
 
-	cdc-dmic-lines {
-		cdc_dmic_lines_act: dmic-lines-on {
-			clk {
-				pins = "gpio0";
-				function = "dmic0_clk";
+	cdc_dmic_lines_act: dmic-lines-on-state {
+		clk-pins {
+			pins = "gpio0";
+			function = "dmic0_clk";
 
-				drive-strength = <8>;
-			};
-			data {
-				pins = "gpio1";
-				function = "dmic0_data";
+			drive-strength = <8>;
+		};
+		data-pins {
+			pins = "gpio1";
+			function = "dmic0_data";
 
-				drive-strength = <8>;
-			};
+			drive-strength = <8>;
 		};
-		cdc_dmic_lines_sus: dmic-lines-off {
-			clk {
-				pins = "gpio0";
-				function = "dmic0_clk";
+	};
+	cdc_dmic_lines_sus: dmic-lines-off-state {
+		clk-pins {
+			pins = "gpio0";
+			function = "dmic0_clk";
 
-				drive-strength = <2>;
-				bias-disable;
-			};
-			data {
-				pins = "gpio1";
-				function = "dmic0_data";
+			drive-strength = <2>;
+			bias-disable;
+		};
+		data-pins {
+			pins = "gpio1";
+			function = "dmic0_data";
 
-				drive-strength = <2>;
-				bias-disable;
-			};
+			drive-strength = <2>;
+			bias-disable;
 		};
 	};
 
-	wcnss_pin_a: wcnss-active {
+	wcnss_pin_a: wcnss-active-state {
 		pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44";
 		function = "wcss_wlan";
 
@@ -520,7 +530,7 @@ wcnss_pin_a: wcnss-active {
 		bias-pull-up;
 	};
 
-	cci0_default: cci0-default {
+	cci0_default: cci0-default-state {
 		pins = "gpio29", "gpio30";
 		function = "cci_i2c";
 
@@ -528,22 +538,22 @@ cci0_default: cci0-default {
 		bias-disable;
 	};
 
-	camera_front_default: camera-front-default {
-		pwdn {
+	camera_front_default: camera-front-default-state {
+		pwdn-pins {
 			pins = "gpio33";
 			function = "gpio";
 
 			drive-strength = <16>;
 			bias-disable;
 		};
-		rst {
+		rst-pins {
 			pins = "gpio28";
 			function = "gpio";
 
 			drive-strength = <16>;
 			bias-disable;
 		};
-		mclk1 {
+		mclk1-pins {
 			pins = "gpio27";
 			function = "cam_mclk1";
 
@@ -552,22 +562,22 @@ mclk1 {
 		};
 	};
 
-	camera_rear_default: camera-rear-default {
-		pwdn {
+	camera_rear_default: camera-rear-default-state {
+		pwdn-pins {
 			pins = "gpio34";
 			function = "gpio";
 
 			drive-strength = <16>;
 			bias-disable;
 		};
-		rst {
+		rst-pins {
 			pins = "gpio35";
 			function = "gpio";
 
 			drive-strength = <16>;
 			bias-disable;
 		};
-		mclk0 {
+		mclk0-pins {
 			pins = "gpio26";
 			function = "cam_mclk0";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index 5f7cec347a4f..d701260c78b0 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -348,7 +348,7 @@ l18 {
 };
 
 &msmgpio {
-	accel_int_default: accel-int-default {
+	accel_int_default: accel-int-default-state {
 		pins = "gpio115";
 		function = "gpio";
 
@@ -356,7 +356,7 @@ accel_int_default: accel-int-default {
 		bias-disable;
 	};
 
-	fg_alert_default: fg-alert-default {
+	fg_alert_default: fg-alert-default-state {
 		pins = "gpio121";
 		function = "gpio";
 
@@ -364,7 +364,7 @@ fg_alert_default: fg-alert-default {
 		bias-disable;
 	};
 
-	gpio_keys_default: gpio-keys-default {
+	gpio_keys_default: gpio-keys-default-state {
 		pins = "gpio107", "gpio109";
 		function = "gpio";
 
@@ -372,7 +372,7 @@ gpio_keys_default: gpio-keys-default {
 		bias-pull-up;
 	};
 
-	gpio_hall_sensor_default: gpio-hall-sensor-default {
+	gpio_hall_sensor_default: gpio-hall-sensor-default-state {
 		pins = "gpio52";
 		function = "gpio";
 
@@ -380,24 +380,23 @@ gpio_hall_sensor_default: gpio-hall-sensor-default {
 		bias-disable;
 	};
 
-	mdss {
-		mdss_default: mdss-default {
-			pins = "gpio25";
-			function = "gpio";
+	mdss_default: mdss-default-state {
+		pins = "gpio25";
+		function = "gpio";
 
-			drive-strength = <8>;
-			bias-disable;
-		};
-		mdss_sleep: mdss-sleep {
-			pins = "gpio25";
-			function = "gpio";
+		drive-strength = <8>;
+		bias-disable;
+	};
 
-			drive-strength = <2>;
-			bias-pull-down;
-		};
+	mdss_sleep: mdss-sleep-state {
+		pins = "gpio25";
+		function = "gpio";
+
+		drive-strength = <2>;
+		bias-pull-down;
 	};
 
-	muic_i2c_default: muic-i2c-default {
+	muic_i2c_default: muic-i2c-default-state {
 		pins = "gpio105", "gpio106";
 		function = "gpio";
 
@@ -405,7 +404,7 @@ muic_i2c_default: muic-i2c-default {
 		bias-disable;
 	};
 
-	muic_int_default: muic-int-default {
+	muic_int_default: muic-int-default-state {
 		pins = "gpio12";
 		function = "gpio";
 
@@ -413,14 +412,16 @@ muic_int_default: muic-int-default {
 		bias-disable;
 	};
 
-	nfc_default: nfc-default {
-		pins = "gpio20", "gpio49";
-		function = "gpio";
+	nfc_default: nfc-default-state {
+		nfc-pins {
+			pins = "gpio20", "gpio49";
+			function = "gpio";
 
-		drive-strength = <2>;
-		bias-disable;
+			drive-strength = <2>;
+			bias-disable;
+		};
 
-		irq {
+		irq-pins {
 			pins = "gpio21";
 			function = "gpio";
 
@@ -429,7 +430,7 @@ irq {
 		};
 	};
 
-	nfc_i2c_default: nfc-i2c-default {
+	nfc_i2c_default: nfc-i2c-default-state {
 		pins = "gpio0", "gpio1";
 		function = "gpio";
 
@@ -437,7 +438,7 @@ nfc_i2c_default: nfc-i2c-default {
 		bias-disable;
 	};
 
-	tkey_default: tkey-default {
+	tkey_default: tkey-default-state {
 		pins = "gpio98";
 		function = "gpio";
 
@@ -445,7 +446,7 @@ tkey_default: tkey-default {
 		bias-disable;
 	};
 
-	tkey_i2c_default: tkey-i2c-default {
+	tkey_i2c_default: tkey-i2c-default-state {
 		pins = "gpio16", "gpio17";
 		function = "gpio";
 
@@ -453,7 +454,7 @@ tkey_i2c_default: tkey-i2c-default {
 		bias-disable;
 	};
 
-	tsp_en_default: tsp-en-default {
+	tsp_en_default: tsp-en-default-state {
 		pins = "gpio73";
 		function = "gpio";
 
@@ -461,7 +462,7 @@ tsp_en_default: tsp-en-default {
 		bias-disable;
 	};
 
-	ts_int_default: ts-int-default {
+	ts_int_default: ts-int-default-state {
 		pins = "gpio13";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
index 6db5f78ca286..0733b73b6dd1 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
@@ -105,7 +105,7 @@ &dsi0_out {
 };
 
 &msmgpio {
-	panel_vdd3_default: panel-vdd3-default {
+	panel_vdd3_default: panel-vdd3-default-state {
 		pins = "gpio9";
 		function = "gpio";
 
@@ -113,7 +113,7 @@ panel_vdd3_default: panel-vdd3-default {
 		bias-disable;
 	};
 
-	tkey_en_default: tkey-en-default {
+	tkey_en_default: tkey-en-default-state {
 		pins = "gpio86";
 		function = "gpio";
 
@@ -121,7 +121,7 @@ tkey_en_default: tkey-en-default {
 		bias-disable;
 	};
 
-	tkey_led_en_default: tkey-led-en-default {
+	tkey_led_en_default: tkey-led-en-default-state {
 		pins = "gpio60";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
index 5fb8ecd0c9ca..5131bb1f6ba3 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
@@ -62,7 +62,7 @@ &touchkey {
 };
 
 &msmgpio {
-	tkey_en_default: tkey-en-default {
+	tkey_en_default: tkey-en-default-state {
 		pins = "gpio97";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
index 542010fdfb8a..450986e09c33 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
@@ -67,7 +67,7 @@ &touchkey {
 };
 
 &msmgpio {
-	motor_en_default: motor-en-default {
+	motor_en_default: motor-en-default-state {
 		pins = "gpio76";
 		function = "gpio";
 
@@ -75,7 +75,7 @@ motor_en_default: motor-en-default {
 		bias-disable;
 	};
 
-	tkey_en_default: tkey-en-default {
+	tkey_en_default: tkey-en-default-state {
 		pins = "gpio97";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
index bc7134698978..a3d572d851ef 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
@@ -46,7 +46,7 @@ &reg_touch_key {
 };
 
 &msmgpio {
-	gpio_leds_default: gpio-led-default {
+	gpio_leds_default: gpio-led-default-state {
 		pins = "gpio60";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
index eabeed18cfaa..7ac49a021563 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
@@ -199,7 +199,7 @@ l18 {
 };
 
 &msmgpio {
-	gpio_keys_default: gpio-keys-default {
+	gpio_keys_default: gpio-keys-default-state {
 		pins = "gpio107", "gpio109";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
index bbd6bb3f4fd7..82fbcd5795dc 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
@@ -422,7 +422,7 @@ l18 {
 };
 
 &msmgpio {
-	fg_alert_default: fg-alert-default {
+	fg_alert_default: fg-alert-default-state {
 		pins = "gpio121";
 		function = "gpio";
 
@@ -430,7 +430,7 @@ fg_alert_default: fg-alert-default {
 		bias-disable;
 	};
 
-	gpio_keys_default: gpio-keys-default {
+	gpio_keys_default: gpio-keys-default-state {
 		pins = "gpio107", "gpio109";
 		function = "gpio";
 
@@ -438,7 +438,7 @@ gpio_keys_default: gpio-keys-default {
 		bias-pull-up;
 	};
 
-	gpio_hall_sensor_default: gpio-hall-sensor-default {
+	gpio_hall_sensor_default: gpio-hall-sensor-default-state {
 		pins = "gpio52";
 		function = "gpio";
 
@@ -446,7 +446,7 @@ gpio_hall_sensor_default: gpio-hall-sensor-default {
 		bias-disable;
 	};
 
-	imu_irq_default: imu-irq-default {
+	imu_irq_default: imu-irq-default-state {
 		pins = "gpio115";
 		function = "gpio";
 
@@ -454,7 +454,7 @@ imu_irq_default: imu-irq-default {
 		bias-disable;
 	};
 
-	muic_i2c_default: muic-i2c-default {
+	muic_i2c_default: muic-i2c-default-state {
 		pins = "gpio105", "gpio106";
 		function = "gpio";
 
@@ -462,7 +462,7 @@ muic_i2c_default: muic-i2c-default {
 		bias-disable;
 	};
 
-	muic_irq_default: muic-irq-default {
+	muic_irq_default: muic-irq-default-state {
 		pins = "gpio12";
 		function = "gpio";
 
@@ -470,14 +470,16 @@ muic_irq_default: muic-irq-default {
 		bias-disable;
 	};
 
-	nfc_default: nfc-default {
-		pins = "gpio20", "gpio49";
-		function = "gpio";
+	nfc_default: nfc-default-state {
+		nfc-pins {
+			pins = "gpio20", "gpio49";
+			function = "gpio";
 
-		drive-strength = <2>;
-		bias-disable;
+			drive-strength = <2>;
+			bias-disable;
+		};
 
-		irq {
+		irq-pins {
 			pins = "gpio21";
 			function = "gpio";
 
@@ -486,7 +488,7 @@ irq {
 		};
 	};
 
-	nfc_i2c_default: nfc-i2c-default {
+	nfc_i2c_default: nfc-i2c-default-state {
 		pins = "gpio0", "gpio1";
 		function = "gpio";
 
@@ -494,7 +496,7 @@ nfc_i2c_default: nfc-i2c-default {
 		bias-disable;
 	};
 
-	tkey_default: tkey-default {
+	tkey_default: tkey-default-state {
 		pins = "gpio98";
 		function = "gpio";
 
@@ -502,7 +504,7 @@ tkey_default: tkey-default {
 		bias-disable;
 	};
 
-	tkey_en_default: tkey-en-default {
+	tkey_en_default: tkey-en-default-state {
 		pins = "gpio86";
 		function = "gpio";
 
@@ -510,7 +512,7 @@ tkey_en_default: tkey-en-default {
 		bias-disable;
 	};
 
-	tkey_i2c_default: tkey-i2c-default {
+	tkey_i2c_default: tkey-i2c-default-state {
 		pins = "gpio16", "gpio17";
 		function = "gpio";
 
@@ -518,7 +520,7 @@ tkey_i2c_default: tkey-i2c-default {
 		bias-disable;
 	};
 
-	tkey_led_en_default: tkey-led-en-default {
+	tkey_led_en_default: tkey-led-en-default-state {
 		pins = "gpio60";
 		function = "gpio";
 
@@ -526,7 +528,7 @@ tkey_led_en_default: tkey-led-en-default {
 		bias-disable;
 	};
 
-	tsp_en_default: tsp-en-default {
+	tsp_en_default: tsp-en-default-state {
 		pins = "gpio73";
 		function = "gpio";
 
@@ -534,7 +536,7 @@ tsp_en_default: tsp-en-default {
 		bias-disable;
 	};
 
-	tsp_irq_default: tsp-irq-default {
+	tsp_irq_default: tsp-irq-default-state {
 		pins = "gpio13";
 		function = "gpio";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index 84a352dcf9a2..9dd4312c9933 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -272,7 +272,7 @@ l18 {
 };
 
 &msmgpio {
-	gpio_keys_default: gpio-keys-default {
+	gpio_keys_default: gpio-keys-default-state {
 		pins = "gpio107";
 		function = "gpio";
 
@@ -280,7 +280,7 @@ gpio_keys_default: gpio-keys-default {
 		bias-pull-up;
 	};
 
-	imu_default: imu-default {
+	imu_default: imu-default-state {
 		pins = "gpio115";
 		function = "gpio";
 
@@ -288,14 +288,16 @@ imu_default: imu-default {
 		bias-disable;
 	};
 
-	touchscreen_default: touchscreen-default {
-		pins = "gpio13";
-		function = "gpio";
+	touchscreen_default: touchscreen-default-state {
+		touch-pins {
+			pins = "gpio13";
+			function = "gpio";
 
-		drive-strength = <2>;
-		bias-pull-up;
+			drive-strength = <2>;
+			bias-pull-up;
+		};
 
-		reset {
+		reset-pins {
 			pins = "gpio12";
 			function = "gpio";
 
@@ -304,7 +306,7 @@ reset {
 		};
 	};
 
-	usb_id_default: usb-id-default {
+	usb_id_default: usb-id-default-state {
 		pins = "gpio110";
 		function = "gpio";
 
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8916: convert to dtschema
  2022-11-09 10:44 [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8916: convert to dtschema Krzysztof Kozlowski
  2022-11-09 10:44 ` [PATCH 2/2] arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema Krzysztof Kozlowski
@ 2022-11-09 10:46 ` Krzysztof Kozlowski
  2022-11-09 12:59 ` Rob Herring
  2 siblings, 0 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-11-09 10:46 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Linus Walleij,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, linux-gpio,
	devicetree, linux-kernel

On 09/11/2022 11:44, Krzysztof Kozlowski wrote:
> Convert Qualcomm MSM8916 pin controller bindings to DT schema.  Keep the
> parsing of pin configuration subnodes consistent with other Qualcomm
> schemas (children named with '-state' suffix, their children with
> '-pins').
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  .../bindings/pinctrl/qcom,msm8916-pinctrl.txt | 195 ------------------
>  .../pinctrl/qcom,msm8916-pinctrl.yaml         | 166 +++++++++++++++

Crap, I already did it... ignore. :(

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/2] arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema
  2022-11-09 10:44 ` [PATCH 2/2] arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema Krzysztof Kozlowski
@ 2022-11-09 10:46   ` Krzysztof Kozlowski
  0 siblings, 0 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-11-09 10:46 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Linus Walleij,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, linux-gpio,
	devicetree, linux-kernel

On 09/11/2022 11:44, Krzysztof Kozlowski wrote:
> DT schema expects TLMM pin configuration nodes to be named with
> '-state' suffix and their optional children with '-pins' suffix.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---

Ignore please.

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8916: convert to dtschema
  2022-11-09 10:44 [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8916: convert to dtschema Krzysztof Kozlowski
  2022-11-09 10:44 ` [PATCH 2/2] arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema Krzysztof Kozlowski
  2022-11-09 10:46 ` [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8916: convert to dtschema Krzysztof Kozlowski
@ 2022-11-09 12:59 ` Rob Herring
  2 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2022-11-09 12:59 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Bjorn Andersson, Linus Walleij, Rob Herring, Krzysztof Kozlowski,
	linux-arm-msm, linux-gpio, Andy Gross, devicetree, Konrad Dybcio,
	linux-kernel


On Wed, 09 Nov 2022 11:44:01 +0100, Krzysztof Kozlowski wrote:
> Convert Qualcomm MSM8916 pin controller bindings to DT schema.  Keep the
> parsing of pin configuration subnodes consistent with other Qualcomm
> schemas (children named with '-state' suffix, their children with
> '-pins').
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  .../bindings/pinctrl/qcom,msm8916-pinctrl.txt | 195 ------------------
>  .../pinctrl/qcom,msm8916-pinctrl.yaml         | 166 +++++++++++++++
>  2 files changed, 166 insertions(+), 195 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt
>  create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.yaml
> 

Running 'make dtbs_check' with the schema in this patch gives the
following warnings. Consider if they are expected or the schema is
incorrect. These may not be new warnings.

Note that it is not yet a requirement to have 0 warnings for dtbs_check.
This will change in the future.

Full log is available here: https://patchwork.ozlabs.org/patch/


pinctrl@1000000: 'accel-int-default', 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'camera-flash-default', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ctp-pwr-en-default', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'gpio-keys-default', 'gyro-int-default', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'light-int-default', 'magn-int-default', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'tp-int-default', 'wcnss-active' do not match any of the regexes: '-state$', 'pinct
 rl-[0-9]+'
	arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dtb

pinctrl@1000000: 'accel-int-default', 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'fg-alert-default', 'gpio-hall-sensor-default', 'gpio-keys-default', 'gpio-led-default', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'mdss', 'motor-en-default', 'muic-i2c-default', 'muic-int-default', 'nfc-default', 'nfc-i2c-default', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'tkey-default', 'tke
 y-en-default', 'tkey-i2c-default', 'ts-int-default', 'tsp-en-default', 'wcnss-active' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dtb
	arch/arm/boot/dts/qcom-msm8916-samsung-grandmax.dtb

pinctrl@1000000: 'accel-int-default', 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'fg-alert-default', 'gpio-hall-sensor-default', 'gpio-keys-default', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'mdss', 'motor-en-default', 'muic-i2c-default', 'muic-int-default', 'nfc-default', 'nfc-i2c-default', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'tkey-default', 'tkey-en-default', 'tkey
 -i2c-default', 'ts-int-default', 'tsp-en-default', 'wcnss-active' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/qcom/msm8916-samsung-e5.dtb
	arch/arm64/boot/dts/qcom/msm8916-samsung-e7.dtb
	arch/arm/boot/dts/qcom-msm8916-samsung-e5.dtb
	arch/arm/boot/dts/qcom-msm8916-samsung-e7.dtb

pinctrl@1000000: 'accel-int-default', 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'fg-alert-default', 'gpio-hall-sensor-default', 'gpio-keys-default', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'mdss', 'muic-i2c-default', 'muic-int-default', 'nfc-default', 'nfc-i2c-default', 'panel-vdd3-default', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'tkey-default', 'tkey-en-default', 'tk
 ey-i2c-default', 'tkey-led-en-default', 'ts-int-default', 'tsp-en-default', 'wcnss-active' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dtb

pinctrl@1000000: 'accel-int-default', 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'fg-alert-default', 'gpio-hall-sensor-default', 'gpio-keys-default', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'mdss', 'muic-i2c-default', 'muic-int-default', 'nfc-default', 'nfc-i2c-default', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'tkey-default', 'tkey-en-default', 'tkey-i2c-default', 'ts-i
 nt-default', 'tsp-en-default', 'wcnss-active' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dtb

pinctrl@1000000: 'accel-int-default', 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'gpio-keys-default', 'gyro-int-default', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'mag-reset-default', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'proximity-int-default', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'ts-int-reset-default', 'usb-id-default', 'wcnss-active' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dtb

pinctrl@1000000: 'accel-irq-default', 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'gpio-keys-default', 'gpio-leds-default', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'mag-reset-default', 'nfc-default', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'prox-irq-default', 'reg-lcd-en-default', 'sdhc2-cd-default', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'ts-irq-default', 'usb-id-default', 'wcnss-active' do not match any of 
 the regexes: '-state$', 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dtb

pinctrl@1000000: 'adv533-int-active', 'adv7533-int-suspend', 'adv7533-switch-active', 'adv7533-switch-suspend', 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'msm-key-volp-n-default', 'msmgpio-leds', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'usb-id-default', 'wcnss-active' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/qcom/apq8016-sbc.dtb
	arch/arm/boot/dts/qcom-apq8016-sbc.dtb

pinctrl@1000000: 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'button-backlight-default', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'gpio-keys-default', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'mag-reset-default', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'usb-id-default', 'wcnss-active' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dtb

pinctrl@1000000: 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'fg-alert-default', 'gpio-hall-sensor-default', 'gpio-keys-default', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'imu-irq-default', 'muic-i2c-default', 'muic-irq-default', 'nfc-default', 'nfc-i2c-default', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'tkey-default', 'tkey-en-default', 'tkey-i2c-default', 'tkey-led-en-de
 fault', 'tsp-en-default', 'tsp-irq-default', 'wcnss-active' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dtb
	arch/arm/boot/dts/qcom-msm8916-samsung-serranove.dtb

pinctrl@1000000: 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'gpio-keys-default', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'imu-default', 'mag-reset-default', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'sd-vmmc-en-default', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'touchscreen-default', 'usb-id-default', 'wcnss-active' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dtb

pinctrl@1000000: 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'gpio-keys-default', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'imu-default', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'touchscreen-default', 'usb-id-default', 'wcnss-active' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dtb

pinctrl@1000000: 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'gpio-keys-default', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'wcnss-active' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dtb

pinctrl@1000000: 'blsp1-uart1-default', 'blsp1-uart1-sleep', 'blsp1-uart2-default', 'blsp1-uart2-sleep', 'camera-front-default', 'camera-rear-default', 'cci0-default', 'cdc-dmic-lines', 'cdc-pdm-lines', 'ext-mclk-tlmm-lines', 'ext-pri-tlmm-lines', 'ext-pri-ws-line', 'ext-sec-tlmm-lines', 'i2c1-default', 'i2c1-sleep', 'i2c2-default', 'i2c2-sleep', 'i2c3-default', 'i2c3-sleep', 'i2c4-default', 'i2c4-sleep', 'i2c5-default', 'i2c5-sleep', 'i2c6-default', 'i2c6-sleep', 'pmx-sdc1-clk', 'pmx-sdc1-cmd', 'pmx-sdc1-data', 'pmx-sdc2-cd-pin', 'pmx-sdc2-clk', 'pmx-sdc2-cmd', 'pmx-sdc2-data', 'spi1-default', 'spi1-sleep', 'spi2-default', 'spi2-sleep', 'spi3-default', 'spi3-sleep', 'spi4-default', 'spi4-sleep', 'spi5-default', 'spi5-sleep', 'spi6-default', 'spi6-sleep', 'wcnss-active' do not match any of the regexes: '-state$', 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/qcom/msm8916-mtp.dtb


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2022-11-09 12:59 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-09 10:44 [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8916: convert to dtschema Krzysztof Kozlowski
2022-11-09 10:44 ` [PATCH 2/2] arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema Krzysztof Kozlowski
2022-11-09 10:46   ` Krzysztof Kozlowski
2022-11-09 10:46 ` [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8916: convert to dtschema Krzysztof Kozlowski
2022-11-09 12:59 ` Rob Herring
  -- strict thread matches above, loose matches on Subject: below --
2022-10-24  0:23 Krzysztof Kozlowski
2022-10-24  0:23 ` [PATCH 2/2] arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema Krzysztof Kozlowski
2022-10-24  8:07   ` Neil Armstrong
2022-11-04 21:20   ` Konrad Dybcio

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).