diff --git a/arch/arm64/configs/vendor/niobe_GKI.config b/arch/arm64/configs/vendor/niobe_GKI.config
index b006e87e1ebf..67854b2602ee 100644
--- a/arch/arm64/configs/vendor/niobe_GKI.config
+++ b/arch/arm64/configs/vendor/niobe_GKI.config
@@ -38,6 +38,7 @@ CONFIG_GH_VIRT_WATCHDOG=m
 CONFIG_GIC_INTERRUPT_ROUTING=m
 CONFIG_GUNYAH_DRIVERS=y
 CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_INPUT_PM8941_PWRKEY=m
 CONFIG_INTERCONNECT_QCOM_BCM_VOTER=m
 CONFIG_INTERCONNECT_QCOM_DEBUG=m
 CONFIG_INTERCONNECT_QCOM_NIOBE=m
@@ -50,10 +51,13 @@ CONFIG_IOMMU_IO_PGTABLE_FAST=y
 CONFIG_IPA3=m
 CONFIG_IPC_LOGGING=m
 CONFIG_IPC_LOG_MINIDUMP_BUFFERS=16
+CONFIG_LEDS_QTI_FLASH=m
+CONFIG_LEDS_QTI_TRI_LED=m
 CONFIG_LOCALVERSION="-gki"
 CONFIG_MAC80211=m
 CONFIG_MAX31760_FAN_CONTROLLER=m
 CONFIG_MEM_SHARE_QMI_SERVICE=m
+CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_MISC=y
 CONFIG_MHI_SATELLITE=m
@@ -66,6 +70,7 @@ CONFIG_MSM_QMP=m
 CONFIG_MSM_TMECOM_QMP=m
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NVMEM_QCOM_QFPROM=m
+CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_PCI_MSM=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_UFS_QRBTC_SDM845=m
@@ -78,8 +83,11 @@ CONFIG_PHY_QCOM_UFS_V4=m
 # CONFIG_PHY_QCOM_UFS_V4_WAIPIO is not set
 CONFIG_PINCTRL_MSM=m
 CONFIG_PINCTRL_NIOBE=m
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 CONFIG_POWER_RESET_QCOM_DOWNLOAD_MODE=m
 CONFIG_POWER_RESET_QCOM_DOWNLOAD_MODE_DEFAULT=y
+CONFIG_POWER_RESET_QCOM_PON=m
+CONFIG_PWM_QTI_LPG=m
 CONFIG_QCOM_AOSS_QMP=m
 CONFIG_QCOM_BWMON=m
 CONFIG_QCOM_CLK_RPMH=m
@@ -116,6 +124,7 @@ CONFIG_QCOM_MEMORY_DUMP_V2=m
 CONFIG_QCOM_MEM_BUF=m
 CONFIG_QCOM_MEM_BUF_DEV=m
 CONFIG_QCOM_PDC=m
+CONFIG_QCOM_PDR_HELPERS=m
 CONFIG_QCOM_PIL_INFO=m
 CONFIG_QCOM_PMU_LIB=m
 CONFIG_QCOM_Q6V5_COMMON=m
@@ -131,10 +140,13 @@ CONFIG_QCOM_SMEM=m
 CONFIG_QCOM_SMP2P=m
 CONFIG_QCOM_SOCINFO=m
 # CONFIG_QCOM_SOC_WATCHDOG is not set
+CONFIG_QCOM_SPMI_ADC5_GEN3=m
+CONFIG_QCOM_SPMI_TEMP_ALARM=m
 # CONFIG_QCOM_SPSS is not set
 CONFIG_QCOM_SYSMON=m
 CONFIG_QCOM_SYSMON_SUBSYSTEM_STATS=m
 CONFIG_QCOM_TSENS=m
+CONFIG_QCOM_VADC_COMMON=m
 CONFIG_QCOM_WATCHDOG_BARK_TIME=11000
 CONFIG_QCOM_WATCHDOG_IPI_PING=y
 CONFIG_QCOM_WATCHDOG_PET_TIME=9360
