diff --git a/src/soc/qualcomm/calypso/include/soc/addressmap.h b/src/soc/qualcomm/calypso/include/soc/addressmap.h
index efabd6e059..b5a9eb9534 100644
--- a/src/soc/qualcomm/calypso/include/soc/addressmap.h
+++ b/src/soc/qualcomm/calypso/include/soc/addressmap.h
@@ -17,14 +17,14 @@
 #define GCC_QUPV3_WRAP2_BASE		0x11e004
 
 /* CALPYSO QSPI GPIO PINS */
-#define QSPI_CS				GPIO(0)
-#define QSPI_DATA_0			GPIO(0)
-#define QSPI_DATA_1			GPIO(0)
-#define QSPI_CLK			GPIO(0)
+#define QSPI_CS				GPIO(132)
+#define QSPI_DATA_0			GPIO(128)
+#define QSPI_DATA_1			GPIO(129)
+#define QSPI_CLK			GPIO(127)
 
-#define GPIO_FUNC_QSPI_DATA_0		0
-#define GPIO_FUNC_QSPI_DATA_1		0
-#define GPIO_FUNC_QSPI_CLK		0
+#define GPIO_FUNC_QSPI_DATA_0		GPIO128_FUNC_QSPI0_DATA_0
+#define GPIO_FUNC_QSPI_DATA_1		GPIO129_FUNC_QSPI0_DATA_1
+#define GPIO_FUNC_QSPI_CLK		GPIO127_FUNC_QSPI0_CLK
 
 /* QUP SERIAL ENGINE BASE ADDRESSES */
 /* QUPV3_0 */
@@ -63,7 +63,10 @@
 #define QUP_WRAP2_BASE			0x008C0000
 #define QUP_2_GSI_BASE			0x00804000
 
-/* QUPV3_3 - Dummy Entry */
+/* QUPV3_3 */
+#define QUP_SERIAL24_BASE		0x00780000
+#define QUP_SERIAL25_BASE		0x00784000
 #define QUP_WRAP3_BASE			0x007C0000
+#define QUP_3_GSI_BASE			0x00704000
 
 #endif /*  __SOC_QUALCOMM_CALYPSO_ADDRESS_MAP_H__ */
diff --git a/src/soc/qualcomm/calypso/include/soc/clock.h b/src/soc/qualcomm/calypso/include/soc/clock.h
index 3350ab6b26..a9d8b83f77 100644
--- a/src/soc/qualcomm/calypso/include/soc/clock.h
+++ b/src/soc/qualcomm/calypso/include/soc/clock.h
@@ -44,6 +44,8 @@ enum clk_qup {
 	QUP_WRAP2_S5,
 	QUP_WRAP2_S6,
 	QUP_WRAP2_S7,
+	QUP_WRAP3_S0,
+	QUP_WRAP3_S1,
 };
 
 /* Subsystem Reset */
diff --git a/src/soc/qualcomm/calypso/include/soc/gpio.h b/src/soc/qualcomm/calypso/include/soc/gpio.h
index 8954ebab1b..bec2f01604 100644
--- a/src/soc/qualcomm/calypso/include/soc/gpio.h
+++ b/src/soc/qualcomm/calypso/include/soc/gpio.h
@@ -16,9 +16,257 @@
 	GPIO##index##_FUNC_##func5 = (5), \
 	GPIO##index##_FUNC_##func6 = (6)
 
