diff --git a/qcom/lahaina-pinctrl.dtsi b/qcom/lahaina-pinctrl.dtsi
index 830dfd29efe7..805d1d00be78 100644
--- a/qcom/lahaina-pinctrl.dtsi
+++ b/qcom/lahaina-pinctrl.dtsi
@@ -1,1663 +1,1653 @@
-&soc {
-	tlmm: pinctrl@f000000 {
-		compatible = "qcom,lahaina-pinctrl";
-		reg = <0x0F000000 0x1000000>;
-		interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
-		gpio-controller;
-		#gpio-cells = <2>;
-		interrupt-controller;
-		#interrupt-cells = <2>;
-		wakeup-parent = <&pdc>;
+&tlmm {
+	bt_en_sleep: bt_en_sleep {
+		mux {
+			pins = "gpio65";
+			function = "gpio";
+		};
 
-		bt_en_sleep: bt_en_sleep {
+		config {
+			pins = "gpio65";
+			drive-strength = <2>;
+			output-low;
+			bias-pull-down;
+		};
+	};
+
+	qupv3_se3_2uart_pins: qupv3_se3_2uart_pins {
+		qupv3_se3_2uart_active: qupv3_se3_2uart_active {
 			mux {
-				pins = "gpio65";
+				pins = "gpio18", "gpio19";
+				function = "qup3";
+			};
+
+			config {
+				pins = "gpio18", "gpio19";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se3_2uart_sleep: qupv3_se3_2uart_sleep {
+			mux {
+				pins = "gpio18", "gpio19";
 				function = "gpio";
 			};
 
 			config {
-				pins = "gpio65";
+				pins = "gpio18", "gpio19";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se2_2uart_pins: qupv3_se2_2uart_pins {
+		qupv3_se2_2uart_active: qupv3_se2_2uart_active {
+			mux {
+				pins = "gpio14", "gpio15";
+				function = "qup2";
+			};
+
+			config {
+				pins = "gpio14", "gpio15";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se2_2uart_sleep: qupv3_se2_2uart_sleep {
+			mux {
+				pins = "gpio14", "gpio15";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio14", "gpio15";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	storage_cd: storage_cd {
+		mux {
+			pins = "gpio92";
+			function = "gpio";
+		};
+
+		config {
+			pins = "gpio92";
+			bias-pull-up;           /* pull up */
+			drive-strength = <2>;   /* 2 MA */
+		};
+	};
+
+	sdc2_clk_on: sdc2_clk_on {
+		config {
+			pins = "sdc2_clk";
+			bias-disable;		/* NO pull */
+			drive-strength = <16>;	/* 16 MA */
+		};
+	};
+
+	sdc2_clk_off: sdc2_clk_off {
+		config {
+			pins = "sdc2_clk";
+			bias-disable;		/* NO pull */
+			drive-strength = <2>;	/* 2 MA */
+		};
+	};
+
+	sdc2_cmd_on: sdc2_cmd_on {
+		config {
+			pins = "sdc2_cmd";
+			bias-pull-up;		/* pull up */
+			drive-strength = <16>;	/* 16 MA */
+		};
+	};
+
+	sdc2_cmd_off: sdc2_cmd_off {
+		config {
+			pins = "sdc2_cmd";
+			bias-pull-up;		/* pull up */
+			drive-strength = <2>;	/* 2 MA */
+		};
+	};
+
+	sdc2_data_on: sdc2_data_on {
+		config {
+			pins = "sdc2_data";
+			bias-pull-up;		/* pull up */
+			drive-strength = <16>;	/* 16 MA */
+		};
+	};
+
+	sdc2_data_off: sdc2_data_off {
+		config {
+			pins = "sdc2_data";
+			bias-pull-up;		/* pull up */
+			drive-strength = <2>;	/* 2 MA */
+		};
+	};
+
+	qupv3_se6_2uart_pins: qupv3_se6_2uart_pins {
+		qupv3_se6_default_txrx: qupv3_se6_default_txrx {
+			mux {
+				pins = "gpio30", "gpio31";
+				function = "qup6";
+			};
+
+			config {
+				pins = "gpio30", "gpio31";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se6_2uart_active: qupv3_se6_2uart_active {
+			mux {
+				pins = "gpio30", "gpio31";
+				function = "qup6";
+			};
+
+			config {
+				pins = "gpio30", "gpio31";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se6_2uart_sleep: qupv3_se6_2uart_sleep {
+			mux {
+				pins = "gpio30", "gpio31";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio30", "gpio31";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se18_4uart_pins: qupv3_se18_4uart_pins {
+		qupv3_se18_default_cts:
+			qupv3_se18_default_cts {
+			mux {
+				pins = "gpio68";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio68";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se18_default_rtsrx:
+			qupv3_se18_default_rtsrx {
+			mux {
+				pins = "gpio69", "gpio71";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio69", "gpio71";
 				drive-strength = <2>;
-				output-low;
 				bias-pull-down;
 			};
 		};
 
-		qupv3_se3_2uart_pins: qupv3_se3_2uart_pins {
-			qupv3_se3_2uart_active: qupv3_se3_2uart_active {
-				mux {
-					pins = "gpio18", "gpio19";
-					function = "qup3";
-				};
-
-				config {
-					pins = "gpio18", "gpio19";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se3_2uart_sleep: qupv3_se3_2uart_sleep {
-				mux {
-					pins = "gpio18", "gpio19";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio18", "gpio19";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se2_2uart_pins: qupv3_se2_2uart_pins {
-			qupv3_se2_2uart_active: qupv3_se2_2uart_active {
-				mux {
-					pins = "gpio14", "gpio15";
-					function = "qup2";
-				};
-
-				config {
-					pins = "gpio14", "gpio15";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se2_2uart_sleep: qupv3_se2_2uart_sleep {
-				mux {
-					pins = "gpio14", "gpio15";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio14", "gpio15";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		storage_cd: storage_cd {
+		qupv3_se18_default_tx:
+			qupv3_se18_default_tx {
 			mux {
-				pins = "gpio92";
+				pins = "gpio70";
 				function = "gpio";
 			};
 
 			config {
-				pins = "gpio92";
-				bias-pull-up;           /* pull up */
-				drive-strength = <2>;   /* 2 MA */
-			};
-		};
-
-		sdc2_clk_on: sdc2_clk_on {
-			config {
-				pins = "sdc2_clk";
-				bias-disable;		/* NO pull */
-				drive-strength = <16>;	/* 16 MA */
-			};
-		};
-
-		sdc2_clk_off: sdc2_clk_off {
-			config {
-				pins = "sdc2_clk";
-				bias-disable;		/* NO pull */
-				drive-strength = <2>;	/* 2 MA */
-			};
-		};
-
-		sdc2_cmd_on: sdc2_cmd_on {
-			config {
-				pins = "sdc2_cmd";
-				bias-pull-up;		/* pull up */
-				drive-strength = <16>;	/* 16 MA */
-			};
-		};
-
-		sdc2_cmd_off: sdc2_cmd_off {
-			config {
-				pins = "sdc2_cmd";
-				bias-pull-up;		/* pull up */
-				drive-strength = <2>;	/* 2 MA */
-			};
-		};
-
-		sdc2_data_on: sdc2_data_on {
-			config {
-				pins = "sdc2_data";
-				bias-pull-up;		/* pull up */
-				drive-strength = <16>;	/* 16 MA */
-			};
-		};
-
-		sdc2_data_off: sdc2_data_off {
-			config {
-				pins = "sdc2_data";
-				bias-pull-up;		/* pull up */
-				drive-strength = <2>;	/* 2 MA */
-			};
-		};
-
-		qupv3_se6_2uart_pins: qupv3_se6_2uart_pins {
-			qupv3_se6_default_txrx: qupv3_se6_default_txrx {
-				mux {
-					pins = "gpio30", "gpio31";
-					function = "qup6";
-				};
-
-				config {
-					pins = "gpio30", "gpio31";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se6_2uart_active: qupv3_se6_2uart_active {
-				mux {
-					pins = "gpio30", "gpio31";
-					function = "qup6";
-				};
-
-				config {
-					pins = "gpio30", "gpio31";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se6_2uart_sleep: qupv3_se6_2uart_sleep {
-				mux {
-					pins = "gpio30", "gpio31";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio30", "gpio31";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se18_4uart_pins: qupv3_se18_4uart_pins {
-			qupv3_se18_default_cts:
-				qupv3_se18_default_cts {
-				mux {
-					pins = "gpio68";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio68";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se18_default_rtsrx:
-				qupv3_se18_default_rtsrx {
-				mux {
-					pins = "gpio69", "gpio71";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio69", "gpio71";
-					drive-strength = <2>;
-					bias-pull-down;
-				};
-			};
-
-			qupv3_se18_default_tx:
-				qupv3_se18_default_tx {
-				mux {
-					pins = "gpio70";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio70";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se18_ctsrx: qupv3_se18_ctsrx {
-				mux {
-					pins = "gpio68", "gpio71";
-					function = "qup18";
-				};
-
-				config {
-					pins = "gpio68", "gpio71";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se18_rts: qupv3_se18_rts {
-				mux {
-					pins = "gpio69";
-					function = "qup18";
-				};
-
-				config {
-					pins = "gpio69";
-					drive-strength = <2>;
-					bias-pull-down;
-				};
-			};
-
-			qupv3_se18_tx: qupv3_se18_tx {
-				mux {
-					pins = "gpio70";
-					function = "qup18";
-				};
-
-				config {
-					pins = "gpio70";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-		};
-
-		/* I3C */
-		qupv3_se8_i3c_pins: qupv3_se8_i3c_pins {
-			qupv3_se8_i3c_active: qupv3_se8_i3c_active {
-				mux {
-					pins = "gpio36", "gpio37";
-					function = "ibi_i3c";
-				};
-
-				config {
-					pins = "gpio36", "gpio37";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se8_i3c_sleep: qupv3_se8_i3c_sleep {
-				mux {
-					pins = "gpio36", "gpio37";
-					function = "ibi_i3c";
-				};
-
-				config {
-					pins = "gpio36", "gpio37";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-		};
-
-		qupv3_se9_i3c_pins: qupv3_se9_i3c_pins {
-			qupv3_se9_i3c_active: qupv3_se9_i3c_active {
-				mux {
-					pins = "gpio40", "gpio41";
-					function = "ibi_i3c";
-				};
-
-				config {
-					pins = "gpio40", "gpio41";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se9_i3c_sleep: qupv3_se9_i3c_sleep {
-				mux {
-					pins = "gpio40", "gpio41";
-					function = "ibi_i3c";
-				};
-
-				config {
-					pins = "gpio40", "gpio41";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-		};
-
-		qupv3_se14_i3c_pins: qupv3_se14_i3c_pins {
-			qupv3_se14_i3c_active: qupv3_se14_i3c_active {
-				mux {
-					pins = "gpio56", "gpio57";
-					function = "ibi_i3c";
-				};
-
-				config {
-					pins = "gpio56", "gpio57";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se14_i3c_sleep: qupv3_se14_i3c_sleep {
-				mux {
-					pins = "gpio56", "gpio57";
-					function = "ibi_i3c";
-				};
-
-				config {
-					pins = "gpio56", "gpio57";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-		};
-
-		qupv3_se15_i3c_pins: qupv3_se15_i3c_pins {
-			qupv3_se15_i3c_active: qupv3_se15_i3c_active {
-				mux {
-					pins = "gpio60", "gpio61";
-					function = "ibi_i3c";
-				};
-
-				config {
-					pins = "gpio60", "gpio61";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se15_i3c_sleep: qupv3_se15_i3c_sleep {
-				mux {
-					pins = "gpio60", "gpio61";
-					function = "ibi_i3c";
-				};
-
-				config {
-					pins = "gpio60", "gpio61";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-		};
-
-		/* SPI */
-		qupv3_se0_spi_pins: qupv3_se0_spi_pins {
-			qupv3_se0_spi_active: qupv3_se0_spi_active {
-				mux {
-					pins = "gpio4", "gpio5",
-							"gpio6", "gpio7";
-					function = "qup0";
-				};
-
-				config {
-					pins = "gpio4", "gpio5",
-							"gpio6", "gpio7";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se0_spi_sleep: qupv3_se0_spi_sleep {
-				mux {
-					pins = "gpio4", "gpio5",
-							"gpio6", "gpio7";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio4", "gpio5",
-							"gpio6", "gpio7";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se1_spi_pins: qupv3_se1_spi_pins {
-			qupv3_se1_spi_active: qupv3_se1_spi_active {
-				mux {
-					pins = "gpio8", "gpio9",
-							"gpio10", "gpio11";
-					function = "qup1";
-				};
-
-				config {
-					pins = "gpio8", "gpio9",
-							"gpio10", "gpio11";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se1_spi_sleep: qupv3_se1_spi_sleep {
-				mux {
-					pins = "gpio8", "gpio9",
-							"gpio10", "gpio11";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio8", "gpio9",
-							"gpio10", "gpio11";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se2_spi_pins: qupv3_se2_spi_pins {
-			qupv3_se2_spi_active: qupv3_se2_spi_active {
-				mux {
-					pins = "gpio12", "gpio13",
-							"gpio14", "gpio15";
-					function = "qup2";
-				};
-
-				config {
-					pins = "gpio12", "gpio13",
-							"gpio14", "gpio15";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se2_spi_sleep: qupv3_se2_spi_sleep {
-				mux {
-					pins = "gpio12", "gpio13",
-							"gpio14", "gpio15";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio12", "gpio13",
-							"gpio14", "gpio15";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se4_spi_pins: qupv3_se4_spi_pins {
-			qupv3_se4_spi_active: qupv3_se4_spi_active {
-				mux {
-					pins = "gpio20", "gpio21",
-							"gpio22", "gpio23";
-					function = "qup4";
-				};
-
-				config {
-					pins = "gpio20", "gpio21",
-							"gpio22", "gpio23";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se4_spi_sleep: qupv3_se4_spi_sleep {
-				mux {
-					pins = "gpio20", "gpio21",
-							"gpio22", "gpio23";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio20", "gpio21",
-							"gpio22", "gpio23";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se5_spi_pins: qupv3_se5_spi_pins {
-			qupv3_se5_spi_active: qupv3_se5_spi_active {
-				mux {
-					pins = "gpio24", "gpio25",
-							"gpio26", "gpio27";
-					function = "qup5";
-				};
-
-				config {
-					pins = "gpio24", "gpio25",
-							"gpio26", "gpio27";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se5_spi_sleep: qupv3_se5_spi_sleep {
-				mux {
-					pins = "gpio24", "gpio25",
-							"gpio26", "gpio27";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio24", "gpio25",
-							"gpio26", "gpio27";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se6_spi_pins: qupv3_se6_spi_pins {
-			qupv3_se6_spi_active: qupv3_se6_spi_active {
-				mux {
-					pins = "gpio28", "gpio29",
-							"gpio30", "gpio31";
-					function = "qup6";
-				};
-
-				config {
-					pins = "gpio28", "gpio29",
-							"gpio30", "gpio31";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se6_spi_sleep: qupv3_se6_spi_sleep {
-				mux {
-					pins = "gpio28", "gpio29",
-							"gpio30", "gpio31";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio28", "gpio29",
-							"gpio30", "gpio31";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se7_spi_pins: qupv3_se7_spi_pins {
-			qupv3_se7_spi_active: qupv3_se7_spi_active {
-				mux {
-					pins = "gpio32", "gpio33",
-							"gpio34", "gpio35";
-					function = "qup7";
-				};
-
-				config {
-					pins = "gpio32", "gpio33",
-							"gpio34", "gpio35";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se7_spi_sleep: qupv3_se7_spi_sleep {
-				mux {
-					pins = "gpio32", "gpio33",
-							"gpio34", "gpio35";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio32", "gpio33",
-							"gpio34", "gpio35";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se8_spi_pins: qupv3_se8_spi_pins {
-			qupv3_se8_spi_active: qupv3_se8_spi_active {
-				mux {
-					pins = "gpio36", "gpio37",
-							"gpio38", "gpio39";
-					function = "qup8";
-				};
-
-				config {
-					pins = "gpio36", "gpio37",
-							"gpio38", "gpio39";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se8_spi_sleep: qupv3_se8_spi_sleep {
-				mux {
-					pins = "gpio36", "gpio37",
-							"gpio38", "gpio39";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio36", "gpio37",
-							"gpio38", "gpio39";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se9_spi_pins: qupv3_se9_spi_pins {
-			qupv3_se9_spi_active: qupv3_se9_spi_active {
-				mux {
-					pins = "gpio40", "gpio41",
-							"gpio42", "gpio43";
-					function = "qup9";
-				};
-
-				config {
-					pins = "gpio40", "gpio41",
-							"gpio42", "gpio43";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se9_spi_sleep: qupv3_se9_spi_sleep {
-				mux {
-					pins = "gpio40", "gpio41",
-							"gpio42", "gpio43";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio40", "gpio41",
-							"gpio42", "gpio43";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se10_spi_pins: qupv3_se10_spi_pins {
-			qupv3_se10_spi_active: qupv3_se10_spi_active {
-				mux {
-					pins = "gpio44", "gpio45",
-							"gpio46", "gpio47";
-					function = "qup10";
-				};
-
-				config {
-					pins = "gpio44", "gpio45",
-							"gpio46", "gpio47";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se10_spi_sleep: qupv3_se10_spi_sleep {
-				mux {
-					pins = "gpio44", "gpio45",
-							"gpio46", "gpio47";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio44", "gpio45",
-							"gpio46", "gpio47";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se11_spi_pins: qupv3_se11_spi_pins {
-			qupv3_se11_spi_active: qupv3_se11_spi_active {
-				mux {
-					pins = "gpio48", "gpio49",
-							"gpio50", "gpio51";
-					function = "qup11";
-				};
-
-				config {
-					pins = "gpio48", "gpio49",
-							"gpio50", "gpio51";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se11_spi_sleep: qupv3_se11_spi_sleep {
-				mux {
-					pins = "gpio48", "gpio49",
-							"gpio50", "gpio51";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio48", "gpio49",
-							"gpio50", "gpio51";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se12_spi_pins: qupv3_se12_spi_pins {
-			qupv3_se12_spi_active: qupv3_se12_spi_active {
-				mux {
-					pins = "gpio52", "gpio53",
-							"gpio54", "gpio55";
-					function = "qup12";
-				};
-
-				config {
-					pins = "gpio52", "gpio53",
-							"gpio54", "gpio55";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se12_spi_sleep: qupv3_se12_spi_sleep {
-				mux {
-					pins = "gpio52", "gpio53",
-							"gpio54", "gpio55";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio52", "gpio53",
-							"gpio54", "gpio55";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se13_spi_pins: qupv3_se13_spi_pins {
-			qupv3_se13_spi_active: qupv3_se13_spi_active {
-				mux {
-					pins = "gpio0", "gpio1",
-							"gpio2", "gpio3";
-					function = "qup13";
-				};
-
-				config {
-					pins = "gpio0", "gpio1",
-							"gpio2", "gpio3";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se13_spi_sleep: qupv3_se13_spi_sleep {
-				mux {
-					pins = "gpio0", "gpio1",
-							"gpio2", "gpio3";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio0", "gpio1",
-							"gpio2", "gpio3";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se14_spi_pins: qupv3_se14_spi_pins {
-			qupv3_se14_spi_active: qupv3_se14_spi_active {
-				mux {
-					pins = "gpio56", "gpio57",
-							"gpio58", "gpio59";
-					function = "qup14";
-				};
-
-				config {
-					pins = "gpio56", "gpio57",
-							"gpio58", "gpio59";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se14_spi_sleep: qupv3_se14_spi_sleep {
-				mux {
-					pins = "gpio56", "gpio57",
-							"gpio58", "gpio59";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio56", "gpio57",
-							"gpio58", "gpio59";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se15_spi_pins: qupv3_se15_spi_pins {
-			qupv3_se15_spi_active: qupv3_se15_spi_active {
-				mux {
-					pins = "gpio60", "gpio61",
-							"gpio62", "gpio63";
-					function = "qup15";
-				};
-
-				config {
-					pins = "gpio60", "gpio61",
-							"gpio62", "gpio63";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se15_spi_sleep: qupv3_se15_spi_sleep {
-				mux {
-					pins = "gpio60", "gpio61",
-							"gpio62", "gpio63";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio60", "gpio61",
-							"gpio62", "gpio63";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se16_spi_pins: qupv3_se16_spi_pins {
-			qupv3_se16_spi_active: qupv3_se16_spi_active {
-				mux {
-					pins = "gpio64", "gpio65",
-							"gpio66", "gpio67";
-					function = "qup16";
-				};
-
-				config {
-					pins = "gpio64", "gpio65",
-							"gpio66", "gpio67";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se16_spi_sleep: qupv3_se16_spi_sleep {
-				mux {
-					pins = "gpio64", "gpio65",
-							"gpio66", "gpio67";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio64", "gpio65",
-							"gpio66", "gpio67";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se17_spi_pins: qupv3_se17_spi_pins {
-			qupv3_se17_spi_active: qupv3_se17_spi_active {
-				mux {
-					pins = "gpio72", "gpio73",
-							"gpio74", "gpio75";
-					function = "qup17";
-				};
-
-				config {
-					pins = "gpio72", "gpio73",
-							"gpio74", "gpio75";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se17_spi_sleep: qupv3_se17_spi_sleep {
-				mux {
-					pins = "gpio72", "gpio73",
-							"gpio74", "gpio75";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio72", "gpio73",
-							"gpio74", "gpio75";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se19_spi_pins: qupv3_se19_spi_pins {
-			qupv3_se19_spi_active: qupv3_se19_spi_active {
-				mux {
-					pins = "gpio76", "gpio77",
-							"gpio78", "gpio79";
-					function = "qup19";
-				};
-
-				config {
-					pins = "gpio76", "gpio77",
-							"gpio78", "gpio79";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-
-			qupv3_se19_spi_sleep: qupv3_se19_spi_sleep {
-				mux {
-					pins = "gpio76", "gpio77",
-							"gpio78", "gpio79";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio76", "gpio77",
-							"gpio78", "gpio79";
-					drive-strength = <6>;
-					bias-disable;
-				};
-			};
-		};
-
-		/* I2C */
-		qupv3_se0_i2c_pins: qupv3_se0_i2c_pins {
-			qupv3_se0_i2c_active: qupv3_se0_i2c_active {
-				mux {
-					pins = "gpio4", "gpio5";
-					function = "qup0";
-				};
-
-				config {
-					pins = "gpio4", "gpio5";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se0_i2c_sleep: qupv3_se0_i2c_sleep {
-				mux {
-					pins = "gpio4", "gpio5";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio4", "gpio5";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se1_i2c_pins: qupv3_se1_i2c_pins {
-			qupv3_se1_i2c_active: qupv3_se1_i2c_active {
-				mux {
-					pins = "gpio8", "gpio9";
-					function = "qup1";
-				};
-
-				config {
-					pins = "gpio8", "gpio9";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se1_i2c_sleep: qupv3_se1_i2c_sleep {
-				mux {
-					pins = "gpio8", "gpio9";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio8", "gpio9";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se2_i2c_pins: qupv3_se2_i2c_pins {
-			qupv3_se2_i2c_active: qupv3_se2_i2c_active {
-				mux {
-					pins = "gpio12", "gpio13";
-					function = "qup2";
-				};
-
-				config {
-					pins = "gpio12", "gpio13";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se2_i2c_sleep: qupv3_se2_i2c_sleep {
-				mux {
-					pins = "gpio12", "gpio13";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio12", "gpio13";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se4_i2c_pins: qupv3_se4_i2c_pins {
-			qupv3_se4_i2c_active: qupv3_se4_i2c_active {
-				mux {
-					pins = "gpio20", "gpio21";
-					function = "qup4";
-				};
-
-				config {
-					pins = "gpio20", "gpio21";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se4_i2c_sleep: qupv3_se4_i2c_sleep {
-				mux {
-					pins = "gpio20", "gpio21";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio20", "gpio21";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se5_i2c_pins: qupv3_se5_i2c_pins {
-			qupv3_se5_i2c_active: qupv3_se5_i2c_active {
-				mux {
-					pins = "gpio24", "gpio25";
-					function = "qup5";
-				};
-
-				config {
-					pins = "gpio24", "gpio25";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se5_i2c_sleep: qupv3_se5_i2c_sleep {
-				mux {
-					pins = "gpio24", "gpio25";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio24", "gpio25";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se6_i2c_pins: qupv3_se6_i2c_pins {
-			qupv3_se6_i2c_active: qupv3_se6_i2c_active {
-				mux {
-					pins = "gpio28", "gpio29";
-					function = "qup6";
-				};
-
-				config {
-					pins = "gpio28", "gpio29";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se6_i2c_sleep: qupv3_se6_i2c_sleep {
-				mux {
-					pins = "gpio28", "gpio29";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio28", "gpio29";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se7_i2c_pins: qupv3_se7_i2c_pins {
-			qupv3_se7_i2c_active: qupv3_se7_i2c_active {
-				mux {
-					pins = "gpio32", "gpio33";
-					function = "qup7";
-				};
-
-				config {
-					pins = "gpio32", "gpio33";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se7_i2c_sleep: qupv3_se7_i2c_sleep {
-				mux {
-					pins = "gpio32", "gpio33";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio32", "gpio33";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se8_i2c_pins: qupv3_se8_i2c_pins {
-			qupv3_se8_i2c_active: qupv3_se8_i2c_active {
-				mux {
-					pins = "gpio36", "gpio37";
-					function = "qup8";
-				};
-
-				config {
-					pins = "gpio36", "gpio37";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se8_i2c_sleep: qupv3_se8_i2c_sleep {
-				mux {
-					pins = "gpio36", "gpio37";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio36", "gpio37";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se9_i2c_pins: qupv3_se9_i2c_pins {
-			qupv3_se9_i2c_active: qupv3_se9_i2c_active {
-				mux {
-					pins = "gpio40", "gpio41";
-					function = "qup9";
-				};
-
-				config {
-					pins = "gpio40", "gpio41";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se9_i2c_sleep: qupv3_se9_i2c_sleep {
-				mux {
-					pins = "gpio40", "gpio41";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio40", "gpio41";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se10_i2c_pins: qupv3_se10_i2c_pins {
-			qupv3_se10_i2c_active: qupv3_se10_i2c_active {
-				mux {
-					pins = "gpio44", "gpio45";
-					function = "qup10";
-				};
-
-				config {
-					pins = "gpio44", "gpio45";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se10_i2c_sleep: qupv3_se10_i2c_sleep {
-				mux {
-					pins = "gpio44", "gpio45";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio44", "gpio45";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se11_i2c_pins: qupv3_se11_i2c_pins {
-			qupv3_se11_i2c_active: qupv3_se11_i2c_active {
-				mux {
-					pins = "gpio48", "gpio49";
-					function = "qup11";
-				};
-
-				config {
-					pins = "gpio48", "gpio49";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se11_i2c_sleep: qupv3_se11_i2c_sleep {
-				mux {
-					pins = "gpio48", "gpio49";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio48", "gpio49";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se12_i2c_pins: qupv3_se12_i2c_pins {
-			qupv3_se12_i2c_active: qupv3_se12_i2c_active {
-				mux {
-					pins = "gpio52", "gpio53";
-					function = "qup12";
-				};
-
-				config {
-					pins = "gpio52", "gpio53";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se12_i2c_sleep: qupv3_se12_i2c_sleep {
-				mux {
-					pins = "gpio52", "gpio53";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio52", "gpio53";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se13_i2c_pins: qupv3_se13_i2c_pins {
-			qupv3_se13_i2c_active: qupv3_se13_i2c_active {
-				mux {
-					pins = "gpio0", "gpio1";
-					function = "qup13";
-				};
-
-				config {
-					pins = "gpio0", "gpio1";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se13_i2c_sleep: qupv3_se13_i2c_sleep {
-				mux {
-					pins = "gpio0", "gpio1";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio0", "gpio1";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se14_i2c_pins: qupv3_se14_i2c_pins {
-			qupv3_se14_i2c_active: qupv3_se14_i2c_active {
-				mux {
-					pins = "gpio56", "gpio57";
-					function = "qup14";
-				};
-
-				config {
-					pins = "gpio56", "gpio57";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se14_i2c_sleep: qupv3_se14_i2c_sleep {
-				mux {
-					pins = "gpio56", "gpio57";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio56", "gpio57";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se15_i2c_pins: qupv3_se15_i2c_pins {
-			qupv3_se15_i2c_active: qupv3_se15_i2c_active {
-				mux {
-					pins = "gpio60", "gpio61";
-					function = "qup15";
-				};
-
-				config {
-					pins = "gpio60", "gpio61";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se15_i2c_sleep: qupv3_se15_i2c_sleep {
-				mux {
-					pins = "gpio60", "gpio61";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio60", "gpio61";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se16_i2c_pins: qupv3_se16_i2c_pins {
-			qupv3_se16_i2c_active: qupv3_se16_i2c_active {
-				mux {
-					pins = "gpio64", "gpio65";
-					function = "qup16";
-				};
-
-				config {
-					pins = "gpio64", "gpio65";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se16_i2c_sleep: qupv3_se16_i2c_sleep {
-				mux {
-					pins = "gpio64", "gpio65";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio64", "gpio65";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se17_i2c_pins: qupv3_se17_i2c_pins {
-			qupv3_se17_i2c_active: qupv3_se17_i2c_active {
-				mux {
-					pins = "gpio72", "gpio73";
-					function = "qup17";
-				};
-
-				config {
-					pins = "gpio72", "gpio73";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se17_i2c_sleep: qupv3_se17_i2c_sleep {
-				mux {
-					pins = "gpio72", "gpio73";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio72", "gpio73";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		qupv3_se19_i2c_pins: qupv3_se19_i2c_pins {
-			qupv3_se19_i2c_active: qupv3_se19_i2c_active {
-				mux {
-					pins = "gpio76", "gpio77";
-					function = "qup19";
-				};
-
-				config {
-					pins = "gpio76", "gpio77";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			qupv3_se19_i2c_sleep: qupv3_se19_i2c_sleep {
-				mux {
-					pins = "gpio76", "gpio77";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio76", "gpio77";
-					drive-strength = <2>;
-					bias-disable;
-				};
-			};
-		};
-
-		/* WSA speaker reset pins */
-		spkr_1_sd_n {
-			spkr_1_sd_n_sleep: spkr_1_sd_n_sleep {
-				mux {
-					pins = "gpio15";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio15";
-					drive-strength = <2>;   /* 2 mA */
-					bias-pull-down;
-					input-enable;
-				};
-			};
-
-			spkr_1_sd_n_active: spkr_1_sd_n_active {
-				mux {
-					pins = "gpio15";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio15";
-					drive-strength = <16>;   /* 16 mA */
-					bias-disable;
-					output-high;
-				};
-			};
-		};
-
-		spkr_2_sd_n {
-			spkr_2_sd_n_sleep: spkr_2_sd_n_sleep {
-				mux {
-					pins = "gpio42";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio42";
-					drive-strength = <2>;   /* 2 mA */
-					bias-pull-down;
-					input-enable;
-				};
-			};
-
-			spkr_2_sd_n_active: spkr_2_sd_n_active {
-				mux {
-					pins = "gpio42";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio42";
-					drive-strength = <16>;   /* 16 mA */
-					bias-disable;
-					output-high;
-				};
-			};
-		};
-
-		/* WCD reset pin */
-		wcd938x_reset_active: wcd938x_reset_active {
-			mux {
-				pins = "gpio88";
-				function = "gpio";
-			};
-
-			config {
-				pins = "gpio88";
-				drive-strength = <16>;
-				output-high;
-			};
-		};
-
-		wcd938x_reset_sleep: wcd938x_reset_sleep {
-			mux {
-				pins = "gpio88";
-				function = "gpio";
-			};
-
-			config {
-				pins = "gpio88";
-				drive-strength = <16>;
-				bias-disable;
-				output-low;
-			};
-		};
-
-		pm8008i_active: pm8008i_active {
-			mux {
-				pins = "gpio33";
-				function = "gpio";
-			};
-
-			config {
-				pins = "gpio33";
-				bias-disable;
-				output-high;
+				pins = "gpio70";
 				drive-strength = <2>;
+				bias-pull-up;
 			};
 		};
 
-		pm8008j_active: pm8008j_active {
+		qupv3_se18_ctsrx: qupv3_se18_ctsrx {
 			mux {
-				pins = "gpio35";
-				function = "gpio";
+				pins = "gpio68", "gpio71";
+				function = "qup18";
 			};
 
 			config {
-				pins = "gpio35";
-				bias-disable;
-				output-high;
+				pins = "gpio68", "gpio71";
 				drive-strength = <2>;
+				bias-disable;
 			};
 		};
 
-		pcie0 {
-			pcie0_perst_default: pcie0_perst_default {
-				mux {
-					pins = "gpio94";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio94";
-					drive-strength = <2>;
-					bias-pull-down;
-				};
+		qupv3_se18_rts: qupv3_se18_rts {
+			mux {
+				pins = "gpio69";
+				function = "qup18";
 			};
 
-			pcie0_clkreq_default: pcie0_clkreq_default {
-				mux {
-					pins = "gpio95";
-					function = "pci_e0";
-				};
-
-				config {
-					pins = "gpio95";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			pcie0_wake_default: pcie0_wake_default {
-				mux {
-					pins = "gpio96";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio96";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
+			config {
+				pins = "gpio69";
+				drive-strength = <2>;
+				bias-pull-down;
 			};
 		};
 
-		pcie1 {
-			pcie1_perst_default: pcie1_perst_default {
-				mux {
-					pins = "gpio97";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio97";
-					drive-strength = <2>;
-					bias-pull-down;
-				};
+		qupv3_se18_tx: qupv3_se18_tx {
+			mux {
+				pins = "gpio70";
+				function = "qup18";
 			};
 
-			pcie1_clkreq_default: pcie1_clkreq_default {
-				mux {
-					pins = "gpio98";
-					function = "pci_e1";
-				};
-
-				config {
-					pins = "gpio98";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-
-			pcie1_wake_default: pcie1_wake_default {
-				mux {
-					pins = "gpio99";
-					function = "gpio";
-				};
-
-				config {
-					pins = "gpio99";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
+			config {
+				pins = "gpio70";
+				drive-strength = <2>;
+				bias-pull-up;
 			};
 		};
 	};
+
+	/* I3C */
+	qupv3_se8_i3c_pins: qupv3_se8_i3c_pins {
+		qupv3_se8_i3c_active: qupv3_se8_i3c_active {
+			mux {
+				pins = "gpio36", "gpio37";
+				function = "ibi_i3c";
+			};
+
+			config {
+				pins = "gpio36", "gpio37";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se8_i3c_sleep: qupv3_se8_i3c_sleep {
+			mux {
+				pins = "gpio36", "gpio37";
+				function = "ibi_i3c";
+			};
+
+			config {
+				pins = "gpio36", "gpio37";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+	};
+
+	qupv3_se9_i3c_pins: qupv3_se9_i3c_pins {
+		qupv3_se9_i3c_active: qupv3_se9_i3c_active {
+			mux {
+				pins = "gpio40", "gpio41";
+				function = "ibi_i3c";
+			};
+
+			config {
+				pins = "gpio40", "gpio41";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se9_i3c_sleep: qupv3_se9_i3c_sleep {
+			mux {
+				pins = "gpio40", "gpio41";
+				function = "ibi_i3c";
+			};
+
+			config {
+				pins = "gpio40", "gpio41";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+	};
+
+	qupv3_se14_i3c_pins: qupv3_se14_i3c_pins {
+		qupv3_se14_i3c_active: qupv3_se14_i3c_active {
+			mux {
+				pins = "gpio56", "gpio57";
+				function = "ibi_i3c";
+			};
+
+			config {
+				pins = "gpio56", "gpio57";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se14_i3c_sleep: qupv3_se14_i3c_sleep {
+			mux {
+				pins = "gpio56", "gpio57";
+				function = "ibi_i3c";
+			};
+
+			config {
+				pins = "gpio56", "gpio57";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+	};
+
+	qupv3_se15_i3c_pins: qupv3_se15_i3c_pins {
+		qupv3_se15_i3c_active: qupv3_se15_i3c_active {
+			mux {
+				pins = "gpio60", "gpio61";
+				function = "ibi_i3c";
+			};
+
+			config {
+				pins = "gpio60", "gpio61";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se15_i3c_sleep: qupv3_se15_i3c_sleep {
+			mux {
+				pins = "gpio60", "gpio61";
+				function = "ibi_i3c";
+			};
+
+			config {
+				pins = "gpio60", "gpio61";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+	};
+
+	/* SPI */
+	qupv3_se0_spi_pins: qupv3_se0_spi_pins {
+		qupv3_se0_spi_active: qupv3_se0_spi_active {
+			mux {
+				pins = "gpio4", "gpio5",
+						"gpio6", "gpio7";
+				function = "qup0";
+			};
+
+			config {
+				pins = "gpio4", "gpio5",
+						"gpio6", "gpio7";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se0_spi_sleep: qupv3_se0_spi_sleep {
+			mux {
+				pins = "gpio4", "gpio5",
+						"gpio6", "gpio7";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio4", "gpio5",
+						"gpio6", "gpio7";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se1_spi_pins: qupv3_se1_spi_pins {
+		qupv3_se1_spi_active: qupv3_se1_spi_active {
+			mux {
+				pins = "gpio8", "gpio9",
+						"gpio10", "gpio11";
+				function = "qup1";
+			};
+
+			config {
+				pins = "gpio8", "gpio9",
+						"gpio10", "gpio11";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se1_spi_sleep: qupv3_se1_spi_sleep {
+			mux {
+				pins = "gpio8", "gpio9",
+						"gpio10", "gpio11";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio8", "gpio9",
+						"gpio10", "gpio11";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se2_spi_pins: qupv3_se2_spi_pins {
+		qupv3_se2_spi_active: qupv3_se2_spi_active {
+			mux {
+				pins = "gpio12", "gpio13",
+						"gpio14", "gpio15";
+				function = "qup2";
+			};
+
+			config {
+				pins = "gpio12", "gpio13",
+						"gpio14", "gpio15";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se2_spi_sleep: qupv3_se2_spi_sleep {
+			mux {
+				pins = "gpio12", "gpio13",
+						"gpio14", "gpio15";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio12", "gpio13",
+						"gpio14", "gpio15";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se4_spi_pins: qupv3_se4_spi_pins {
+		qupv3_se4_spi_active: qupv3_se4_spi_active {
+			mux {
+				pins = "gpio20", "gpio21",
+						"gpio22", "gpio23";
+				function = "qup4";
+			};
+
+			config {
+				pins = "gpio20", "gpio21",
+						"gpio22", "gpio23";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se4_spi_sleep: qupv3_se4_spi_sleep {
+			mux {
+				pins = "gpio20", "gpio21",
+						"gpio22", "gpio23";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio20", "gpio21",
+						"gpio22", "gpio23";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se5_spi_pins: qupv3_se5_spi_pins {
+		qupv3_se5_spi_active: qupv3_se5_spi_active {
+			mux {
+				pins = "gpio24", "gpio25",
+						"gpio26", "gpio27";
+				function = "qup5";
+			};
+
+			config {
+				pins = "gpio24", "gpio25",
+						"gpio26", "gpio27";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se5_spi_sleep: qupv3_se5_spi_sleep {
+			mux {
+				pins = "gpio24", "gpio25",
+						"gpio26", "gpio27";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio24", "gpio25",
+						"gpio26", "gpio27";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se6_spi_pins: qupv3_se6_spi_pins {
+		qupv3_se6_spi_active: qupv3_se6_spi_active {
+			mux {
+				pins = "gpio28", "gpio29",
+						"gpio30", "gpio31";
+				function = "qup6";
+			};
+
+			config {
+				pins = "gpio28", "gpio29",
+						"gpio30", "gpio31";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se6_spi_sleep: qupv3_se6_spi_sleep {
+			mux {
+				pins = "gpio28", "gpio29",
+						"gpio30", "gpio31";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio28", "gpio29",
+						"gpio30", "gpio31";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se7_spi_pins: qupv3_se7_spi_pins {
+		qupv3_se7_spi_active: qupv3_se7_spi_active {
+			mux {
+				pins = "gpio32", "gpio33",
+						"gpio34", "gpio35";
+				function = "qup7";
+			};
+
+			config {
+				pins = "gpio32", "gpio33",
+						"gpio34", "gpio35";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se7_spi_sleep: qupv3_se7_spi_sleep {
+			mux {
+				pins = "gpio32", "gpio33",
+						"gpio34", "gpio35";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio32", "gpio33",
+						"gpio34", "gpio35";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se8_spi_pins: qupv3_se8_spi_pins {
+		qupv3_se8_spi_active: qupv3_se8_spi_active {
+			mux {
+				pins = "gpio36", "gpio37",
+						"gpio38", "gpio39";
+				function = "qup8";
+			};
+
+			config {
+				pins = "gpio36", "gpio37",
+						"gpio38", "gpio39";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se8_spi_sleep: qupv3_se8_spi_sleep {
+			mux {
+				pins = "gpio36", "gpio37",
+						"gpio38", "gpio39";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio36", "gpio37",
+						"gpio38", "gpio39";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se9_spi_pins: qupv3_se9_spi_pins {
+		qupv3_se9_spi_active: qupv3_se9_spi_active {
+			mux {
+				pins = "gpio40", "gpio41",
+						"gpio42", "gpio43";
+				function = "qup9";
+			};
+
+			config {
+				pins = "gpio40", "gpio41",
+						"gpio42", "gpio43";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se9_spi_sleep: qupv3_se9_spi_sleep {
+			mux {
+				pins = "gpio40", "gpio41",
+						"gpio42", "gpio43";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio40", "gpio41",
+						"gpio42", "gpio43";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se10_spi_pins: qupv3_se10_spi_pins {
+		qupv3_se10_spi_active: qupv3_se10_spi_active {
+			mux {
+				pins = "gpio44", "gpio45",
+						"gpio46", "gpio47";
+				function = "qup10";
+			};
+
+			config {
+				pins = "gpio44", "gpio45",
+						"gpio46", "gpio47";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se10_spi_sleep: qupv3_se10_spi_sleep {
+			mux {
+				pins = "gpio44", "gpio45",
+						"gpio46", "gpio47";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio44", "gpio45",
+						"gpio46", "gpio47";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se11_spi_pins: qupv3_se11_spi_pins {
+		qupv3_se11_spi_active: qupv3_se11_spi_active {
+			mux {
+				pins = "gpio48", "gpio49",
+						"gpio50", "gpio51";
+				function = "qup11";
+			};
+
+			config {
+				pins = "gpio48", "gpio49",
+						"gpio50", "gpio51";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se11_spi_sleep: qupv3_se11_spi_sleep {
+			mux {
+				pins = "gpio48", "gpio49",
+						"gpio50", "gpio51";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio48", "gpio49",
+						"gpio50", "gpio51";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se12_spi_pins: qupv3_se12_spi_pins {
+		qupv3_se12_spi_active: qupv3_se12_spi_active {
+			mux {
+				pins = "gpio52", "gpio53",
+						"gpio54", "gpio55";
+				function = "qup12";
+			};
+
+			config {
+				pins = "gpio52", "gpio53",
+						"gpio54", "gpio55";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se12_spi_sleep: qupv3_se12_spi_sleep {
+			mux {
+				pins = "gpio52", "gpio53",
+						"gpio54", "gpio55";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio52", "gpio53",
+						"gpio54", "gpio55";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se13_spi_pins: qupv3_se13_spi_pins {
+		qupv3_se13_spi_active: qupv3_se13_spi_active {
+			mux {
+				pins = "gpio0", "gpio1",
+						"gpio2", "gpio3";
+				function = "qup13";
+			};
+
+			config {
+				pins = "gpio0", "gpio1",
+						"gpio2", "gpio3";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se13_spi_sleep: qupv3_se13_spi_sleep {
+			mux {
+				pins = "gpio0", "gpio1",
+						"gpio2", "gpio3";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio0", "gpio1",
+						"gpio2", "gpio3";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se14_spi_pins: qupv3_se14_spi_pins {
+		qupv3_se14_spi_active: qupv3_se14_spi_active {
+			mux {
+				pins = "gpio56", "gpio57",
+						"gpio58", "gpio59";
+				function = "qup14";
+			};
+
+			config {
+				pins = "gpio56", "gpio57",
+						"gpio58", "gpio59";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se14_spi_sleep: qupv3_se14_spi_sleep {
+			mux {
+				pins = "gpio56", "gpio57",
+						"gpio58", "gpio59";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio56", "gpio57",
+						"gpio58", "gpio59";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se15_spi_pins: qupv3_se15_spi_pins {
+		qupv3_se15_spi_active: qupv3_se15_spi_active {
+			mux {
+				pins = "gpio60", "gpio61",
+						"gpio62", "gpio63";
+				function = "qup15";
+			};
+
+			config {
+				pins = "gpio60", "gpio61",
+						"gpio62", "gpio63";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se15_spi_sleep: qupv3_se15_spi_sleep {
+			mux {
+				pins = "gpio60", "gpio61",
+						"gpio62", "gpio63";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio60", "gpio61",
+						"gpio62", "gpio63";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se16_spi_pins: qupv3_se16_spi_pins {
+		qupv3_se16_spi_active: qupv3_se16_spi_active {
+			mux {
+				pins = "gpio64", "gpio65",
+						"gpio66", "gpio67";
+				function = "qup16";
+			};
+
+			config {
+				pins = "gpio64", "gpio65",
+						"gpio66", "gpio67";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se16_spi_sleep: qupv3_se16_spi_sleep {
+			mux {
+				pins = "gpio64", "gpio65",
+						"gpio66", "gpio67";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio64", "gpio65",
+						"gpio66", "gpio67";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se17_spi_pins: qupv3_se17_spi_pins {
+		qupv3_se17_spi_active: qupv3_se17_spi_active {
+			mux {
+				pins = "gpio72", "gpio73",
+						"gpio74", "gpio75";
+				function = "qup17";
+			};
+
+			config {
+				pins = "gpio72", "gpio73",
+						"gpio74", "gpio75";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se17_spi_sleep: qupv3_se17_spi_sleep {
+			mux {
+				pins = "gpio72", "gpio73",
+						"gpio74", "gpio75";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio72", "gpio73",
+						"gpio74", "gpio75";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se19_spi_pins: qupv3_se19_spi_pins {
+		qupv3_se19_spi_active: qupv3_se19_spi_active {
+			mux {
+				pins = "gpio76", "gpio77",
+						"gpio78", "gpio79";
+				function = "qup19";
+			};
+
+			config {
+				pins = "gpio76", "gpio77",
+						"gpio78", "gpio79";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+
+		qupv3_se19_spi_sleep: qupv3_se19_spi_sleep {
+			mux {
+				pins = "gpio76", "gpio77",
+						"gpio78", "gpio79";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio76", "gpio77",
+						"gpio78", "gpio79";
+				drive-strength = <6>;
+				bias-disable;
+			};
+		};
+	};
+
+	/* I2C */
+	qupv3_se0_i2c_pins: qupv3_se0_i2c_pins {
+		qupv3_se0_i2c_active: qupv3_se0_i2c_active {
+			mux {
+				pins = "gpio4", "gpio5";
+				function = "qup0";
+			};
+
+			config {
+				pins = "gpio4", "gpio5";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se0_i2c_sleep: qupv3_se0_i2c_sleep {
+			mux {
+				pins = "gpio4", "gpio5";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio4", "gpio5";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se1_i2c_pins: qupv3_se1_i2c_pins {
+		qupv3_se1_i2c_active: qupv3_se1_i2c_active {
+			mux {
+				pins = "gpio8", "gpio9";
+				function = "qup1";
+			};
+
+			config {
+				pins = "gpio8", "gpio9";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se1_i2c_sleep: qupv3_se1_i2c_sleep {
+			mux {
+				pins = "gpio8", "gpio9";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio8", "gpio9";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se2_i2c_pins: qupv3_se2_i2c_pins {
+		qupv3_se2_i2c_active: qupv3_se2_i2c_active {
+			mux {
+				pins = "gpio12", "gpio13";
+				function = "qup2";
+			};
+
+			config {
+				pins = "gpio12", "gpio13";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se2_i2c_sleep: qupv3_se2_i2c_sleep {
+			mux {
+				pins = "gpio12", "gpio13";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio12", "gpio13";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se4_i2c_pins: qupv3_se4_i2c_pins {
+		qupv3_se4_i2c_active: qupv3_se4_i2c_active {
+			mux {
+				pins = "gpio20", "gpio21";
+				function = "qup4";
+			};
+
+			config {
+				pins = "gpio20", "gpio21";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se4_i2c_sleep: qupv3_se4_i2c_sleep {
+			mux {
+				pins = "gpio20", "gpio21";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio20", "gpio21";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se5_i2c_pins: qupv3_se5_i2c_pins {
+		qupv3_se5_i2c_active: qupv3_se5_i2c_active {
+			mux {
+				pins = "gpio24", "gpio25";
+				function = "qup5";
+			};
+
+			config {
+				pins = "gpio24", "gpio25";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se5_i2c_sleep: qupv3_se5_i2c_sleep {
+			mux {
+				pins = "gpio24", "gpio25";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio24", "gpio25";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se6_i2c_pins: qupv3_se6_i2c_pins {
+		qupv3_se6_i2c_active: qupv3_se6_i2c_active {
+			mux {
+				pins = "gpio28", "gpio29";
+				function = "qup6";
+			};
+
+			config {
+				pins = "gpio28", "gpio29";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se6_i2c_sleep: qupv3_se6_i2c_sleep {
+			mux {
+				pins = "gpio28", "gpio29";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio28", "gpio29";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se7_i2c_pins: qupv3_se7_i2c_pins {
+		qupv3_se7_i2c_active: qupv3_se7_i2c_active {
+			mux {
+				pins = "gpio32", "gpio33";
+				function = "qup7";
+			};
+
+			config {
+				pins = "gpio32", "gpio33";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se7_i2c_sleep: qupv3_se7_i2c_sleep {
+			mux {
+				pins = "gpio32", "gpio33";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio32", "gpio33";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se8_i2c_pins: qupv3_se8_i2c_pins {
+		qupv3_se8_i2c_active: qupv3_se8_i2c_active {
+			mux {
+				pins = "gpio36", "gpio37";
+				function = "qup8";
+			};
+
+			config {
+				pins = "gpio36", "gpio37";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se8_i2c_sleep: qupv3_se8_i2c_sleep {
+			mux {
+				pins = "gpio36", "gpio37";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio36", "gpio37";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se9_i2c_pins: qupv3_se9_i2c_pins {
+		qupv3_se9_i2c_active: qupv3_se9_i2c_active {
+			mux {
+				pins = "gpio40", "gpio41";
+				function = "qup9";
+			};
+
+			config {
+				pins = "gpio40", "gpio41";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se9_i2c_sleep: qupv3_se9_i2c_sleep {
+			mux {
+				pins = "gpio40", "gpio41";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio40", "gpio41";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se10_i2c_pins: qupv3_se10_i2c_pins {
+		qupv3_se10_i2c_active: qupv3_se10_i2c_active {
+			mux {
+				pins = "gpio44", "gpio45";
+				function = "qup10";
+			};
+
+			config {
+				pins = "gpio44", "gpio45";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se10_i2c_sleep: qupv3_se10_i2c_sleep {
+			mux {
+				pins = "gpio44", "gpio45";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio44", "gpio45";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se11_i2c_pins: qupv3_se11_i2c_pins {
+		qupv3_se11_i2c_active: qupv3_se11_i2c_active {
+			mux {
+				pins = "gpio48", "gpio49";
+				function = "qup11";
+			};
+
+			config {
+				pins = "gpio48", "gpio49";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se11_i2c_sleep: qupv3_se11_i2c_sleep {
+			mux {
+				pins = "gpio48", "gpio49";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio48", "gpio49";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se12_i2c_pins: qupv3_se12_i2c_pins {
+		qupv3_se12_i2c_active: qupv3_se12_i2c_active {
+			mux {
+				pins = "gpio52", "gpio53";
+				function = "qup12";
+			};
+
+			config {
+				pins = "gpio52", "gpio53";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se12_i2c_sleep: qupv3_se12_i2c_sleep {
+			mux {
+				pins = "gpio52", "gpio53";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio52", "gpio53";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se13_i2c_pins: qupv3_se13_i2c_pins {
+		qupv3_se13_i2c_active: qupv3_se13_i2c_active {
+			mux {
+				pins = "gpio0", "gpio1";
+				function = "qup13";
+			};
+
+			config {
+				pins = "gpio0", "gpio1";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se13_i2c_sleep: qupv3_se13_i2c_sleep {
+			mux {
+				pins = "gpio0", "gpio1";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio0", "gpio1";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se14_i2c_pins: qupv3_se14_i2c_pins {
+		qupv3_se14_i2c_active: qupv3_se14_i2c_active {
+			mux {
+				pins = "gpio56", "gpio57";
+				function = "qup14";
+			};
+
+			config {
+				pins = "gpio56", "gpio57";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se14_i2c_sleep: qupv3_se14_i2c_sleep {
+			mux {
+				pins = "gpio56", "gpio57";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio56", "gpio57";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se15_i2c_pins: qupv3_se15_i2c_pins {
+		qupv3_se15_i2c_active: qupv3_se15_i2c_active {
+			mux {
+				pins = "gpio60", "gpio61";
+				function = "qup15";
+			};
+
+			config {
+				pins = "gpio60", "gpio61";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se15_i2c_sleep: qupv3_se15_i2c_sleep {
+			mux {
+				pins = "gpio60", "gpio61";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio60", "gpio61";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se16_i2c_pins: qupv3_se16_i2c_pins {
+		qupv3_se16_i2c_active: qupv3_se16_i2c_active {
+			mux {
+				pins = "gpio64", "gpio65";
+				function = "qup16";
+			};
+
+			config {
+				pins = "gpio64", "gpio65";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se16_i2c_sleep: qupv3_se16_i2c_sleep {
+			mux {
+				pins = "gpio64", "gpio65";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio64", "gpio65";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se17_i2c_pins: qupv3_se17_i2c_pins {
+		qupv3_se17_i2c_active: qupv3_se17_i2c_active {
+			mux {
+				pins = "gpio72", "gpio73";
+				function = "qup17";
+			};
+
+			config {
+				pins = "gpio72", "gpio73";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se17_i2c_sleep: qupv3_se17_i2c_sleep {
+			mux {
+				pins = "gpio72", "gpio73";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio72", "gpio73";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	qupv3_se19_i2c_pins: qupv3_se19_i2c_pins {
+		qupv3_se19_i2c_active: qupv3_se19_i2c_active {
+			mux {
+				pins = "gpio76", "gpio77";
+				function = "qup19";
+			};
+
+			config {
+				pins = "gpio76", "gpio77";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		qupv3_se19_i2c_sleep: qupv3_se19_i2c_sleep {
+			mux {
+				pins = "gpio76", "gpio77";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio76", "gpio77";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	/* WSA speaker reset pins */
+	spkr_1_sd_n {
+		spkr_1_sd_n_sleep: spkr_1_sd_n_sleep {
+			mux {
+				pins = "gpio15";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio15";
+				drive-strength = <2>;   /* 2 mA */
+				bias-pull-down;
+				input-enable;
+			};
+		};
+
+		spkr_1_sd_n_active: spkr_1_sd_n_active {
+			mux {
+				pins = "gpio15";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio15";
+				drive-strength = <16>;   /* 16 mA */
+				bias-disable;
+				output-high;
+			};
+		};
+	};
+
+	spkr_2_sd_n {
+		spkr_2_sd_n_sleep: spkr_2_sd_n_sleep {
+			mux {
+				pins = "gpio42";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio42";
+				drive-strength = <2>;   /* 2 mA */
+				bias-pull-down;
+				input-enable;
+			};
+		};
+
+		spkr_2_sd_n_active: spkr_2_sd_n_active {
+			mux {
+				pins = "gpio42";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio42";
+				drive-strength = <16>;   /* 16 mA */
+				bias-disable;
+				output-high;
+			};
+		};
+	};
+
+	/* WCD reset pin */
+	wcd938x_reset_active: wcd938x_reset_active {
+		mux {
+			pins = "gpio88";
+			function = "gpio";
+		};
+
+		config {
+			pins = "gpio88";
+			drive-strength = <16>;
+			output-high;
+		};
+	};
+
+	wcd938x_reset_sleep: wcd938x_reset_sleep {
+		mux {
+			pins = "gpio88";
+			function = "gpio";
+		};
+
+		config {
+			pins = "gpio88";
+			drive-strength = <16>;
+			bias-disable;
+			output-low;
+		};
+	};
+
+	pm8008i_active: pm8008i_active {
+		mux {
+			pins = "gpio33";
+			function = "gpio";
+		};
+
+		config {
+			pins = "gpio33";
+			bias-disable;
+			output-high;
+			drive-strength = <2>;
+		};
+	};
+
+	pm8008j_active: pm8008j_active {
+		mux {
+			pins = "gpio35";
+			function = "gpio";
+		};
+
+		config {
+			pins = "gpio35";
+			bias-disable;
+			output-high;
+			drive-strength = <2>;
+		};
+	};
+
+	pcie0 {
+		pcie0_perst_default: pcie0_perst_default {
+			mux {
+				pins = "gpio94";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio94";
+				drive-strength = <2>;
+				bias-pull-down;
+			};
+		};
+
+		pcie0_clkreq_default: pcie0_clkreq_default {
+			mux {
+				pins = "gpio95";
+				function = "pci_e0";
+			};
+
+			config {
+				pins = "gpio95";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		pcie0_wake_default: pcie0_wake_default {
+			mux {
+				pins = "gpio96";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio96";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+	};
+
+	pcie1 {
+		pcie1_perst_default: pcie1_perst_default {
+			mux {
+				pins = "gpio97";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio97";
+				drive-strength = <2>;
+				bias-pull-down;
+			};
+		};
+
+		pcie1_clkreq_default: pcie1_clkreq_default {
+			mux {
+				pins = "gpio98";
+				function = "pci_e1";
+			};
+
+			config {
+				pins = "gpio98";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+
+		pcie1_wake_default: pcie1_wake_default {
+			mux {
+				pins = "gpio99";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio99";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+		};
+	};
+
 	pmx_sde: pmx_sde {
 		sde_dsi_active: sde_dsi_active {
 			mux {
@@ -2198,5 +2188,4 @@
 			};
 		};
 	};
-
 };
diff --git a/qcom/lahaina.dtsi b/qcom/lahaina.dtsi
index fb4bed22fae7..338299dcfbd8 100644
--- a/qcom/lahaina.dtsi
+++ b/qcom/lahaina.dtsi
@@ -668,6 +668,17 @@
 		reg-names = "pshold-base", "tcsr-boot-misc-detect";
 	};
 
+	tlmm: pinctrl@f000000 {
+		compatible = "qcom,lahaina-pinctrl";
+		reg = <0x0F000000 0x1000000>;
+		interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		interrupt-controller;
+		#interrupt-cells = <2>;
+		wakeup-parent = <&pdc>;
+	};
+
 	ipcc_mproc: qcom,ipcc@408000 {
 		compatible = "qcom,ipcc";
 		reg = <0x408000 0x1000>;