@@ -146,9 +158,13 @@ CONFIG_QRTR=m
 CONFIG_QRTR_NODE_ID=1
 CONFIG_QRTR_SMD=m
 CONFIG_QRTR_WAKEUP_MS=0
+CONFIG_QTI_ALTMODE_GLINK=m
+CONFIG_QTI_BATTERY_CHARGER=m
+CONFIG_QTI_BATTERY_GLINK_DEBUG=m
 CONFIG_QTI_BCL_PMIC5=m
 CONFIG_QTI_BCL_SOC_DRIVER=m
 CONFIG_QTI_C1DCVS_SCMI_V2=m
+CONFIG_QTI_CHARGER_ULOG_GLINK=m
 CONFIG_QTI_CPUCP_LOG=m
 CONFIG_QTI_CPUFREQ_CDEV=m
 CONFIG_QTI_CPUFREQ_STATS_SCMI_V2=m
@@ -157,19 +173,32 @@ CONFIG_QTI_CPU_PAUSE_COOLING_DEVICE=m
 CONFIG_QTI_DDR_COOLING_DEVICE=m
 CONFIG_QTI_DEVFREQ_CDEV=m
 CONFIG_QTI_IOMMU_SUPPORT=m
+CONFIG_QTI_PMIC_GLINK=m
+CONFIG_QTI_PMIC_GLINK_DEBUG=m
+CONFIG_QTI_PMIC_PON_LOG=m
 CONFIG_QTI_QCOM_SCMI_CLIENT=m
 CONFIG_QTI_QMI_COOLING_DEVICE=m
 # CONFIG_QTI_QMI_SENSOR is not set
 CONFIG_QTI_SCMI_VENDOR_PROTOCOL=m
 CONFIG_QTI_USERSPACE_CDEV=m
+CONFIG_REBOOT_MODE=m
+CONFIG_REGMAP_QTI_DEBUGFS=m
+CONFIG_REGULATOR_DEBUG_CONTROL=m
+CONFIG_REGULATOR_PROXY_CONSUMER=m
+CONFIG_REGULATOR_QTI_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_QTI_OCP_NOTIFIER=m
+CONFIG_REGULATOR_RPMH=m
 CONFIG_REGULATOR_STUB=m
 CONFIG_RPMSG_QCOM_GLINK=m
 # CONFIG_RPMSG_QCOM_GLINK_DEBUG is not set
 CONFIG_RPMSG_QCOM_GLINK_SMEM=m
 CONFIG_RPMSG_QCOM_GLINK_SPSS=m
 CONFIG_RPMSG_QCOM_SMD=m
+CONFIG_RTC_DRV_PM8XXX=m
 CONFIG_SCSI_UFS_QCOM=m
 # CONFIG_SND_USB_AUDIO_QMI is not set
+CONFIG_SPMI_MSM_PMIC_ARB=m
+CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=m
 CONFIG_STM=m
 CONFIG_STM_PROTO_OST=m
 CONFIG_STM_PROTO_SYS_T=m
@@ -182,6 +211,7 @@ CONFIG_SXR_GCC_NIOBE=m
 CONFIG_SXR_GPUCC_NIOBE=m
 CONFIG_SXR_TCSRCC_NIOBE=m
 CONFIG_SXR_VIDEOCC_NIOBE=m
+CONFIG_UCSI_QTI_GLINK=m
 CONFIG_USB_CONFIGFS_F_QDSS=m
 CONFIG_USB_DWC3_MSM=m
 CONFIG_USB_F_QDSS=m
diff --git a/arch/arm64/configs/vendor/niobe_consolidate.config b/arch/arm64/configs/vendor/niobe_consolidate.config
index 19a40b13c253..8fba40d07a9f 100644
--- a/arch/arm64/configs/vendor/niobe_consolidate.config
+++ b/arch/arm64/configs/vendor/niobe_consolidate.config
@@ -14,7 +14,9 @@ CONFIG_LKDTM=m
 CONFIG_LOCALVERSION="-consolidate"
 CONFIG_LOCK_TORTURE_TEST=m
 CONFIG_PAGE_OWNER=y