-/* TODO: update as per datasheet */
 enum {
-	PIN(0, QUP0_SE0_L0, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(0, QUP0_SE0_L0, IBI_I3C_QUP0_SE0_SDA, RES_3, RES_4, RES_5, RES_6),
+	PIN(1, QUP0_SE0_L1, IBI_I3C_QUP0_SE0_SCL, RES_3, RES_4, RES_5, RES_6),
+	PIN(2, QUP0_SE0_L2, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(3, QUP0_SE0_L3, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(4, QUP0_SE1_L0, QUP0_SE6_L2, IBI_I3C_QUP0_SE1_SDA, RES_4, RES_5, RES_6),
+	PIN(5, QUP0_SE1_L1, QUP0_SE6_L3, IBI_I3C_QUP0_SE1_SCL, RES_4, RES_5, RES_6),
+	PIN(6, QUP0_SE1_L2, QUP0_SE6_L0, I2C0_S_SDA, RES_4, RES_5, RES_6),
+	PIN(7, QUP0_SE1_L3, QUP0_SE6_L1, I2C0_S_SCL, RES_4, RES_5, RES_6),
+	PIN(8, QUP0_SE2_L0, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(9, QUP0_SE2_L1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(10, QUP0_SE2_L2, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(11, QUP0_SE2_L3, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(12, QUP0_SE3_L0, QUP0_SE7_L2, RES_3, RES_4, RES_5, RES_6),
+	PIN(13, QUP0_SE3_L1, QUP0_SE7_L3, RES_3, RES_4, RES_5, RES_6),
+	PIN(14, QUP0_SE3_L2, QUP0_SE7_L0, RES_3, RES_4, RES_5, RES_6),
+	PIN(15, QUP0_SE3_L3, QUP0_SE7_L1, RES_3, RES_4, RES_5, RES_6),
+	PIN(16, QUP0_SE4_L0, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(17, QUP0_SE4_L1, QUP0_SE2_L4, RES_3, RES_4, RES_5, RES_6),
+	PIN(18, QUP0_SE4_L2, QUP0_SE2_L5, RES_3, RES_4, QDSS_CTI_TRIG0_OUT_MIRB, RES_6),
+	PIN(19, QUP0_SE4_L3, QUP0_SE2_L6, RES_3, RES_4, QDSS_CTI_TRIG1_OUT_MIRB, RES_6),
+	PIN(20, QUP0_SE5_L0, GP_PDM_MIRB_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(21, QUP0_SE5_L1, QUP0_SE3_L4, GP_PDM_MIRB_1, RES_4, RES_5, RES_6),
+	PIN(22, QUP0_SE5_L2, QUP0_SE3_L5, GP_PDM_MIRB_0, RES_4, RES_5, RES_6),
+	PIN(23, QUP0_SE5_L3, QUP0_SE3_L6, RES_3, RES_4, QDSS_CTI_TRIG0_IN_MIRA, RES_6),
+	PIN(24, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(25, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(26, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(27, RES_1, RES_2, QDSS_CTI_TRIG1_IN_MIRA, RES_4, RES_5, RES_6),
+	PIN(28, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(29, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(30, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(31, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(32, QUP1_SE0_L0, IBI_I3C_QUP1_SE0_SDA, RES_3, RES_4, RES_5, RES_6),
+	PIN(33, QUP1_SE0_L1, IBI_I3C_QUP1_SE0_SCL, QUP1_SE3_L4, RES_4, RES_5, RES_6),
+	PIN(34, QUP1_SE0_L2, QUP1_SE3_L5, RES_3, RES_4, RES_5, RES_6),
+	PIN(35, QUP1_SE0_L3, QUP1_SE3_L6, RES_3, RES_4, RES_5, RES_6),
+	PIN(36, QUP1_SE1_L0, IBI_I3C_QUP1_SE1_SDA, RES_3, RES_4, RES_5, RES_6),
+	PIN(37, QUP1_SE1_L1, IBI_I3C_QUP1_SE1_SCL, RES_3, RES_4, RES_5, RES_6),
+	PIN(38, QUP1_SE1_L2, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(39, QUP1_SE1_L3, SYS_THROTTLE_N_MIRA, RES_3, RES_4, RES_5, RES_6),
+	PIN(40, QUP1_SE2_L0, QUP3_SE1_L0, RES_3, RES_4, RES_5, RES_6),
+	PIN(41, QUP1_SE2_L1, QUP3_SE1_L1, RES_3, RES_4, RES_5, RES_6),
+	PIN(42, QUP1_SE2_L2, QUP3_SE1_L2, RES_3, RES_4, RES_5, RES_6),
+	PIN(43, QUP1_SE2_L3, QUP3_SE1_L3, RES_3, RES_4, RES_5, RES_6),
+	PIN(44, QUP1_SE3_L0, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(45, QUP1_SE3_L1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(46, QUP1_SE3_L2, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(47, QUP1_SE3_L3, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(48, QUP1_SE4_L0, QUP3_SE1_L7, RES_3, RES_4, RES_5, RES_6),
+	PIN(49, QUP1_SE4_L1, QUP1_SE2_L4, QUP3_SE1_L4, RES_4, RES_5, RES_6),
+	PIN(50, QUP1_SE4_L2, QUP1_SE2_L5, QUP3_SE1_L5, RES_4, RES_5, RES_6),
+	PIN(51, QUP1_SE4_L3, QUP1_SE4_L4, QUP1_SE4_L5, RES_4, RES_5, RES_6),
+	PIN(52, QUP1_SE5_L0, QUP1_SE7_L2, RES_3, RES_4, RES_5, RES_6),
+	PIN(53, QUP1_SE5_L1, QUP1_SE7_L3, GP_MN, RES_4, RES_5, RES_6),
+	PIN(54, QUP1_SE5_L2, QUP1_SE7_L0, RES_3, RES_4, RES_5, RES_6),
+	PIN(55, QUP1_SE5_L3, QUP1_SE7_L1, RES_3, RES_4, RES_5, RES_6),
+	PIN(56, QUP1_SE6_L0, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(57, QUP1_SE6_L1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(58, QUP1_SE6_L2, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(59, QUP1_SE6_L3, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(60, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(61, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(62, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(63, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(64, QUP2_SE0_L0, IBI_I3C_QUP2_SE0_SDA, GCC_GP2_CLK_MIRB, RES_4, RES_5, RES_6),
+	PIN(65, QUP2_SE0_L1, QUP2_SE3_L4, IBI_I3C_QUP2_SE0_SCL, RES_4, RES_5, RES_6),
+	PIN(66, QUP2_SE0_L2, QUP2_SE3_L5, RES_3, RES_4, RES_5, RES_6),
+	PIN(67, QUP2_SE0_L3, QUP2_SE3_L6, RES_3, RES_4, RES_5, RES_6),
+	PIN(68, QUP2_SE1_L0, IBI_I3C_QUP2_SE1_SDA, RES_3, RES_4, RES_5, RES_6),
+	PIN(69, QUP2_SE1_L1, IBI_I3C_QUP2_SE1_SCL, RES_3, RES_4, RES_5, RES_6),
+	PIN(70, QUP2_SE1_L2, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(71, QUP2_SE1_L3, GCC_GP1_CLK_MIRB, RES_3, RES_4, RES_5, RES_6),
+	PIN(72, QUP2_SE2_L0, GCC_GP1_CLK_MIRA, RES_3, RES_4, RES_5, RES_6),
+	PIN(73, QUP2_SE2_L1, GCC_GP2_CLK_MIRA, RES_3, RES_4, RES_5, RES_6),
+	PIN(74, QUP2_SE2_L2, GCC_GP3_CLK_MIRA, RES_3, RES_4, RES_5, RES_6),
+	PIN(75, QUP2_SE2_L3, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(76, QUP2_SE3_L0, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(77, QUP2_SE3_L1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(78, QUP2_SE3_L2, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(79, QUP2_SE3_L3, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(80, QUP2_SE4_L0, QUP2_SE7_L0, RES_3, RES_4, RES_5, RES_6),
+	PIN(81, QUP2_SE4_L1, QUP2_SE2_L4, QUP2_SE7_L1, RES_4, RES_5, RES_6),
+	PIN(82, QUP2_SE4_L2, QUP2_SE2_L5, QUP2_SE7_L2, GCC_GP3_CLK_MIRB, RES_5, RES_6),
+	PIN(83, QUP2_SE4_L3, QUP2_SE2_L6, QUP2_SE7_L3, RES_4, RES_5, RES_6),
+	PIN(84, QUP2_SE5_L0, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(85, QUP2_SE5_L1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(86, QUP2_SE5_L2, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(87, QUP2_SE5_L3, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(88, QUP2_SE6_L0, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(89, QUP2_SE6_L1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(90, QUP2_SE6_L2, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(91, QUP2_SE6_L3, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(92, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(93, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(94, SYS_THROTTLE_N_MIRB, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(95, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(96, CAM_MCLK0, QDSS_GPIO_TRACEDATA_LOCA_0, RES_3, RES_4, RES_5, RES_6),
+	PIN(97, CAM_MCLK1, QDSS_GPIO_TRACEDATA_LOCA_1, RES_3, RES_4, RES_5, RES_6),
+	PIN(98, CAM_MCLK2, MDP_VSYNC_P, USB0_TMU_CLK_OUT, USB1_TMU_CLK_OUT, USB2_TMU_CLK_OUT, RES_6),
+	PIN(99, CAM_MCLK3, QDSS_GPIO_TRACEDATA_LOCA_3, RES_3, RES_4, RES_5, RES_6),
+	PIN(100, CAM_ASC_MCLK4, QDSS_GPIO_TRACEDATA_LOCA_4, RES_3, RES_4, RES_5, RES_6),
+	PIN(101, CCI_I2C_SDA0, QDSS_GPIO_TRACEDATA_LOCA_5, RES_3, RES_4, RES_5, RES_6),
+	PIN(102, CCI_I2C_SCL0, QDSS_GPIO_TRACEDATA_LOCA_6, RES_3, RES_4, RES_5, RES_6),
+	PIN(103, CCI_I2C_SDA1, QDSS_GPIO_TRACEDATA_LOCA_7, RES_3, RES_4, RES_5, RES_6),
+	PIN(104, CCI_I2C_SCL1, QDSS_GPIO_TRACECTL_LOCA, RES_3, RES_4, RES_5, RES_6),
+	PIN(105, CCI_I2C_SDA2, MDP_VSYNC_S, RES_3, RES_4, RES_5, RES_6),
+	PIN(106, CCI_I2C_SCL2, MDP_VSYNC_E, RES_3, RES_4, RES_5, RES_6),
+	PIN(107, QDSS_GPIO_TRACEDATA_LOCA_9, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(108, QDSS_GPIO_TRACEDATA_LOCA_10, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(109, CCI_TIMER0, MDP_VSYNC4_OUT, QDSS_GPIO_TRACEDATA_LOCA_11, RES_4, RES_5, RES_6),
+	PIN(110, CCI_TIMER1, MDP_VSYNC5_OUT, QDSS_GPIO_TRACEDATA_LOCA_12, RES_4, RES_5, RES_6),
+	PIN(111, CCI_TIMER2, CCI_ASYNC_IN2, MDP_VSYNC6_OUT, QDSS_GPIO_TRACEDATA_LOCA_13, RES_5, RES_6),
+	PIN(112, CCI_TIMER3, CCI_ASYNC_IN1, MDP_VSYNC7_OUT, QDSS_GPIO_TRACEDATA_LOCA_14, RES_5, RES_6),
+	PIN(113, CCI_TIMER4, CCI_ASYNC_IN0, MDP_VSYNC8_OUT, QDSS_GPIO_TRACEDATA_LOCA_15, RES_5, RES_6),
+	PIN(114, MDP_VSYNC0_OUT, MDP_VSYNC1_OUT, RES_3, RES_4, RES_5, RES_6),
+	PIN(115, MDP_VSYNC3_OUT, MDP_VSYNC2_OUT, RES_3, RES_4, RES_5, RES_6),
+	PIN(116, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(117, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(118, HOST2WLAN_SOL, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(119, EDP0_HOT_PLUG_DETECT, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(120, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(121, USB0_PHY_PS, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(122, USB0_DP_HOT_PLUG_DETECT, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(123, USB1_PHY_PS, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(124, USB1_DP_HOT_PLUG_DETECT, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(125, USB2_PHY_PS, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(126, USB2_DP_HOT_PLUG_DETECT, GP_PDM_MIRA_0, RES_3, RES_4, RES_5, RES_6),
+	PIN(127, QSPI0_CLK, SDC4_CLK, QUP3_SE0_L2, GP_PDM_MIRA_1, RES_5, RES_6),
+	PIN(128, QSPI0_DATA_0, SDC4_DATA_0, QUP3_SE0_L1, GP_PDM_MIRA_2, RES_5, RES_6),
+	PIN(129, QSPI0_DATA_1, SDC4_DATA_1, QUP3_SE0_L0, RES_4, RES_5, RES_6),
+	PIN(130, QSPI0_DATA_2, SDC4_DATA_2, QUP3_SE0_L4, RES_4, RES_5, RES_6),
+	PIN(131, QSPI0_DATA_3, SDC4_DATA_3, QUP3_SE0_L5, RES_4, RES_5, RES_6),
+	PIN(132, QSPI0_CS0_N, SDC4_CMD, QUP3_SE0_L3, RES_4, RES_5, RES_6),
+	PIN(133, QSPI0_CS1_N, RES_2, QUP3_SE0_L6, RES_4, RES_5, RES_6),
+	PIN(134, AUDIO_EXT_MCLK0, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(135, I2S0_SCK, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(136, I2S0_DATA0, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(137, I2S0_DATA1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(138, I2S0_WS, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(139, I2S1_SCK, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(140, I2S1_DATA0, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(141, I2S1_WS, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(142, I2S1_DATA1, AUDIO_EXT_MCLK1, AUDIO_REF_CLK, RES_4, RES_5, RES_6),
+	PIN(143, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(144, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(145, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(146, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(147, PCIE4_CLK_REQ_N, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(148, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(149, QDSS_GPIO_TRACEDATA_LOCA_2, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(150, PCIE6_CLK_REQ_N, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(151, QDSS_GPIO_TRACECLK_LOCA, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(152, QDSS_GPIO_TRACEDATA_LOCA_8, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(153, PCIE5_CLK_REQ_N, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(154, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(155, PCIE3_RST_N, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(156, PCIE3_CLK_REQ_N, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(157, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(158, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(159, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(160, RESOUT_GPIO_N, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(161, QDSS_CTI_TRIG0_OUT_MIRA, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(162, SD_WRITE_PROTECT, QDSS_CTI_TRIG1_OUT_MIRA, RES_3, RES_4, RES_5, RES_6),
+	PIN(163, USB0_SBRX, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(164, USB0_SBTX, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(165, USB0_SBTX_DIR_OUT, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(166, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(167, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(168, EUSB0_AC_EN, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(169, EUSB3_AC_EN, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(170, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(171, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(172, USB1_SBRX, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(173, USB1_SBTX, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(174, USB1_SBTX_DIR_OUT, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(175, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(176, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(177, EUSB1_AC_EN, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(178, EUSB6_AC_EN, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(179, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(180, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(181, USB2_SBRX, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(182, USB2_SBTX, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(183, USB2_SBTX_DIR_OUT, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(184, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(185, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(186, EUSB2_AC_EN, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(187, EUSB5_AC_EN, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(188, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(189, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(190, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(191, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(192, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(193, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(194, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(195, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(196, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(197, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(198, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(199, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(200, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(201, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(202, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(203, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(204, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(205, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(206, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(207, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(208, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(209, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(210, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(211, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(212, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(213, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(214, WCN_SW_CTRL, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(215, RES_1, QDSS_CTI_TRIG1_IN_MIRB, RES_3, RES_4, RES_5, RES_6),
+	PIN(216, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(217, RES_1, QDSS_CTI_TRIG0_IN_MIRB, RES_3, RES_4, RES_5, RES_6),
+	PIN(218, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(219, RES_1, QDSS_GPIO_TRACEDATA_LOCB_0, RES_3, RES_4, RES_5, RES_6),
+	PIN(220, RES_1, QDSS_GPIO_TRACEDATA_LOCB_1, RES_3, RES_4, RES_5, RES_6),
+	PIN(221, WCN_SW_CTRL_WL_CX, RES_2, QDSS_GPIO_TRACEDATA_LOCB_2, RES_4, RES_5, RES_6),
+	PIN(222, RES_1, QDSS_GPIO_TRACEDATA_LOCB_3, RES_3, RES_4, RES_5, RES_6),
+	PIN(223, RES_1, QDSS_GPIO_TRACEDATA_LOCB_4, RES_3, RES_4, RES_5, RES_6),
+	PIN(224, RES_1, QDSS_GPIO_TRACEDATA_LOCB_5, RES_3, RES_4, RES_5, RES_6),
+	PIN(225, RES_1, QDSS_GPIO_TRACEDATA_LOCB_6, RES_3, RES_4, RES_5, RES_6),
+	PIN(226, RES_1, QDSS_GPIO_TRACEDATA_LOCB_7, RES_3, RES_4, RES_5, RES_6),
+	PIN(227, RES_1, QDSS_GPIO_TRACECLK_LOCB, RES_3, RES_4, RES_5, RES_6),
+	PIN(228, RES_1, QDSS_GPIO_TRACECTL_LOCB, RES_3, RES_4, RES_5, RES_6),
+	PIN(229, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(230, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(231, QDSS_GPIO_TRACEDATA_LOCB_10, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(232, QDSS_GPIO_TRACEDATA_LOCB_11, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(233, QDSS_GPIO_TRACEDATA_LOCB_12, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(234, QDSS_GPIO_TRACEDATA_LOCB_13, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(235, ASC_CCI_I2C_SDA3, QDSS_GPIO_TRACEDATA_LOCB_14, RES_3, RES_4, RES_5, RES_6),
+	PIN(236, ASC_CCI_I2C_SCL3, QDSS_GPIO_TRACEDATA_LOCB_15, RES_3, RES_4, RES_5, RES_6),
+	PIN(237, QDSS_GPIO_TRACEDATA_LOCB_8, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(238, QDSS_GPIO_TRACEDATA_LOCB_9, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(239, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(240, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(241, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(242, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(243, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(244, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(245, SMB_ACOK_N, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(246, RES_1, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(247, QUP3_SE0_L7, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(248, PMC_UVA_N, RES_2, RES_3, RES_4, RES_5, RES_6),
+	PIN(249, PMC_OCA_N, RES_2, RES_3, RES_4, RES_5, RES_6),
 };
 
 #endif /* __SOC_QUALCOMM_CALYPSO_GPIO_H__ */
diff --git a/src/soc/qualcomm/calypso/include/soc/qcom_qup_se.h b/src/soc/qualcomm/calypso/include/soc/qcom_qup_se.h
index d0313ca295..6e5711d3ba 100644
--- a/src/soc/qualcomm/calypso/include/soc/qcom_qup_se.h
+++ b/src/soc/qualcomm/calypso/include/soc/qcom_qup_se.h
@@ -10,7 +10,6 @@
 #include <timer.h>
 #include <types.h>
 
-/* TODO: update as per datasheet */
 enum qup_se {
 	QUPV3_0_SE0,
 	QUPV3_0_SE1,
@@ -36,6 +35,8 @@ enum qup_se {
 	QUPV3_2_SE5,
 	QUPV3_2_SE6,
 	QUPV3_2_SE7,
+	QUPV3_3_SE0,
+	QUPV3_3_SE1,
 	QUPV3_SE_MAX,
 };
 
diff --git a/src/soc/qualcomm/calypso/include/soc/uart.h b/src/soc/qualcomm/calypso/include/soc/uart.h
index 362f8853fd..1684b9ba12 100644
--- a/src/soc/qualcomm/calypso/include/soc/uart.h
+++ b/src/soc/qualcomm/calypso/include/soc/uart.h
@@ -4,6 +4,6 @@
 #define __SOC_QUALCOMM_CALYPSO_UART_TX_H__
 
 /* TODO: update as per datasheet */
-#define UART_TX_PIN GPIO(0)
+#define UART_TX_PIN GPIO(86)
 
 #endif /* __SOC_QUALCOMM_CALYPSO_UART_TX_H__ */
diff --git a/src/soc/qualcomm/calypso/qcom_qup_se.c b/src/soc/qualcomm/calypso/qcom_qup_se.c
index df1335c72a..53ae41f5fd 100644
--- a/src/soc/qualcomm/calypso/qcom_qup_se.c
+++ b/src/soc/qualcomm/calypso/qcom_qup_se.c
@@ -2,7 +2,135 @@
 
 #include <soc/qcom_qup_se.h>
 
-/* TODO: update QUP entries as per datasheet */
 struct qup qup[QUPV3_SE_MAX] = {
-
+	[QUPV3_0_SE0] = { .regs = (void *)QUP_SERIAL0_BASE,
+		.pin = { GPIO(0), GPIO(1), GPIO(2), GPIO(3) },
+		.func = { GPIO0_FUNC_QUP0_SE0_L0, GPIO1_FUNC_QUP0_SE0_L1,
+			GPIO2_FUNC_QUP0_SE0_L2, GPIO3_FUNC_QUP0_SE0_L3 }
+		},
+	[QUPV3_0_SE1] = { .regs = (void *)QUP_SERIAL1_BASE,
+		.pin = { GPIO(4), GPIO(5), GPIO(6), GPIO(7) },
+		.func = { GPIO4_FUNC_QUP0_SE1_L0, GPIO5_FUNC_QUP0_SE1_L1,
+			GPIO6_FUNC_QUP0_SE1_L2, GPIO7_FUNC_QUP0_SE1_L3 }
+		},
+	[QUPV3_0_SE2] = { .regs = (void *)QUP_SERIAL2_BASE,
+		.pin = { GPIO(8), GPIO(9), GPIO(10), GPIO(11) },
+		.func = { GPIO8_FUNC_QUP0_SE2_L0, GPIO9_FUNC_QUP0_SE2_L1,
+			GPIO10_FUNC_QUP0_SE2_L2, GPIO11_FUNC_QUP0_SE2_L3 }
+		},
+	[QUPV3_0_SE3] = { .regs = (void *)QUP_SERIAL3_BASE,
+		.pin = { GPIO(12), GPIO(13), GPIO(14), GPIO(15) },
+		.func = { GPIO12_FUNC_QUP0_SE3_L0, GPIO13_FUNC_QUP0_SE3_L1,
+			GPIO14_FUNC_QUP0_SE3_L2, GPIO15_FUNC_QUP0_SE3_L3 }
+		},
+	[QUPV3_0_SE4] = { .regs = (void *)QUP_SERIAL4_BASE,
+		.pin = { GPIO(16), GPIO(17), GPIO(18), GPIO(19) },
+		.func = { GPIO16_FUNC_QUP0_SE4_L0, GPIO17_FUNC_QUP0_SE4_L1,
+			GPIO18_FUNC_QUP0_SE4_L2, GPIO19_FUNC_QUP0_SE4_L3 }
+		},
+	[QUPV3_0_SE5] = { .regs = (void *)QUP_SERIAL5_BASE,
+		.pin = { GPIO(20), GPIO(21), GPIO(22), GPIO(23) },
+		.func = { GPIO20_FUNC_QUP0_SE5_L0, GPIO21_FUNC_QUP0_SE5_L1,
+			GPIO22_FUNC_QUP0_SE5_L2, GPIO23_FUNC_QUP0_SE5_L3 }
+		},
+	[QUPV3_0_SE6] = { .regs = (void *)QUP_SERIAL6_BASE,
+		.pin = { GPIO(6), GPIO(7), GPIO(4), GPIO(5) },
+		.func = { GPIO6_FUNC_QUP0_SE6_L0, GPIO7_FUNC_QUP0_SE6_L1,
+			GPIO4_FUNC_QUP0_SE6_L2, GPIO5_FUNC_QUP0_SE6_L3 }
+		},
+	[QUPV3_0_SE7] = { .regs = (void *)QUP_SERIAL7_BASE,
+		.pin = { GPIO(14), GPIO(15), GPIO(12), GPIO(13) },
+		.func = { GPIO14_FUNC_QUP0_SE7_L0, GPIO15_FUNC_QUP0_SE7_L1,
+			GPIO12_FUNC_QUP0_SE7_L2, GPIO13_FUNC_QUP0_SE7_L3 }
+		},
+	[QUPV3_1_SE0] = { .regs = (void *)QUP_SERIAL8_BASE,
+		.pin = { GPIO(32), GPIO(33), GPIO(34), GPIO(35) },
+		.func = { GPIO32_FUNC_QUP1_SE0_L0, GPIO33_FUNC_QUP1_SE0_L1,
+			GPIO34_FUNC_QUP1_SE0_L2, GPIO35_FUNC_QUP1_SE0_L3 }
+		},
+	[QUPV3_1_SE1] = { .regs = (void *)QUP_SERIAL9_BASE,
+		.pin = { GPIO(36), GPIO(37), GPIO(38), GPIO(39) },
+		.func = { GPIO36_FUNC_QUP1_SE1_L0, GPIO37_FUNC_QUP1_SE1_L1,
+			GPIO38_FUNC_QUP1_SE1_L2, GPIO39_FUNC_QUP1_SE1_L3 }
+		},
+	[QUPV3_1_SE2] = { .regs = (void *)QUP_SERIAL10_BASE,
+		.pin = { GPIO(40), GPIO(41), GPIO(42), GPIO(43) },
+		.func = { GPIO40_FUNC_QUP1_SE2_L0, GPIO41_FUNC_QUP1_SE2_L1,
+			GPIO42_FUNC_QUP1_SE2_L2, GPIO43_FUNC_QUP1_SE2_L3 }
+		},
+	[QUPV3_1_SE3] = { .regs = (void *)QUP_SERIAL11_BASE,
+		.pin = { GPIO(44), GPIO(45), GPIO(46), GPIO(47) },
+		.func = { GPIO44_FUNC_QUP1_SE3_L0, GPIO45_FUNC_QUP1_SE3_L1,
+			GPIO46_FUNC_QUP1_SE3_L2, GPIO47_FUNC_QUP1_SE3_L3 }
+		},
+	[QUPV3_1_SE4] = { .regs = (void *)QUP_SERIAL12_BASE,
+		.pin = { GPIO(48), GPIO(49), GPIO(50), GPIO(51) },
+		.func = { GPIO48_FUNC_QUP1_SE4_L0, GPIO49_FUNC_QUP1_SE4_L1,
+			GPIO50_FUNC_QUP1_SE4_L2, GPIO51_FUNC_QUP1_SE4_L3 }
+		},
+	[QUPV3_1_SE5] = { .regs = (void *)QUP_SERIAL13_BASE,
+		.pin = { GPIO(52), GPIO(53), GPIO(54), GPIO(55) },
+		.func = { GPIO52_FUNC_QUP1_SE5_L0, GPIO53_FUNC_QUP1_SE5_L1,
+			GPIO54_FUNC_QUP1_SE5_L2, GPIO55_FUNC_QUP1_SE5_L3 }
+		},
+	[QUPV3_1_SE6] = { .regs = (void *)QUP_SERIAL14_BASE,
+		.pin = { GPIO(56), GPIO(57), GPIO(58), GPIO(59) },
+		.func = { GPIO56_FUNC_QUP1_SE6_L0, GPIO57_FUNC_QUP1_SE6_L1,
+			GPIO58_FUNC_QUP1_SE6_L2, GPIO59_FUNC_QUP1_SE6_L3 }
+		},
+	[QUPV3_1_SE7] = { .regs = (void *)QUP_SERIAL15_BASE,
+		.pin = { GPIO(54), GPIO(55), GPIO(52), GPIO(53) },
+		.func = { GPIO54_FUNC_QUP1_SE7_L0, GPIO55_FUNC_QUP1_SE7_L1,
+			GPIO52_FUNC_QUP1_SE7_L2, GPIO53_FUNC_QUP1_SE7_L3 }
+		},
+	[QUPV3_2_SE0] = { .regs = (void *)QUP_SERIAL16_BASE,
+		.pin = { GPIO(64), GPIO(65), GPIO(66), GPIO(67) },
+		.func = { GPIO64_FUNC_QUP2_SE0_L0, GPIO65_FUNC_QUP2_SE0_L1,
+			GPIO66_FUNC_QUP2_SE0_L2, GPIO67_FUNC_QUP2_SE0_L3 }
+		},
+	[QUPV3_2_SE1] = { .regs = (void *)QUP_SERIAL17_BASE,
+		.pin = { GPIO(68), GPIO(69), GPIO(70), GPIO(71) },
+		.func = { GPIO68_FUNC_QUP2_SE1_L0, GPIO69_FUNC_QUP2_SE1_L1,
+			GPIO70_FUNC_QUP2_SE1_L2, GPIO71_FUNC_QUP2_SE1_L3 }
+		},
+	[QUPV3_2_SE2] = { .regs = (void *)QUP_SERIAL18_BASE,
+		.pin = { GPIO(72), GPIO(73), GPIO(74), GPIO(75) },
+		.func = { GPIO72_FUNC_QUP2_SE2_L0, GPIO73_FUNC_QUP2_SE2_L1,
+			GPIO74_FUNC_QUP2_SE2_L2, GPIO75_FUNC_QUP2_SE2_L3 }
+		},
+	[QUPV3_2_SE3] = { .regs = (void *)QUP_SERIAL19_BASE,
+		.pin = { GPIO(76), GPIO(77), GPIO(78), GPIO(79) },
+		.func = { GPIO76_FUNC_QUP2_SE3_L0, GPIO77_FUNC_QUP2_SE3_L1,
+			GPIO78_FUNC_QUP2_SE3_L2, GPIO79_FUNC_QUP2_SE3_L3 }
+		},
+	[QUPV3_2_SE4] = { .regs = (void *)QUP_SERIAL20_BASE,
+		.pin = { GPIO(80), GPIO(81), GPIO(82), GPIO(83) },
+		.func = { GPIO80_FUNC_QUP2_SE4_L0, GPIO81_FUNC_QUP2_SE4_L1,
+			GPIO82_FUNC_QUP2_SE4_L2, GPIO83_FUNC_QUP2_SE4_L3 }
+		},
+	[QUPV3_2_SE5] = { .regs = (void *)QUP_SERIAL21_BASE,
+		.pin = { GPIO(84), GPIO(85), GPIO(86), GPIO(87) },
+		.func = { GPIO84_FUNC_QUP2_SE5_L0, GPIO85_FUNC_QUP2_SE5_L1,
+			GPIO86_FUNC_QUP2_SE5_L2, GPIO87_FUNC_QUP2_SE5_L3 }
+		},
+	[QUPV3_2_SE6] = { .regs = (void *)QUP_SERIAL22_BASE,
+		.pin = { GPIO(88), GPIO(89), GPIO(90), GPIO(91) },
+		.func = { GPIO88_FUNC_QUP2_SE6_L0, GPIO89_FUNC_QUP2_SE6_L1,
+			GPIO90_FUNC_QUP2_SE6_L2, GPIO91_FUNC_QUP2_SE6_L3 }
+		},
+	[QUPV3_2_SE7] = { .regs = (void *)QUP_SERIAL23_BASE,
+		.pin = { GPIO(80), GPIO(81), GPIO(82), GPIO(83) },
+		.func = { GPIO80_FUNC_QUP2_SE7_L0, GPIO81_FUNC_QUP2_SE7_L1,
+			GPIO82_FUNC_QUP2_SE7_L2, GPIO83_FUNC_QUP2_SE7_L3 }
+		},
+	[QUPV3_3_SE0] = { .regs = (void *)QUP_SERIAL24_BASE,
+		.pin = { GPIO(129), GPIO(128), GPIO(127), GPIO(132) },
+		.func = { GPIO129_FUNC_QUP3_SE0_L0, GPIO128_FUNC_QUP3_SE0_L1,
+			GPIO127_FUNC_QUP3_SE0_L2, GPIO132_FUNC_QUP3_SE0_L3 }
+		},
+	[QUPV3_3_SE1] = { .regs = (void *)QUP_SERIAL25_BASE,
+		.pin = { GPIO(40), GPIO(41), GPIO(42), GPIO(43) },
+		.func = { GPIO40_FUNC_QUP3_SE1_L0, GPIO41_FUNC_QUP3_SE1_L1,
+			GPIO42_FUNC_QUP3_SE1_L2, GPIO43_FUNC_QUP3_SE1_L3 }
+		},
 };