diff --git a/qcom/monaco-pinctrl.dtsi b/qcom/monaco-pinctrl.dtsi
index 58b6ad67..dcc209d5 100644
--- a/qcom/monaco-pinctrl.dtsi
+++ b/qcom/monaco-pinctrl.dtsi
@@ -13,7 +13,7 @@
 			qupv3_se6_2uart_tx_active: qupv3_se6_2uart_tx_active {
 				mux {
 					pins = "gpio30";
-					function = "qup0_l2";
+					function = "qup06";
 				};
 
 				config {
@@ -23,10 +23,10 @@
 				};
 			};
 
-			qupv3_se3_2uart_rx_active: qupv3_se3_2uart_rx_active {
+			qupv3_se6_2uart_rx_active: qupv3_se6_2uart_rx_active {
 				mux {
 					pins = "gpio31";
-					function = "qup0_l3";
+					function = "qup06";
 				};
 
 				config {
@@ -54,7 +54,7 @@
 			qupv3_se0_i2c_sda_active: qupv3_se0_i2c_sda_active {
 				mux {
 					pins = "gpio4";
-					function = "qup0_l0";
+					function = "qup00";
 				};
 
 				config {
@@ -67,7 +67,7 @@
 			qupv3_se0_i2c_scl_active: qupv3_se0_i2c_scl_active {
 				mux {
 					pins = "gpio5";
-					function = "qup0_l1";
+					function = "qup00";
 				};
 
 				config {
@@ -157,7 +157,7 @@
 			qupv3_se0_spi_miso_active: qupv3_se0_spi_miso_active {
 				mux {
 					pins = "gpio4";
-					function = "qup0_l0";
+					function = "qup00";
 				};
 
 				config {
@@ -170,7 +170,7 @@
 			qupv3_se0_spi_mosi_active: qupv3_se0_spi_mosi_active {
 				mux {
 					pins = "gpio5";
-					function = "qup0_l1";
+					function = "qup00";
 				};
 
 				config {
@@ -183,7 +183,7 @@
 			qupv3_se0_spi_clk_active: qupv3_se0_spi_clk_active {
 				mux {
 					pins = "gpio6";
-					function = "qup0_l2";
+					function = "qup00";
 				};
 
 				config {
@@ -196,7 +196,7 @@
 			qupv3_se0_spi_cs_active: qupv3_se0_spi_cs_active {
 				mux {
 					pins = "gpio7";
-					function = "qup0_l3";
+					function = "qup00";
 				};
 
 				config {
@@ -226,7 +226,7 @@
 			qupv3_se1_i2c_sda_active: qupv3_se1_i2c_sda_active {
 				mux {
 					pins = "gpio10";
-					function = "qup0_l0";
+					function = "qup01";
 				};
 
 				config {
@@ -239,7 +239,7 @@
 			qupv3_se1_i2c_scl_active: qupv3_se1_i2c_scl_active {
 				mux {
 					pins = "gpio11";
-					function = "qup0_l1";
+					function = "qup01";
 				};
 
 				config {
@@ -267,7 +267,7 @@
 			qupv3_se1_spi_miso_active: qupv3_se1_spi_miso_active {
 				mux {
 					pins = "gpio10";
-					function = "qup0_l0";
+					function = "qup01";
 				};
 
 				config {
@@ -280,7 +280,7 @@
 			qupv3_se1_spi_mosi_active: qupv3_se1_spi_mosi_active {
 				mux {
 					pins = "gpio11";
-					function = "qup0_l1";
+					function = "qup01";
 				};
 
 				config {
@@ -293,7 +293,7 @@
 			qupv3_se1_spi_clk_active: qupv3_se1_spi_clk_active {
 				mux {
 					pins = "gpio12";
-					function = "qup0_l2";
+					function = "qup01";
 				};
 
 				config {
@@ -306,7 +306,7 @@
 			qupv3_se1_spi_cs_active: qupv3_se1_spi_cs_active {
 				mux {
 					pins = "gpio13";
-					function = "qup0_l3";
+					function = "qup01";
 				};
 
 				config {
@@ -336,7 +336,7 @@
 			qupv3_se2_i2c_sda_active: qupv3_se2_i2c_sda_active {
 				mux {
 					pins = "gpio0";
-					function = "qup0_l0";
+					function = "qup02";
 				};
 
 				config {
@@ -349,7 +349,7 @@
 			qupv3_se2_i2c_scl_active: qupv3_se2_i2c_scl_active {
 				mux {
 					pins = "gpio1";
-					function = "qup0_l1";
+					function = "qup02";
 				};
 
 				config {
@@ -377,7 +377,7 @@
 			qupv3_se2_spi_miso_active: qupv3_se2_spi_miso_active {
 				mux {
 					pins = "gpio0";
-					function = "qup0_l0";
+					function = "qup02";
 				};
 
 				config {
@@ -390,7 +390,7 @@
 			qupv3_se2_spi_mosi_active: qupv3_se2_spi_mosi_active {
 				mux {
 					pins = "gpio1";
-					function = "qup0_l1";
+					function = "qup02";
 				};
 
 				config {
@@ -403,7 +403,7 @@
 			qupv3_se2_spi_clk_active: qupv3_se2_spi_clk_active {
 				mux {
 					pins = "gpio2";
-					function = "qup0_l2";
+					function = "qup02";
 				};
 
 				config {
@@ -416,7 +416,7 @@
 			qupv3_se2_spi_cs_active: qupv3_se2_spi_cs_active {
 				mux {
 					pins = "gpio3";
-					function = "qup0_l3";
+					function = "qup02";
 				};
 
 				config {
@@ -446,7 +446,7 @@
 			qupv3_se3_i2c_sda_active: qupv3_se3_i2c_sda_active {
 				mux {
 					pins = "gpio14";
-					function = "qup0_l0";
+					function = "qup03";
 				};
 
 				config {
@@ -459,7 +459,7 @@
 			qupv3_se3_i2c_scl_active: qupv3_se3_i2c_scl_active {
 				mux {
 					pins = "gpio15";
-					function = "qup0_l1";
+					function = "qup03";
 				};
 
 				config {
@@ -487,7 +487,7 @@
 			qupv3_se3_spi_miso_active: qupv3_se3_spi_miso_active {
 				mux {
 					pins = "gpio14";
-					function = "qup0_l0";
+					function = "qup03";
 				};
 
 				config {
@@ -500,7 +500,7 @@
 			qupv3_se3_spi_mosi_active: qupv3_se3_spi_mosi_active {
 				mux {
 					pins = "gpio15";
-					function = "qup0_l1";
+					function = "qup03";
 				};
 
 				config {
@@ -513,7 +513,7 @@
 			qupv3_se3_spi_clk_active: qupv3_se3_spi_clk_active {
 				mux {
 					pins = "gpio16";
-					function = "qup0_l2";
+					function = "qup03";
 				};
 
 				config {
@@ -526,7 +526,7 @@
 			qupv3_se3_spi_cs_active: qupv3_se3_spi_cs_active {
 				mux {
 					pins = "gpio17";
-					function = "qup0_l3";
+					function = "qup03";
 				};
 
 				config {
@@ -556,7 +556,7 @@
 			qupv3_se4_i2c_sda_active: qupv3_se4_i2c_sda_active {
 				mux {
 					pins = "gpio20";
-					function = "qup0_l0";
+					function = "qup04";
 				};
 
 				config {
@@ -569,7 +569,7 @@
 			qupv3_se4_i2c_scl_active: qupv3_se4_i2c_scl_active {
 				mux {
 					pins = "gpio21";
-					function = "qup0_l1";
+					function = "qup04";
 				};
 
 				config {
@@ -597,7 +597,7 @@
 			qupv3_se4_spi_miso_active: qupv3_se4_spi_miso_active {
 				mux {
 					pins = "gpio20";
-					function = "qup0_l0";
+					function = "qup04";
 				};
 
 				config {
@@ -610,7 +610,7 @@
 			qupv3_se4_spi_mosi_active: qupv3_se4_spi_mosi_active {
 				mux {
 					pins = "gpio21";
-					function = "qup0_l1";
+					function = "qup04";
 				};
 
 				config {
@@ -623,7 +623,7 @@
 			qupv3_se4_spi_clk_active: qupv3_se4_spi_clk_active {
 				mux {
 					pins = "gpio22";
-					function = "qup0_l2";
+					function = "qup04";
 				};
 
 				config {
@@ -636,7 +636,7 @@
 			qupv3_se4_spi_cs_active: qupv3_se4_spi_cs_active {
 				mux {
 					pins = "gpio23";
-					function = "qup0_l3";
+					function = "qup04";
 				};
 
 				config {
@@ -666,7 +666,7 @@
 			qupv3_se5_i2c_sda_active: qupv3_se5_i2c_sda_active {
 				mux {
 					pins = "gpio26";
-					function = "qup0_l0";
+					function = "qup05";
 				};
 
 				config {
@@ -679,7 +679,7 @@
 			qupv3_se5_i2c_scl_active: qupv3_se5_i2c_scl_active {
 				mux {
 					pins = "gpio27";
-					function = "qup0_l1";
+					function = "qup05";
 				};
 
 				config {
@@ -707,7 +707,7 @@
 			qupv3_se5_spi_miso_active: qupv3_se5_spi_miso_active {
 				mux {
 					pins = "gpio26";
-					function = "qup0_l0";
+					function = "qup05";
 				};
 
 				config {
@@ -720,7 +720,7 @@
 			qupv3_se5_spi_mosi_active: qupv3_se5_spi_mosi_active {
 				mux {
 					pins = "gpio27";
-					function = "qup0_l1";
+					function = "qup05";
 				};
 
 				config {
@@ -733,7 +733,7 @@
 			qupv3_se5_spi_clk_active: qupv3_se5_spi_clk_active {
 				mux {
 					pins = "gpio28";
-					function = "qup0_l2";
+					function = "qup05";
 				};
 
 				config {
@@ -746,7 +746,7 @@
 			qupv3_se5_spi_cs_active: qupv3_se5_spi_cs_active {
 				mux {
 					pins = "gpio29";
-					function = "qup0_l3";
+					function = "qup05";
 				};
 
 				config {
@@ -776,7 +776,7 @@
 			qupv3_se6_i2c_sda_active: qupv3_se6_i2c_sda_active {
 				mux {
 					pins = "gpio24";
-					function = "qup0_10";
+					function = "qup06";
 				};
 
 				config {
@@ -789,7 +789,7 @@
 			qupv3_se6_i2c_scl_active: qupv3_se6_i2c_scl_active {
 				mux {
 					pins = "gpio25";
-					function = "qup0_11";
+					function = "qup06";
 				};
 
 				config {
@@ -817,7 +817,7 @@
 			qupv3_se6_spi_miso_active: qupv3_se6_spi_miso_active {
 				mux {
 					pins = "gpio24";
-					function = "qup0_l0";
+					function = "qup06";
 				};
 
 				config {
@@ -830,7 +830,7 @@
 			qupv3_se6_spi_mosi_active: qupv3_se6_spi_mosi_active {
 				mux {
 					pins = "gpio25";
-					function = "qup0_l1";
+					function = "qup06";
 				};
 
 				config {
@@ -843,7 +843,7 @@
 			qupv3_se6_spi_clk_active: qupv3_se6_spi_clk_active {
 				mux {
 					pins = "gpio30";
-					function = "qup0_l2";
+					function = "qup06";
 				};
 
 				config {
@@ -856,7 +856,7 @@
 			qupv3_se6_spi_cs_active: qupv3_se6_spi_cs_active {
 				mux {
 					pins = "gpio31";
-					function = "qup0_l3";
+					function = "qup06";
 				};
 
 				config {
@@ -1158,7 +1158,7 @@
 			qupv3_se5_cts: qupv3_se5_cts {
 				mux {
 					pins = "gpio26";
-					function = "qup0_l0";
+					function = "qup05";
 				};
 
 				config {
@@ -1171,7 +1171,7 @@
 			qupv3_se5_rts: qupv3_se5_rts {
 				mux {
 					pins = "gpio27";
-					function = "qup0_l1";
+					function = "qup05";
 				};
 
 				config {
@@ -1184,7 +1184,7 @@
 			qupv3_se5_tx: qupv3_se5_tx {
 				mux {
 					pins = "gpio28";
-					function = "qup0_l2";
+					function = "qup05";
 				};
 
 				config {
@@ -1197,7 +1197,7 @@
 			qupv3_se5_rx: qupv3_se5_rx {
 				mux {
 					pins = "gpio29";
-					function = "qup0_l3";
+					function = "qup05";
 				};
 
 				config {
diff --git a/qcom/monaco-qupv3.dtsi b/qcom/monaco-qupv3.dtsi
index 4abcfea1..3d51f4ba 100644
--- a/qcom/monaco-qupv3.dtsi
+++ b/qcom/monaco-qupv3.dtsi
@@ -69,7 +69,7 @@
 			<&bimc MASTER_AMPSS_M0 &config_noc SLAVE_QUP_0>,
 			<&system_noc MASTER_QUP_0 &bimc SLAVE_EBI_CH0>;
 			pinctrl-names = "default", "sleep";
-			pinctrl-0 = <&qupv3_se6_2uart_tx_active>, <&qupv3_se3_2uart_rx_active>;
+			pinctrl-0 = <&qupv3_se6_2uart_tx_active>, <&qupv3_se6_2uart_rx_active>;
 			pinctrl-1 = <&qupv3_se6_2uart_sleep>;
 			status = "disabled";
 		};