+CONFIG_QTI_PMIC_GLINK_CLIENT_DEBUG=y
 CONFIG_RCU_TORTURE_TEST=m
+CONFIG_REGMAP_QTI_DEBUGFS_ALLOW_WRITE=y
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_TEST_USER_COPY=m
 CONFIG_UFS_DBG=y
diff --git a/modules.list.msm.niobe b/modules.list.msm.niobe
index fbbda79f9e20..64de99994264 100644
--- a/modules.list.msm.niobe
+++ b/modules.list.msm.niobe
@@ -30,6 +30,10 @@ qcom_cpucp.ko
 qcom_llcc_pmu.ko
 qcom_scmi_client.ko
 qcom_scmi_vendor.ko
+debug-regulator.ko
+proxy-consumer.ko
+qti-fixed-regulator.ko
+rpmh-regulator.ko
 gdsc-regulator.ko
 stub-regulator.ko
 pinctrl-msm.ko
@@ -40,6 +44,13 @@ socinfo.ko
 qcom-ipcc.ko
 phy-qcom-ufs.ko
 phy-qcom-ufs-qrbtc-sdm845.ko
+spmi-pmic-arb.ko
+regmap-spmi.ko
+qti-regmap-debugfs.ko
+qcom-spmi-pmic.ko
+nvmem_qcom-spmi-sdam.ko
+rtc-pm8xxx.ko
+pmic-pon-log.ko
 ufs_qcom.ko
 llcc-qcom.ko
 gcc-niobe.ko
