arm64: dts: qcom: sdm845: align TLMM pin configuration with DT schema

DT schema expects TLMM pin configuration nodes to be named with
'-state' suffix and their optional children with '-pins' suffix.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221222151319.122398-3-krzysztof.kozlowski@linaro.org

arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi

@@ -995,104 +995,69 @@ &wifi {
 /* PINCTRL - additions to nodes defined in sdm845.dtsi */
 
 &qspi_cs0 {
-	pinconf {
-		pins = "gpio90";
 	bias-disable;
-	};
 };
 
 &qspi_clk {
-	pinconf {
-		pins = "gpio95";
 	bias-disable;
-	};
 };
 
 &qspi_data01 {
-	pinconf {
-		pins = "gpio91", "gpio92";
-
 	/* High-Z when no transfers; nice to park the lines */
 	bias-pull-up;
-	};
 };
 
 &qup_i2c3_default {
-	pinconf {
-		pins = "gpio41", "gpio42";
 	drive-strength = <2>;
 
 	/* Has external pullup */
 	bias-disable;
-	};
 };
 
 &qup_i2c11_default {
-	pinconf {
-		pins = "gpio31", "gpio32";
 	drive-strength = <2>;
 
 	/* Has external pullup */
 	bias-disable;
-	};
 };
 
 &qup_i2c12_default {
-	pinconf {
-		pins = "gpio49", "gpio50";
 	drive-strength = <2>;
 
 	/* Has external pullup */
 	bias-disable;
-	};
 };
 
 &qup_i2c14_default {
-	pinconf {
-		pins = "gpio33", "gpio34";
 	drive-strength = <2>;
 
 	/* Has external pullup */
 	bias-disable;
-	};
 };
 
 &qup_spi0_default {
-	pinconf {
-		pins = "gpio0", "gpio1", "gpio2", "gpio3";
 	drive-strength = <2>;
 	bias-disable;
-	};
 };
 
 &qup_spi5_default {
-	pinconf {
-		pins = "gpio85", "gpio86", "gpio87", "gpio88";
 	drive-strength = <2>;
 	bias-disable;
-	};
 };
 
 &qup_spi10_default {
-	pinconf {
-		pins = "gpio53", "gpio54", "gpio55", "gpio56";
 	drive-strength = <2>;
 	bias-disable;
-	};
 };
 
-&qup_uart9_default {
-	pinconf-tx {
-		pins = "gpio4";
+&qup_uart9_rx {
 	drive-strength = <2>;
-		bias-disable;
-	};
+	bias-pull-up;
+};
 
-	pinconf-rx {
-		pins = "gpio5";
+&qup_uart9_tx {
 	drive-strength = <2>;
-		bias-pull-up;
-	};
+	bias-disable;
 };
 
 /* PINCTRL - board-specific pinctrl */
@@ -1180,141 +1145,80 @@ ap-suspend-l-hog {
 		output-low;
 	};
 
-	ap_edp_bklten: ap-edp-bklten {
-		pinmux {
+	ap_edp_bklten: ap-edp-bklten-state {
 		pins = "gpio37";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio37";
 		drive-strength = <2>;
 		bias-disable;
 	};
-	};
 
-	bios_flash_wp_r_l: bios-flash-wp-r-l {
-		pinmux {
+	bios_flash_wp_r_l: bios-flash-wp-r-l-state {
 		pins = "gpio128";
 		function = "gpio";
 		input-enable;
-		};
-
-		pinconf {
-			pins = "gpio128";
 		bias-disable;
 	};
-	};
 
-	ec_ap_int_l: ec-ap-int-l {
-		pinmux {
+	ec_ap_int_l: ec-ap-int-l-state {
 	       pins = "gpio122";
 	       function = "gpio";
 	       input-enable;
-		};
-
-		pinconf {
-		       pins = "gpio122";
 	       bias-pull-up;
 	};
-	};
 
-	edp_brij_en: edp-brij-en {
-		pinmux {
+	edp_brij_en: edp-brij-en-state {
 		pins = "gpio102";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio102";
 		drive-strength = <2>;
 		bias-disable;
 	};
-	};
 
-	edp_brij_irq: edp-brij-irq {
-		pinmux {
+	edp_brij_irq: edp-brij-irq-state {
 		pins = "gpio10";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio10";
 		drive-strength = <2>;
 		bias-pull-down;
 	};
-	};
 
-	en_pp3300_dx_edp: en-pp3300-dx-edp {
-		pinmux {
+	en_pp3300_dx_edp: en-pp3300-dx-edp-state {
 		pins = "gpio43";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio43";
 		drive-strength = <2>;
 		bias-disable;
 	};
-	};
 
-	h1_ap_int_odl: h1-ap-int-odl {
-		pinmux {
+	h1_ap_int_odl: h1-ap-int-odl-state {
 		pins = "gpio129";
 		function = "gpio";
 		input-enable;
-		};
-
-		pinconf {
-			pins = "gpio129";
 		bias-pull-up;
 	};
-	};
 
-	pen_eject_odl: pen-eject-odl {
-		pinmux {
+	pen_eject_odl: pen-eject-odl-state {
 		pins = "gpio119";
 		function = "gpio";
 		bias-pull-up;
 	};
-	};
 
-	pen_irq_l: pen-irq-l {
-		pinmux {
+	pen_irq_l: pen-irq-l-state {
 		pins = "gpio24";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio24";
 
 		/* Has external pullup */
 		bias-disable;
 	};
-	};
 
-	pen_pdct_l: pen-pdct-l {
-		pinmux {
+	pen_pdct_l: pen-pdct-l-state {
 		pins = "gpio63";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio63";
 
 		/* Has external pullup */
 		bias-disable;
 	};
-	};
 
-	pen_rst_l: pen-rst-l {
-		pinmux {
+	pen_rst_l: pen-rst-l-state {
 		pins = "gpio23";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio23";
 		bias-disable;
 		drive-strength = <2>;
 
@@ -1331,10 +1235,8 @@ pinconf {
 		 */
 		output-high;
 	};
-	};
 
-	sdc2_clk: sdc2-clk {
-		pinconf {
+	sdc2_clk: sdc2-clk-state {
 		pins = "sdc2_clk";
 		bias-disable;
 
@@ -1344,80 +1246,53 @@ pinconf {
 		 */
 		drive-strength = <16>;
 	};
-	};
 
-	sdc2_cmd: sdc2-cmd {
-		pinconf {
+	sdc2_cmd: sdc2-cmd-state {
 		pins = "sdc2_cmd";
 		bias-pull-up;
 		drive-strength = <16>;
 	};
-	};
 
-	sdc2_data: sdc2-data {
-		pinconf {
+	sdc2_data: sdc2-data-state {
 		pins = "sdc2_data";
 		bias-pull-up;
 		drive-strength = <16>;
 	};
-	};
 
-	sd_cd_odl: sd-cd-odl {
-		pinmux {
+	sd_cd_odl: sd-cd-odl-state {
 		pins = "gpio44";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio44";
 		bias-pull-up;
 	};
-	};
 
-	ts_int_l: ts-int-l {
-		pinmux {
+	ts_int_l: ts-int-l-state {
 		pins = "gpio125";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio125";
 		bias-pull-up;
 	};
-	};
 
-	ts_reset_l: ts-reset-l {
-		pinmux {
+	ts_reset_l: ts-reset-l-state {
 		pins = "gpio118";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio118";
 		bias-disable;
 		drive-strength = <2>;
 	};
-	};
 
-	ap_suspend_l_assert: ap_suspend_l_assert {
-		config {
+	ap_suspend_l_assert: ap-suspend-l-assert-state {
 		pins = "gpio126";
 		function = "gpio";
 		bias-disable;
 		drive-strength = <2>;
 		output-low;
 	};
-	};
 
-	ap_suspend_l_deassert: ap_suspend_l_deassert {
-		config {
+	ap_suspend_l_deassert: ap-suspend-l-deassert-state {
 		pins = "gpio126";
 		function = "gpio";
 		bias-disable;
 		drive-strength = <2>;
 		output-high;
 	};
-	};
 };
 
 &venus {

arch/arm64/boot/dts/qcom/sdm845-db845c.dts

@@ -825,8 +825,8 @@ &spi2 {
 };
 
 &tlmm {
-	cam0_default: cam0_default {
-		rst {
+	cam0_default: cam0-default-state {
+		rst-pins {
 			pins = "gpio9";
 			function = "gpio";
 
@@ -834,7 +834,7 @@ rst {
 			bias-disable;
 		};
 
-		mclk0 {
+		mclk0-pins {
 			pins = "gpio13";
 			function = "cam_mclk";
 
@@ -843,8 +843,8 @@ mclk0 {
 		};
 	};
 
-	cam3_default: cam3_default {
-		rst {
+	cam3_default: cam3-default-state {
+		rst-pins {
 			function = "gpio";
 			pins = "gpio21";
 
@@ -852,7 +852,7 @@ rst {
 			bias-disable;
 		};
 
-		mclk3 {
+		mclk3-pins {
 			function = "cam_mclk";
 			pins = "gpio16";
 
@@ -861,7 +861,7 @@ mclk3 {
 		};
 	};
 
-	dsi_sw_sel: dsi-sw-sel {
+	dsi_sw_sel: dsi-sw-sel-state {
 		pins = "gpio120";
 		function = "gpio";
 
@@ -870,20 +870,20 @@ dsi_sw_sel: dsi-sw-sel {
 		output-high;
 	};
 
-	lt9611_irq_pin: lt9611-irq {
+	lt9611_irq_pin: lt9611-irq-state {
 		pins = "gpio84";
 		function = "gpio";
 		bias-disable;
 	};
 
-	pcie0_default_state: pcie0-default {
-		clkreq {
+	pcie0_default_state: pcie0-default-state {
+		clkreq-pins {
 			pins = "gpio36";
 			function = "pci_e0";
 			bias-pull-up;
 		};
 
-		reset-n {
+		reset-n-pins {
 			pins = "gpio35";
 			function = "gpio";
 
@@ -892,7 +892,7 @@ reset-n {
 			bias-pull-down;
 		};
 
-		wake-n {
+		wake-n-pins {
 			pins = "gpio37";
 			function = "gpio";
 
@@ -901,7 +901,7 @@ wake-n {
 		};
 	};
 
-	pcie0_pwren_state: pcie0-pwren {
+	pcie0_pwren_state: pcie0-pwren-state {
 		pins = "gpio90";
 		function = "gpio";
 
@@ -909,8 +909,8 @@ pcie0_pwren_state: pcie0-pwren {
 		bias-disable;
 	};
 
-	pcie1_default_state: pcie1-default {
-		perst-n {
+	pcie1_default_state: pcie1-default-state {
+		perst-n-pins {
 			pins = "gpio102";
 			function = "gpio";
 
@@ -918,13 +918,13 @@ perst-n {
 			bias-disable;
 		};
 
-		clkreq {
+		clkreq-pins {
 			pins = "gpio103";
 			function = "pci_e1";
 			bias-pull-up;
 		};
 
-		wake-n {
+		wake-n-pins {
 			pins = "gpio11";
 			function = "gpio";
 
@@ -932,7 +932,7 @@ wake-n {
 			bias-pull-up;
 		};
 
-		reset-n {
+		reset-n-pins {
 			pins = "gpio75";
 			function = "gpio";
 
@@ -942,8 +942,8 @@ reset-n {
 		};
 	};
 
-	sdc2_default_state: sdc2-default {
-		clk {
+	sdc2_default_state: sdc2-default-state {
+		clk-pins {
 			pins = "sdc2_clk";
 			bias-disable;
 
@@ -954,26 +954,26 @@ clk {
 			drive-strength = <16>;
 		};
 
-		cmd {
+		cmd-pins {
 			pins = "sdc2_cmd";
 			bias-pull-up;
 			drive-strength = <10>;
 		};
 
-		data {
+		data-pins {
 			pins = "sdc2_data";
 			bias-pull-up;
 			drive-strength = <10>;
 		};
 	};
 
-	sdc2_card_det_n: sd-card-det-n {
+	sdc2_card_det_n: sd-card-det-n-state {
 		pins = "gpio126";
 		function = "gpio";
 		bias-pull-up;
 	};
 
-	wcd_intr_default: wcd_intr_default {
+	wcd_intr_default: wcd-intr-default-state {
 		pins = "gpio54";
 		function = "gpio";
 
@@ -985,6 +985,8 @@ wcd_intr_default: wcd_intr_default {
 
 &uart3 {
 	label = "LS-UART0";
+	pinctrl-0 = <&qup_uart3_4pin>;
+
 	status = "disabled";
 };
 
@@ -1130,39 +1132,22 @@ &wifi {
 
 /* PINCTRL - additions to nodes defined in sdm845.dtsi */
 &qup_spi2_default {
-	pinconf {
-		pins = "gpio27", "gpio28", "gpio29", "gpio30";
 	drive-strength = <16>;
-	};
-};
-
-&qup_uart3_default {
-	pinmux {
-		pins = "gpio41", "gpio42", "gpio43", "gpio44";
-		function = "qup3";
-	};
 };
 
 &qup_i2c10_default {
-	pinconf {
-		pins = "gpio55", "gpio56";
 	drive-strength = <2>;
 	bias-disable;
-	};
 };
 
-&qup_uart9_default {
-	pinconf-tx {
-		pins = "gpio4";
+&qup_uart9_rx {
 	drive-strength = <2>;
-		bias-disable;
-	};
+	bias-pull-up;
+};
 
-	pinconf-rx {
-		pins = "gpio5";
+&qup_uart9_tx {
 	drive-strength = <2>;
-		bias-pull-up;
-	};
+	bias-disable;
 };
 
 &pm8998_gpios {
@@ -1171,8 +1156,6 @@ &pm8998_gpios {
 
 /* PINCTRL - additions to nodes defined in sdm845.dtsi */
 &qup_spi0_default {
-	config {
 	drive-strength = <6>;
 	bias-disable;
-	};
 };

arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi

@@ -553,8 +553,7 @@ &usb_1_qmpphy {
 &tlmm {
 	gpio-reserved-ranges = <28 4>, <81 4>;
 
-	sdc2_clk: sdc2-clk {
-		pinconf {
+	sdc2_clk: sdc2-clk-state {
 		pins = "sdc2_clk";
 		bias-disable;
 
@@ -567,35 +566,24 @@ pinconf {
 		 */
 		drive-strength = <16>;
 	};
-	};
 
-	sdc2_cmd: sdc2-cmd {
-		pinconf {
+	sdc2_cmd: sdc2-cmd-state {
 		pins = "sdc2_cmd";
 		bias-pull-up;
 		drive-strength = <16>;
 	};
-	};
 
-	sdc2_data: sdc2-data {
-		pinconf {
+	sdc2_data: sdc2-data-state {
 		pins = "sdc2_data";
 		bias-pull-up;
 		drive-strength = <16>;
 	};
-	};
 
-	sd_card_det_n: sd-card-det-n {
-		pinmux {
+	sd_card_det_n: sd-card-det-n-state {
 		pins = "gpio126";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio126";
 		bias-pull-up;
 	};
-	};
 };
 
 &pm8998_gpios {

arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts

@@ -58,7 +58,7 @@ &mss_pil {
 };
 
 &tlmm {
-	thinq_key_default: thinq-key-default {
+	thinq_key_default: thinq-key-default-state {
 		pins = "gpio89";
 		function = "gpio";
 

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

@@ -719,32 +719,24 @@ &wifi {
 /* PINCTRL - additions to nodes defined in sdm845.dtsi */
 
 &qup_i2c10_default {
-	pinconf {
-		pins = "gpio55", "gpio56";
 	drive-strength = <2>;
 	bias-disable;
-	};
 };
 
-&qup_uart9_default {
-	pinconf-tx {
-		pins = "gpio4";
+&qup_uart9_rx {
 	drive-strength = <2>;
-		bias-disable;
-	};
+	bias-pull-up;
+};
 
-	pinconf-rx {
-		pins = "gpio5";
+&qup_uart9_tx {
 	drive-strength = <2>;
-		bias-pull-up;
-	};
+	bias-disable;
 };
 
 &tlmm {
 	gpio-reserved-ranges = <0 4>, <81 4>;
 
-	sdc2_clk: sdc2-clk {
-		pinconf {
+	sdc2_clk: sdc2-clk-state {
 		pins = "sdc2_clk";
 		bias-disable;
 
@@ -754,33 +746,22 @@ pinconf {
 		 */
 		drive-strength = <16>;
 	};
-	};
 
-	sdc2_cmd: sdc2-cmd {
-		pinconf {
+	sdc2_cmd: sdc2-cmd-state {
 		pins = "sdc2_cmd";
 		bias-pull-up;
 		drive-strength = <16>;
 	};
-	};
 
-	sdc2_data: sdc2-data {
-		pinconf {
+	sdc2_data: sdc2-data-state {
 		pins = "sdc2_data";
 		bias-pull-up;
 		drive-strength = <16>;
 	};
-	};
 
-	sd_card_det_n: sd-card-det-n {
-		pinmux {
+	sd_card_det_n: sd-card-det-n-state {
 		pins = "gpio126";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio126";
 		bias-pull-up;
 	};
-	};
 };

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

@@ -474,35 +474,24 @@ &qupv3_id_0 {
 	status = "okay";
 };
 
-&qup_i2c12_default {
-	mux {
-		pins = "gpio49", "gpio50";
-		function = "qup12";
+&qup_i2c10_default {
 	drive-strength = <2>;
 	bias-disable;
-	};
 };
 
-&qup_i2c10_default {
-	pinconf {
-		pins = "gpio55", "gpio56";
+&qup_i2c12_default {
 	drive-strength = <2>;
 	bias-disable;
-	};
 };
 
-&qup_uart9_default {
-	pinconf-tx {
-		pins = "gpio4";
+&qup_uart9_rx {
 	drive-strength = <2>;
-		bias-disable;
-	};
+	bias-pull-up;
+};
 
-	pinconf-rx {
-		pins = "gpio5";
+&qup_uart9_tx {
 	drive-strength = <2>;
-		bias-pull-up;
-	};
+	bias-disable;
 };
 
 &uart6 {
@@ -588,52 +577,42 @@ &usb_1_hsphy {
 &tlmm {
 	gpio-reserved-ranges = <0 4>, <81 4>;
 
-	tri_state_key_default: tri_state_key_default {
-		mux {
+	tri_state_key_default: tri-state-key-default-state {
 		pins = "gpio40", "gpio42", "gpio26";
 		function = "gpio";
 		drive-strength = <2>;
 		bias-disable;
 	};
-	};
 
-	ts_default_pins: ts-int {
-		mux {
+	ts_default_pins: ts-int-state {
 		pins = "gpio99", "gpio125";
 		function = "gpio";
 		drive-strength = <16>;
 		bias-pull-up;
 	};
-	};
 
-	panel_reset_pins: panel-reset {
-		mux {
+	panel_reset_pins: panel-reset-state {
 		pins = "gpio6", "gpio25", "gpio26";
 		function = "gpio";
 		drive-strength = <8>;
 		bias-disable;
 	};
-	};
 
-	panel_te_pin: panel-te {
-		mux {
+	panel_te_pin: panel-te-state {
 		pins = "gpio10";
 		function = "mdp_vsync";
 		drive-strength = <2>;
 		bias-disable;
 		input-enable;
 	};
-	};
 
-	panel_esd_pin: panel-esd {
-		mux {
+	panel_esd_pin: panel-esd-state {
 		pins = "gpio30";
 		function = "gpio";
 		drive-strength = <2>;
 		bias-pull-down;
 		input-enable;
 	};
-	};
 };
 
 &venus {

arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts

@@ -554,18 +554,14 @@ led@5 {
 	};
 };
 
-&qup_uart9_default {
-	pinconf-rx {
-		pins = "gpio5";
+&qup_uart9_rx {
 	drive-strength = <2>;
 	bias-pull-up;
-	};
+};
 
-	pinconf-tx {
-		pins = "gpio4";
+&qup_uart9_tx {
 	drive-strength = <2>;
 	bias-disable;
-	};
 };
 
 &qupv3_id_0 {
@@ -579,111 +575,63 @@ &qupv3_id_1 {
 &tlmm {
 	gpio-reserved-ranges = <0 4>, <81 4>;
 
-	sde_dsi_active: sde-dsi-active {
-		mux {
+	sde_dsi_active: sde-dsi-active-state {
 		pins = "gpio6", "gpio11";
 		function = "gpio";
-		};
-
-		config {
-			pins = "gpio6", "gpio11";
 		drive-strength = <8>;
 		bias-disable;
 	};
-	};
 
-	sde_dsi_suspend: sde-dsi-suspend {
-		mux {
+	sde_dsi_suspend: sde-dsi-suspend-state {
 		pins = "gpio6", "gpio11";
 		function = "gpio";
-		};
-
-		config {
-			pins = "gpio6", "gpio11";
 		drive-strength = <2>;
 		bias-pull-down;
 	};
-	};
 
-	sde_te_active: sde-te-active {
-		mux {
+	sde_te_active: sde-te-active-state {
 		pins = "gpio10";
 		function = "mdp_vsync";
-		};
-
-		config {
-			pins = "gpio10";
 		drive-strength = <2>;
 		bias-pull-down;
 	};
-	};
 
-	sde_te_suspend: sde-te-suspend {
-		mux {
+	sde_te_suspend: sde-te-suspend-state {
 		pins = "gpio10";
 		function = "mdp_vsync";
-		};
-
-		config {
-			pins = "gpio10";
 		drive-strength = <2>;
 		bias-pull-down;
 	};
-	};
 
-	ts_int_active: ts-int-active {
-		mux {
+	ts_int_active: ts-int-active-state {
 		pins = "gpio125";
 		function = "gpio";
-		};
-
-		config {
-			pins = "gpio125";
 		drive-strength = <8>;
 		bias-pull-up;
 		input-enable;
 	};
-	};
 
-	ts_int_suspend: ts-int-suspend {
-		mux {
+	ts_int_suspend: ts-int-suspend-state {
 		pins = "gpio125";
 		function = "gpio";
-		};
-
-		config {
-			pins = "gpio125";
 		drive-strength = <2>;
 		bias-pull-down;
 		input-enable;
 	};
-	};
 
-	ts_reset_active: ts-reset-active {
-		mux {
+	ts_reset_active: ts-reset-active-state {
 		pins = "gpio99";
 		function = "gpio";
-		};
-
-		config {
-			pins = "gpio99";
 		drive-strength = <8>;
 		bias-pull-up;
 	};
-	};
 
-	ts_reset_suspend: ts-reset-suspend {
-		mux {
+	ts_reset_suspend: ts-reset-suspend-state {
 		pins = "gpio99";
 		function = "gpio";
-		};
-
-		config {
-			pins = "gpio99";
 		drive-strength = <2>;
 		bias-pull-down;
 	};
-	};
 };
 
 &uart6 {

arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi

@@ -383,19 +383,19 @@ &tlmm {
 	gpio-reserved-ranges = <0 4>, <81 4>;
 
 	sdc2_default_state: sdc2-default-state {
-		clk {
+		clk-pins {
 			pins = "sdc2_clk";
 			drive-strength = <16>;
 			bias-disable;
 		};
 
-		cmd {
+		cmd-pins {
 			pins = "sdc2_cmd";
 			drive-strength = <10>;
 			bias-pull-up;
 		};
 
-		data {
+		data-pins {
 			pins = "sdc2_data";
 			drive-strength = <10>;
 			bias-pull-up;

arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi

@@ -440,33 +440,33 @@ codec {
 &tlmm {
 	gpio-reserved-ranges = <0 4>, <81 4>;
 
-	sdc2_default_state: sdc2-default {
-		clk {
+	sdc2_default_state: sdc2-default-state {
+		clk-pins {
 			pins = "sdc2_clk";
 			bias-disable;
 			drive-strength = <16>;
 		};
 
-		cmd {
+		cmd-pins {
 			pins = "sdc2_cmd";
 			bias-pull-up;
 			drive-strength = <10>;
 		};
 
-		data {
+		data-pins {
 			pins = "sdc2_data";
 			bias-pull-up;
 			drive-strength = <10>;
 		};
 	};
 
-	sdc2_card_det_n: sd-card-det-n {
+	sdc2_card_det_n: sd-card-det-n-state {
 		pins = "gpio126";
 		function = "gpio";
 		bias-pull-up;
 	};
 
-	wcd_intr_default: wcd_intr_default {
+	wcd_intr_default: wcd-intr-default-state {
 		pins = "gpio54";
 		function = "gpio";
 

arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts

@@ -565,24 +565,21 @@ &qupv3_id_1 {
 };
 
 &qup_i2c14_default {
-	pinconf {
-		pins = "gpio33", "gpio34";
 	drive-strength = <2>;
 	bias-disable;
-	};
 };
 
 &tlmm {
 	gpio-reserved-ranges = <0 4>, <81 4>;
 
-	ts_reset_default: ts-reset-default {
+	ts_reset_default: ts-reset-default-state {
 		pins = "gpio99";
 		function = "gpio";
 		drive-strength = <16>;
 		output-high;
 	};
 
-	ts_int_default: ts-int-default {
+	ts_int_default: ts-int-default-state {
 		pins = "gpio125";
 		function = "gpio";
 		bias-pull-down;
@@ -590,14 +587,14 @@ ts_int_default: ts-int-default {
 		input-enable;
 	};
 
-	ts_reset_sleep: ts-reset-sleep {
+	ts_reset_sleep: ts-reset-sleep-state {
 		pins = "gpio99";
 		function = "gpio";
 		bias-disable;
 		drive-strength = <2>;
 	};
 
-	ts_int_sleep: ts-int-sleep {
+	ts_int_sleep: ts-int-sleep-state {
 		pins = "gpio125";
 		function = "gpio";
 		bias-pull-down;
@@ -605,21 +602,21 @@ ts_int_sleep: ts-int-sleep {
 		input-enable;
 	};
 
-	sde_dsi_active: sde-dsi-active {
+	sde_dsi_active: sde-dsi-active-state {
 		pins = "gpio6", "gpio10";
 		function = "gpio";
 		drive-strength = <8>;
 		bias-disable;
 	};
 
-	sde_dsi_suspend: sde-dsi-suspend {
+	sde_dsi_suspend: sde-dsi-suspend-state {
 		pins = "gpio6", "gpio10";
 		function = "gpio";
 		drive-strength = <2>;
 		bias-pull-down;
 	};
 
-	wcd_intr_default: wcd-intr-default {
+	wcd_intr_default: wcd-intr-default-state {
 		pins = "gpio54";
 		function = "gpio";
 		input-enable;

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

@@ -2709,7 +2709,7 @@ tlmm: pinctrl@3400000 {
 			gpio-ranges = <&tlmm 0 0 151>;
 			wakeup-parent = <&pdc_intc>;
 
-			cci0_default: cci0-default {
+			cci0_default: cci0-default-state {
 				/* SDA, SCL */
 				pins = "gpio17", "gpio18";
 				function = "cci_i2c";
@@ -2718,7 +2718,7 @@ cci0_default: cci0-default {
 				drive-strength = <2>; /* 2 mA */
 			};
 
-			cci0_sleep: cci0-sleep {
+			cci0_sleep: cci0-sleep-state {
 				/* SDA, SCL */
 				pins = "gpio17", "gpio18";
 				function = "cci_i2c";
@@ -2727,7 +2727,7 @@ cci0_sleep: cci0-sleep {
 				bias-pull-down;
 			};
 
-			cci1_default: cci1-default {
+			cci1_default: cci1-default-state {
 				/* SDA, SCL */
 				pins = "gpio19", "gpio20";
 				function = "cci_i2c";
@@ -2736,7 +2736,7 @@ cci1_default: cci1-default {
 				drive-strength = <2>; /* 2 mA */
 			};
 
-			cci1_sleep: cci1-sleep {
+			cci1_sleep: cci1-sleep-state {
 				/* SDA, SCL */
 				pins = "gpio19", "gpio20";
 				function = "cci_i2c";
@@ -2745,558 +2745,499 @@ cci1_sleep: cci1-sleep {
 				bias-pull-down;
 			};
 
-			qspi_clk: qspi-clk {
-				pinmux {
+			qspi_clk: qspi-clk-state {
 				pins = "gpio95";
 				function = "qspi_clk";
 			};
-			};
 
-			qspi_cs0: qspi-cs0 {
-				pinmux {
+			qspi_cs0: qspi-cs0-state {
 				pins = "gpio90";
 				function = "qspi_cs";
 			};
-			};
 
-			qspi_cs1: qspi-cs1 {
-				pinmux {
+			qspi_cs1: qspi-cs1-state {
 				pins = "gpio89";
 				function = "qspi_cs";
 			};
-			};
 
-			qspi_data01: qspi-data01 {
-				pinmux-data {
+			qspi_data01: qspi-data01-state {
 				pins = "gpio91", "gpio92";
 				function = "qspi_data";
 			};
-			};
 
-			qspi_data12: qspi-data12 {
-				pinmux-data {
+			qspi_data12: qspi-data12-state {
 				pins = "gpio93", "gpio94";
 				function = "qspi_data";
 			};
-			};
 
-			qup_i2c0_default: qup-i2c0-default {
-				pinmux {
+			qup_i2c0_default: qup-i2c0-default-state {
 				pins = "gpio0", "gpio1";
 				function = "qup0";
 			};
-			};
 
-			qup_i2c1_default: qup-i2c1-default {
-				pinmux {
+			qup_i2c1_default: qup-i2c1-default-state {
 				pins = "gpio17", "gpio18";
 				function = "qup1";
 			};
-			};
 
-			qup_i2c2_default: qup-i2c2-default {
-				pinmux {
+			qup_i2c2_default: qup-i2c2-default-state {
 				pins = "gpio27", "gpio28";
 				function = "qup2";
 			};
-			};
 
-			qup_i2c3_default: qup-i2c3-default {
-				pinmux {
+			qup_i2c3_default: qup-i2c3-default-state {
 				pins = "gpio41", "gpio42";
 				function = "qup3";
 			};
-			};
 
-			qup_i2c4_default: qup-i2c4-default {
-				pinmux {
+			qup_i2c4_default: qup-i2c4-default-state {
 				pins = "gpio89", "gpio90";
 				function = "qup4";
 			};
-			};
 
-			qup_i2c5_default: qup-i2c5-default {
-				pinmux {
+			qup_i2c5_default: qup-i2c5-default-state {
 				pins = "gpio85", "gpio86";
 				function = "qup5";
 			};
-			};
 
-			qup_i2c6_default: qup-i2c6-default {
-				pinmux {
+			qup_i2c6_default: qup-i2c6-default-state {
 				pins = "gpio45", "gpio46";
 				function = "qup6";
 			};
-			};
 
-			qup_i2c7_default: qup-i2c7-default {
-				pinmux {
+			qup_i2c7_default: qup-i2c7-default-state {
 				pins = "gpio93", "gpio94";
 				function = "qup7";
 			};
-			};
 
-			qup_i2c8_default: qup-i2c8-default {
-				pinmux {
+			qup_i2c8_default: qup-i2c8-default-state {
 				pins = "gpio65", "gpio66";
 				function = "qup8";
 			};
-			};
 
-			qup_i2c9_default: qup-i2c9-default {
-				pinmux {
+			qup_i2c9_default: qup-i2c9-default-state {
 				pins = "gpio6", "gpio7";
 				function = "qup9";
 			};
-			};
 
-			qup_i2c10_default: qup-i2c10-default {
-				pinmux {
+			qup_i2c10_default: qup-i2c10-default-state {
 				pins = "gpio55", "gpio56";
 				function = "qup10";
 			};
-			};
 
-			qup_i2c11_default: qup-i2c11-default {
-				pinmux {
+			qup_i2c11_default: qup-i2c11-default-state {
 				pins = "gpio31", "gpio32";
 				function = "qup11";
 			};
-			};
 
-			qup_i2c12_default: qup-i2c12-default {
-				pinmux {
+			qup_i2c12_default: qup-i2c12-default-state {
 				pins = "gpio49", "gpio50";
 				function = "qup12";
 			};
-			};
 
-			qup_i2c13_default: qup-i2c13-default {
-				pinmux {
+			qup_i2c13_default: qup-i2c13-default-state {
 				pins = "gpio105", "gpio106";
 				function = "qup13";
 			};
-			};
 
-			qup_i2c14_default: qup-i2c14-default {
-				pinmux {
+			qup_i2c14_default: qup-i2c14-default-state {
 				pins = "gpio33", "gpio34";
 				function = "qup14";
 			};
-			};
 
-			qup_i2c15_default: qup-i2c15-default {
-				pinmux {
+			qup_i2c15_default: qup-i2c15-default-state {
 				pins = "gpio81", "gpio82";
 				function = "qup15";
 			};
-			};
 
-			qup_spi0_default: qup-spi0-default {
-				pinmux {
-					pins = "gpio0", "gpio1",
-					       "gpio2", "gpio3";
+			qup_spi0_default: qup-spi0-default-state {
+				pins = "gpio0", "gpio1", "gpio2", "gpio3";
 				function = "qup0";
-				};
-
-				config {
-					pins = "gpio0", "gpio1",
-					       "gpio2", "gpio3";
 				drive-strength = <6>;
 				bias-disable;
 			};
-			};
 
-			qup_spi1_default: qup-spi1-default {
-				pinmux {
-					pins = "gpio17", "gpio18",
-					       "gpio19", "gpio20";
+			qup_spi1_default: qup-spi1-default-state {
+				pins = "gpio17", "gpio18", "gpio19", "gpio20";
 				function = "qup1";
 			};
-			};
 
-			qup_spi2_default: qup-spi2-default {
-				pinmux {
-					pins = "gpio27", "gpio28",
-					       "gpio29", "gpio30";
+			qup_spi2_default: qup-spi2-default-state {
+				pins = "gpio27", "gpio28", "gpio29", "gpio30";
 				function = "qup2";
 			};
-			};
 
-			qup_spi3_default: qup-spi3-default {
-				pinmux {
-					pins = "gpio41", "gpio42",
-					       "gpio43", "gpio44";
+			qup_spi3_default: qup-spi3-default-state {
+				pins = "gpio41", "gpio42", "gpio43", "gpio44";
 				function = "qup3";
 			};
-			};
 
-			qup_spi4_default: qup-spi4-default {
-				pinmux {
-					pins = "gpio89", "gpio90",
-					       "gpio91", "gpio92";
+			qup_spi4_default: qup-spi4-default-state {
+				pins = "gpio89", "gpio90", "gpio91", "gpio92";
 				function = "qup4";
 			};
-			};
 
-			qup_spi5_default: qup-spi5-default {
-				pinmux {
-					pins = "gpio85", "gpio86",
-					       "gpio87", "gpio88";
+			qup_spi5_default: qup-spi5-default-state {
+				pins = "gpio85", "gpio86", "gpio87", "gpio88";
 				function = "qup5";
 			};
-			};
 
-			qup_spi6_default: qup-spi6-default {
-				pinmux {
-					pins = "gpio45", "gpio46",
-					       "gpio47", "gpio48";
+			qup_spi6_default: qup-spi6-default-state {
+				pins = "gpio45", "gpio46", "gpio47", "gpio48";
 				function = "qup6";
 			};
-			};
 
-			qup_spi7_default: qup-spi7-default {
-				pinmux {
-					pins = "gpio93", "gpio94",
-					       "gpio95", "gpio96";
+			qup_spi7_default: qup-spi7-default-state {
+				pins = "gpio93", "gpio94", "gpio95", "gpio96";
 				function = "qup7";
 			};
-			};
 
-			qup_spi8_default: qup-spi8-default {
-				pinmux {
-					pins = "gpio65", "gpio66",
-					       "gpio67", "gpio68";
+			qup_spi8_default: qup-spi8-default-state {
+				pins = "gpio65", "gpio66", "gpio67", "gpio68";
 				function = "qup8";
 			};
-			};
 
-			qup_spi9_default: qup-spi9-default {
-				pinmux {
-					pins = "gpio6", "gpio7",
-					       "gpio4", "gpio5";
+			qup_spi9_default: qup-spi9-default-state {
+				pins = "gpio6", "gpio7", "gpio4", "gpio5";
 				function = "qup9";
 			};
-			};
 
-			qup_spi10_default: qup-spi10-default {
-				pinmux {
-					pins = "gpio55", "gpio56",
-					       "gpio53", "gpio54";
+			qup_spi10_default: qup-spi10-default-state {
+				pins = "gpio55", "gpio56", "gpio53", "gpio54";
 				function = "qup10";
 			};
-			};
 
-			qup_spi11_default: qup-spi11-default {
-				pinmux {
-					pins = "gpio31", "gpio32",
-					       "gpio33", "gpio34";
+			qup_spi11_default: qup-spi11-default-state {
+				pins = "gpio31", "gpio32", "gpio33", "gpio34";
 				function = "qup11";
 			};
-			};
 
-			qup_spi12_default: qup-spi12-default {
-				pinmux {
-					pins = "gpio49", "gpio50",
-					       "gpio51", "gpio52";
+			qup_spi12_default: qup-spi12-default-state {
+				pins = "gpio49", "gpio50", "gpio51", "gpio52";
 				function = "qup12";
 			};
-			};
 
-			qup_spi13_default: qup-spi13-default {
-				pinmux {
-					pins = "gpio105", "gpio106",
-					       "gpio107", "gpio108";
+			qup_spi13_default: qup-spi13-default-state {
+				pins = "gpio105", "gpio106", "gpio107", "gpio108";
 				function = "qup13";
 			};
-			};
 
-			qup_spi14_default: qup-spi14-default {
-				pinmux {
-					pins = "gpio33", "gpio34",
-					       "gpio31", "gpio32";
+			qup_spi14_default: qup-spi14-default-state {
+				pins = "gpio33", "gpio34", "gpio31", "gpio32";
 				function = "qup14";
 			};
-			};
 
-			qup_spi15_default: qup-spi15-default {
-				pinmux {
-					pins = "gpio81", "gpio82",
-					       "gpio83", "gpio84";
+			qup_spi15_default: qup-spi15-default-state {
+				pins = "gpio81", "gpio82", "gpio83", "gpio84";
 				function = "qup15";
 			};
+
+			qup_uart0_default: qup-uart0-default-state {
+				qup_uart0_tx: tx-pins {
+					pins = "gpio2";
+					function = "qup0";
 				};
 
-			qup_uart0_default: qup-uart0-default {
-				pinmux {
-					pins = "gpio2", "gpio3";
+				qup_uart0_rx: rx-pins {
+					pins = "gpio3";
 					function = "qup0";
 				};
 			};
 
-			qup_uart1_default: qup-uart1-default {
-				pinmux {
-					pins = "gpio19", "gpio20";
+			qup_uart1_default: qup-uart1-default-state {
+				qup_uart1_tx: tx-pins {
+					pins = "gpio19";
 					function = "qup1";
 				};
+
+				qup_uart1_rx: rx-pins {
+					pins = "gpio20";
+					function = "qup1";
+				};
+			};
+
+			qup_uart2_default: qup-uart2-default-state {
+				qup_uart2_tx: tx-pins {
+					pins = "gpio29";
+					function = "qup2";
 				};
 
-			qup_uart2_default: qup-uart2-default {
-				pinmux {
-					pins = "gpio29", "gpio30";
+				qup_uart2_rx: rx-pins {
+					pins = "gpio30";
 					function = "qup2";
 				};
 			};
 
-			qup_uart3_default: qup-uart3-default {
-				pinmux {
-					pins = "gpio43", "gpio44";
+			qup_uart3_default: qup-uart3-default-state {
+				qup_uart3_tx: tx-pins {
+					pins = "gpio43";
+					function = "qup3";
+				};
+
+				qup_uart3_rx: rx-pins {
+					pins = "gpio44";
 					function = "qup3";
 				};
 			};
 
-			qup_uart4_default: qup-uart4-default {
-				pinmux {
-					pins = "gpio91", "gpio92";
+			qup_uart3_4pin: qup-uart3-4pin-state {
+				qup_uart3_4pin_cts: cts-pins {
+					pins = "gpio41";
+					function = "qup3";
+				};
+
+				qup_uart3_4pin_rts_tx: rts-tx-pins {
+					pins = "gpio42", "gpio43";
+					function = "qup3";
+				};
+
+				qup_uart3_4pin_rx: rx-pins {
+					pins = "gpio44";
+					function = "qup3";
+				};
+			};
+
+			qup_uart4_default: qup-uart4-default-state {
+				qup_uart4_tx: tx-pins {
+					pins = "gpio91";
+					function = "qup4";
+				};
+
+				qup_uart4_rx: rx-pins {
+					pins = "gpio92";
 					function = "qup4";
 				};
 			};
 
-			qup_uart5_default: qup-uart5-default {
-				pinmux {
-					pins = "gpio87", "gpio88";
+			qup_uart5_default: qup-uart5-default-state {
+				qup_uart5_tx: tx-pins {
+					pins = "gpio87";
+					function = "qup5";
+				};
+
+				qup_uart5_rx: rx-pins {
+					pins = "gpio88";
 					function = "qup5";
 				};
 			};
 
-			qup_uart6_default: qup-uart6-default {
-				pinmux {
-					pins = "gpio47", "gpio48";
+			qup_uart6_default: qup-uart6-default-state {
+				qup_uart6_tx: tx-pins {
+					pins = "gpio47";
+					function = "qup6";
+				};
+
+				qup_uart6_rx: rx-pins {
+					pins = "gpio48";
 					function = "qup6";
 				};
 			};
 
 			qup_uart6_4pin: qup-uart6-4pin-state {
-
-				cts-pins {
+				qup_uart6_4pin_cts: cts-pins {
 					pins = "gpio45";
 					function = "qup6";
 					bias-pull-down;
 				};
 
-				rts-tx-pins {
+				qup_uart6_4pin_rts_tx: rts-tx-pins {
 					pins = "gpio46", "gpio47";
 					function = "qup6";
 					drive-strength = <2>;
 					bias-disable;
 				};
 
-				rx-pins {
+				qup_uart6_4pin_rx: rx-pins {
 					pins = "gpio48";
 					function = "qup6";
 					bias-pull-up;
 				};
 			};
 
-			qup_uart7_default: qup-uart7-default {
-				pinmux {
-					pins = "gpio95", "gpio96";
+			qup_uart7_default: qup-uart7-default-state {
+				qup_uart7_tx: tx-pins {
+					pins = "gpio95";
+					function = "qup7";
+				};
+
+				qup_uart7_rx: rx-pins {
+					pins = "gpio96";
 					function = "qup7";
 				};
 			};
 
-			qup_uart8_default: qup-uart8-default {
-				pinmux {
-					pins = "gpio67", "gpio68";
+			qup_uart8_default: qup-uart8-default-state {
+				qup_uart8_tx: tx-pins {
+					pins = "gpio67";
 					function = "qup8";
 				};
+
+				qup_uart8_rx: rx-pins {
+					pins = "gpio68";
+					function = "qup8";
+				};
+			};
+
+			qup_uart9_default: qup-uart9-default-state {
+				qup_uart9_tx: tx-pins {
+					pins = "gpio4";
+					function = "qup9";
 				};
 
-			qup_uart9_default: qup-uart9-default {
-				pinmux {
-					pins = "gpio4", "gpio5";
+				qup_uart9_rx: rx-pins {
+					pins = "gpio5";
 					function = "qup9";
 				};
 			};
 
-			qup_uart10_default: qup-uart10-default {
-				pinmux {
-					pins = "gpio53", "gpio54";
+			qup_uart10_default: qup-uart10-default-state {
+				qup_uart10_tx: tx-pins {
+					pins = "gpio53";
+					function = "qup10";
+				};
+
+				qup_uart10_rx: rx-pins {
+					pins = "gpio54";
 					function = "qup10";
 				};
 			};
 
-			qup_uart11_default: qup-uart11-default {
-				pinmux {
-					pins = "gpio33", "gpio34";
+			qup_uart11_default: qup-uart11-default-state {
+				qup_uart11_tx: tx-pins {
+					pins = "gpio33";
+					function = "qup11";
+				};
+
+				qup_uart11_rx: rx-pins {
+					pins = "gpio34";
 					function = "qup11";
 				};
 			};
 
-			qup_uart12_default: qup-uart12-default {
-				pinmux {
-					pins = "gpio51", "gpio52";
-					function = "qup12";
+			qup_uart12_default: qup-uart12-default-state {
+				qup_uart12_tx: tx-pins {
+					pins = "gpio51";
+					function = "qup0";
+				};
+
+				qup_uart12_rx: rx-pins {
+					pins = "gpio52";
+					function = "qup0";
 				};
 			};
 
-			qup_uart13_default: qup-uart13-default {
-				pinmux {
-					pins = "gpio107", "gpio108";
+			qup_uart13_default: qup-uart13-default-state {
+				qup_uart13_tx: tx-pins {
+					pins = "gpio107";
+					function = "qup13";
+				};
+
+				qup_uart13_rx: rx-pins {
+					pins = "gpio108";
 					function = "qup13";
 				};
 			};
 
-			qup_uart14_default: qup-uart14-default {
-				pinmux {
-					pins = "gpio31", "gpio32";
+			qup_uart14_default: qup-uart14-default-state {
+				qup_uart14_tx: tx-pins {
+					pins = "gpio31";
+					function = "qup14";
+				};
+
+				qup_uart14_rx: rx-pins {
+					pins = "gpio32";
 					function = "qup14";
 				};
 			};
 
-			qup_uart15_default: qup-uart15-default {
-				pinmux {
-					pins = "gpio83", "gpio84";
+			qup_uart15_default: qup-uart15-default-state {
+				qup_uart15_tx: tx-pins {
+					pins = "gpio83";
 					function = "qup15";
 				};
-			};
 
-			quat_mi2s_sleep: quat_mi2s_sleep {
-				mux {
-					pins = "gpio58", "gpio59";
-					function = "gpio";
+				qup_uart15_rx: rx-pins {
+					pins = "gpio84";
+					function = "qup15";
+				};
 			};
 
-				config {
+			quat_mi2s_sleep: quat-mi2s-sleep-state {
 				pins = "gpio58", "gpio59";
+				function = "gpio";
 				drive-strength = <2>;
 				bias-pull-down;
 				input-enable;
 			};
-			};
 
-			quat_mi2s_active: quat_mi2s_active {
-				mux {
+			quat_mi2s_active: quat-mi2s-active-state {
 				pins = "gpio58", "gpio59";
 				function = "qua_mi2s";
-				};
-
-				config {
-					pins = "gpio58", "gpio59";
 				drive-strength = <8>;
 				bias-disable;
 				output-high;
 			};
-			};
 
-			quat_mi2s_sd0_sleep: quat_mi2s_sd0_sleep {
-				mux {
+			quat_mi2s_sd0_sleep: quat-mi2s-sd0-sleep-state {
 				pins = "gpio60";
 				function = "gpio";
-				};
-
-				config {
-					pins = "gpio60";
 				drive-strength = <2>;
 				bias-pull-down;
 				input-enable;
 			};
-			};
 
-			quat_mi2s_sd0_active: quat_mi2s_sd0_active {
-				mux {
+			quat_mi2s_sd0_active: quat-mi2s-sd0-active-state {
 				pins = "gpio60";
 				function = "qua_mi2s";
-				};
-
-				config {
-					pins = "gpio60";
 				drive-strength = <8>;
 				bias-disable;
 			};
-			};
 
-			quat_mi2s_sd1_sleep: quat_mi2s_sd1_sleep {
-				mux {
+			quat_mi2s_sd1_sleep: quat-mi2s-sd1-sleep-state {
 				pins = "gpio61";
 				function = "gpio";
-				};
-
-				config {
-					pins = "gpio61";
 				drive-strength = <2>;
 				bias-pull-down;
 				input-enable;
 			};
-			};
 
-			quat_mi2s_sd1_active: quat_mi2s_sd1_active {
-				mux {
+			quat_mi2s_sd1_active: quat-mi2s-sd1-active-state {
 				pins = "gpio61";
 				function = "qua_mi2s";
-				};
-
-				config {
-					pins = "gpio61";
 				drive-strength = <8>;
 				bias-disable;
 			};
-			};
 
-			quat_mi2s_sd2_sleep: quat_mi2s_sd2_sleep {
-				mux {
+			quat_mi2s_sd2_sleep: quat-mi2s-sd2-sleep-state {
 				pins = "gpio62";
 				function = "gpio";
-				};
-
-				config {
-					pins = "gpio62";
 				drive-strength = <2>;
 				bias-pull-down;
 				input-enable;
 			};
-			};
 
-			quat_mi2s_sd2_active: quat_mi2s_sd2_active {
-				mux {
+			quat_mi2s_sd2_active: quat-mi2s-sd2-active-state {
 				pins = "gpio62";
 				function = "qua_mi2s";
-				};
-
-				config {
-					pins = "gpio62";
 				drive-strength = <8>;
 				bias-disable;
 			};
-			};
 
-			quat_mi2s_sd3_sleep: quat_mi2s_sd3_sleep {
-				mux {
+			quat_mi2s_sd3_sleep: quat-mi2s-sd3-sleep-state {
 				pins = "gpio63";
 				function = "gpio";
-				};
-
-				config {
-					pins = "gpio63";
 				drive-strength = <2>;
 				bias-pull-down;
 				input-enable;
 			};
-			};
 
-			quat_mi2s_sd3_active: quat_mi2s_sd3_active {
-				mux {
+			quat_mi2s_sd3_active: quat-mi2s-sd3-active-state {
 				pins = "gpio63";
 				function = "qua_mi2s";
-				};
-
-				config {
-					pins = "gpio63";
 				drive-strength = <8>;
 				bias-disable;
 			};
 		};
-		};
 
 		mss_pil: remoteproc@4080000 {
 			compatible = "qcom,sdm845-mss-pil";

arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts

@@ -479,41 +479,13 @@ &mss_pil {
 };
 
 &qup_i2c10_default {
-	pinconf {
-		pins = "gpio55", "gpio56";
 	drive-strength = <2>;
 	bias-disable;
-	};
 };
 
 &qup_i2c12_default {
-	pinmux {
 	drive-strength = <2>;
 	bias-disable;
-	};
-};
-
-&qup_uart6_default {
-	pinmux {
-		 pins = "gpio45", "gpio46", "gpio47", "gpio48";
-		 function = "qup6";
-	};
-
-	cts {
-		pins = "gpio45";
-		bias-pull-down;
-	};
-
-	rts-tx {
-		pins = "gpio46", "gpio47";
-		drive-strength = <2>;
-		bias-disable;
-	};
-
-	rx {
-		pins = "gpio48";
-		bias-pull-up;
-	};
 };
 
 &qupv3_id_0 {
@@ -621,13 +593,14 @@ codec {
 &tlmm {
 	gpio-reserved-ranges = <0 4>, <81 4>;
 
-	sn65dsi86_pin_active: sn65dsi86-enable {
+	sn65dsi86_pin_active: sn65dsi86-enable-state {
 		pins = "gpio96";
+		function = "gpio";
 		drive-strength = <2>;
 		bias-disable;
 	};
 
-	i2c3_hid_active: i2c2-hid-active {
+	i2c3_hid_active: i2c2-hid-active-state {
 		pins = "gpio37";
 		function = "gpio";
 
@@ -636,7 +609,7 @@ i2c3_hid_active: i2c2-hid-active {
 		drive-strength = <2>;
 	};
 
-	i2c5_hid_active: i2c5-hid-active {
+	i2c5_hid_active: i2c5-hid-active-state {
 		pins = "gpio125";
 		function = "gpio";
 
@@ -645,7 +618,7 @@ i2c5_hid_active: i2c5-hid-active {
 		drive-strength = <2>;
 	};
 
-	i2c11_hid_active: i2c11-hid-active {
+	i2c11_hid_active: i2c11-hid-active-state {
 		pins = "gpio92";
 		function = "gpio";
 
@@ -654,7 +627,7 @@ i2c11_hid_active: i2c11-hid-active {
 		drive-strength = <2>;
 	};
 
-	wcd_intr_default: wcd_intr_default {
+	wcd_intr_default: wcd-intr-default-state {
 		pins = "gpio54";
 		function = "gpio";
 
@@ -663,7 +636,7 @@ wcd_intr_default: wcd_intr_default {
 		drive-strength = <2>;
 	};
 
-	lid_pin_active: lid-pin {
+	lid_pin_active: lid-pin-state {
 		pins = "gpio124";
 		function = "gpio";
 
@@ -671,7 +644,7 @@ lid_pin_active: lid-pin {
 		bias-disable;
 	};
 
-	mode_pin_active: mode-pin {
+	mode_pin_active: mode-pin-state {
 		pins = "gpio95";
 		function = "gpio";
 
@@ -681,6 +654,8 @@ mode_pin_active: mode-pin {
 };
 
 &uart6 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&qup_uart6_4pin>;
 	status = "okay";
 
 	bluetooth {

arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts

@@ -399,49 +399,18 @@ &mss_pil {
 };
 
 &qup_i2c10_default {
-	pinconf {
-		pins = "gpio55", "gpio56";
 	drive-strength = <2>;
 	bias-disable;
-	};
 };
 
 &qup_i2c11_default {
-	pinconf {
-		pins = "gpio31", "gpio32";
 	drive-strength = <2>;
 	bias-disable;
-	};
 };
 
 &qup_i2c12_default {
-	pinmux {
-		drive-strength = <2>;
-		bias-disable;
-	};
-};
-
-&qup_uart6_default {
-	pinmux {
-		 pins = "gpio45", "gpio46", "gpio47", "gpio48";
-		 function = "qup6";
-	};
-
-	cts {
-		pins = "gpio45";
-		bias-pull-down;
-	};
-
-	rts-tx {
-		pins = "gpio46", "gpio47";
 	drive-strength = <2>;
 	bias-disable;
-	};
-
-	rx {
-		pins = "gpio48";
-		bias-pull-up;
-	};
 };
 
 &qupv3_id_0 {
@@ -549,40 +518,23 @@ codec {
 &tlmm {
 	gpio-reserved-ranges = <0 6>, <85 4>;
 
-	pen_irq_l: pen-irq-l {
-		pinmux {
+	pen_irq_l: pen-irq-l-state {
 		pins = "gpio119";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio119";
 		bias-disable;
 	};
-	};
 
-	pen_pdct_l: pen-pdct-l {
-		pinmux {
+	pen_pdct_l: pen-pdct-l-state {
 		pins = "gpio124";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio124";
 		bias-disable;
 		drive-strength = <2>;
 		output-high;
 	};
-	};
 
-	pen_rst_l: pen-rst-l {
-		pinmux {
+	pen_rst_l: pen-rst-l-state {
 		pins = "gpio21";
 		function = "gpio";
-		};
-
-		pinconf {
-			pins = "gpio21";
 		bias-disable;
 		drive-strength = <2>;
 
@@ -599,9 +551,8 @@ pinconf {
 		 */
 		output-high;
 	};
-	};
 
-	wcd_intr_default: wcd_intr_default {
+	wcd_intr_default: wcd-intr-default-state {
 		pins = "gpio54";
 		function = "gpio";
 
@@ -612,6 +563,8 @@ wcd_intr_default: wcd_intr_default {
 };
 
 &uart6 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&qup_uart6_4pin>;
 	status = "okay";
 
 	bluetooth {