diff --git a/niobe.bzl b/niobe.bzl
index cdd0afd9eab9..7bb3ba02eba1 100644
--- a/niobe.bzl
+++ b/niobe.bzl
@@ -8,6 +8,7 @@ def define_niobe():
     _niobe_in_tree_modules = [
         # keep sorted
         # TODO: Need to add GKI modules
+        "drivers/base/regmap/qti-regmap-debugfs.ko",
         "drivers/bus/mhi/devices/mhi_dev_satellite.ko",
         "drivers/bus/mhi/devices/mhi_dev_uci.ko",
         "drivers/bus/mhi/host/mhi.ko",
@@ -50,6 +51,9 @@ def define_niobe():
         "drivers/hwtracing/stm/stm_ftrace.ko",
         "drivers/hwtracing/stm/stm_p_ost.ko",
         "drivers/hwtracing/stm/stm_p_sys-t.ko",
+        "drivers/iio/adc/qcom-spmi-adc5-gen3.ko",
+        "drivers/iio/adc/qcom-vadc-common.ko",
+        "drivers/input/misc/pm8941-pwrkey.ko",
         "drivers/interconnect/icc-test.ko",
         "drivers/interconnect/qcom/icc-bcm-voter.ko",
         "drivers/interconnect/qcom/icc-debug.ko",
@@ -62,8 +66,12 @@ def define_niobe():
         "drivers/iommu/qcom_iommu_debug.ko",
         "drivers/iommu/qcom_iommu_util.ko",
         "drivers/irqchip/qcom-pdc.ko",
+        "drivers/leds/leds-qti-flash.ko",
+        "drivers/leds/leds-qti-tri-led.ko",
         "drivers/mailbox/msm_qmp.ko",
         "drivers/mailbox/qcom-ipcc.ko",
+        "drivers/mfd/qcom-spmi-pmic.ko",
+        "drivers/nvmem/nvmem_qcom-spmi-sdam.ko",
         "drivers/nvmem/nvmem_qfprom.ko",
         "drivers/pci/controller/pci-msm-drv.ko",
         "drivers/perf/qcom_llcc_pmu.ko",
@@ -72,7 +80,18 @@ def define_niobe():
         "drivers/phy/qualcomm/phy-qcom-ufs-qrbtc-sdm845.ko",
         "drivers/pinctrl/qcom/pinctrl-msm.ko",
         "drivers/pinctrl/qcom/pinctrl-niobe.ko",
+        "drivers/pinctrl/qcom/pinctrl-spmi-gpio.ko",
+        "drivers/pinctrl/qcom/pinctrl-spmi-mpp.ko",
         "drivers/power/reset/qcom-dload-mode.ko",
+        "drivers/power/reset/qcom-pon.ko",
+        "drivers/power/reset/reboot-mode.ko",
+        "drivers/power/supply/qti_battery_charger.ko",
+        "drivers/pwm/pwm-qti-lpg.ko",
+        "drivers/regulator/debug-regulator.ko",
+        "drivers/regulator/proxy-consumer.ko",
+        "drivers/regulator/qti-fixed-regulator.ko",
+        "drivers/regulator/qti-ocp-notifier.ko",
+        "drivers/regulator/rpmh-regulator.ko",
         "drivers/regulator/stub-regulator.ko",
         "drivers/remoteproc/qcom_pil_info.ko",
         "drivers/remoteproc/qcom_q6v5.ko",
@@ -84,7 +103,10 @@ def define_niobe():
         "drivers/rpmsg/qcom_glink_smem.ko",
         "drivers/rpmsg/qcom_glink_spss.ko",
         "drivers/rpmsg/qcom_smd.ko",
+        "drivers/rtc/rtc-pm8xxx.ko",
+        "drivers/soc/qcom/altmode-glink.ko",
         "drivers/soc/qcom/boot_stats.ko",
+        "drivers/soc/qcom/charger-ulog-glink.ko",
         "drivers/soc/qcom/cmd-db.ko",
         "drivers/soc/qcom/core_hang_detect.ko",
         "drivers/soc/qcom/cpucp_log.ko",
@@ -105,23 +127,31 @@ def define_niobe():
         "drivers/soc/qcom/memory_dump_v2.ko",
         "drivers/soc/qcom/memshare/heap_mem_ext_v01.ko",
         "drivers/soc/qcom/memshare/msm_memshare.ko",
+        "drivers/soc/qcom/pdr_interface.ko",
+        "drivers/soc/qcom/pmic-glink-debug.ko",
+        "drivers/soc/qcom/pmic-pon-log.ko",
+        "drivers/soc/qcom/pmic_glink.ko",
         "drivers/soc/qcom/qcom_aoss.ko",
         "drivers/soc/qcom/qcom_cpucp.ko",
         "drivers/soc/qcom/qcom_ramdump.ko",
         "drivers/soc/qcom/qcom_rpmh.ko",
         "drivers/soc/qcom/qcom_wdt_core.ko",
         "drivers/soc/qcom/qmi_helpers.ko",
+        "drivers/soc/qcom/qti_battery_debug.ko",
         "drivers/soc/qcom/secure_buffer.ko",
         "drivers/soc/qcom/smem.ko",
         "drivers/soc/qcom/smp2p.ko",
         "drivers/soc/qcom/socinfo.ko",
         "drivers/soc/qcom/sysmon_subsystem_stats.ko",
         "drivers/soc/qcom/tmecom/tmecom-intf.ko",
+        "drivers/spmi/spmi-pmic-arb.ko",
+        "drivers/spmi/spmi-pmic-arb-debug.ko",
         "drivers/thermal/qcom/bcl_pmic5.ko",
         "drivers/thermal/qcom/bcl_soc.ko",
         "drivers/thermal/qcom/cpu_hotplug.ko",
         "drivers/thermal/qcom/ddr_cdev.ko",
         "drivers/thermal/qcom/max31760_fan.ko",
+        "drivers/thermal/qcom/qcom-spmi-temp-alarm.ko",
         "drivers/thermal/qcom/qcom_tsens.ko",
         "drivers/thermal/qcom/qti_cpufreq_cdev.ko",
         "drivers/thermal/qcom/qti_devfreq_cdev.ko",
@@ -134,6 +164,7 @@ def define_niobe():
         "drivers/usb/gadget/function/usb_f_qdss.ko",
         "drivers/usb/phy/phy-generic.ko",
         "drivers/usb/phy/phy-qcom-emu.ko",
+        "drivers/usb/typec/ucsi/ucsi_glink.ko",
         "drivers/virt/gunyah/gh_virt_wdt.ko",
         "kernel/trace/qcom_ipc_logging.ko",
         "net/mac80211/mac80211.ko",