diff --git a/arch/arm64/configs/vendor/niobe_GKI.config b/arch/arm64/configs/vendor/niobe_GKI.config
index 788d5b580a8a..972d42bc4956 100644
--- a/arch/arm64/configs/vendor/niobe_GKI.config
+++ b/arch/arm64/configs/vendor/niobe_GKI.config
@@ -23,6 +23,7 @@ CONFIG_CORESIGHT_STM=m
 CONFIG_CORESIGHT_TGU=m
 CONFIG_CORESIGHT_TPDA=m
 CONFIG_CORESIGHT_TPDM=m
+CONFIG_CPU_IDLE_GOV_QCOM_LPM=m
 CONFIG_QTI_THERMALZONE_CONFIG_DEBUG=m
 CONFIG_EDAC_KRYO_ARM64=m
 # CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE is not set
@@ -115,6 +116,7 @@ CONFIG_QCOM_BWMON=m
 CONFIG_QCOM_CLK_RPMH=m
 CONFIG_QCOM_COMMAND_DB=m
 CONFIG_QCOM_CPUCP=m
+CONFIG_QCOM_CPUSS_SLEEP_STATS=m
 CONFIG_QCOM_CPU_VENDOR_HOOKS=m
 CONFIG_QCOM_DCC_V2=m
 CONFIG_QCOM_DCVS=m
@@ -183,6 +185,7 @@ CONFIG_QCOM_SOCINFO=m
 CONFIG_QCOM_SPMI_ADC5_GEN3=m
 CONFIG_QCOM_SPMI_TEMP_ALARM=m
 CONFIG_QCOM_SPSS=m
+CONFIG_QCOM_STATS=m
 CONFIG_QCOM_SYSMON=m
 CONFIG_QCOM_SYSMON_SUBSYSTEM_STATS=m
 CONFIG_QCOM_TSENS=m
@@ -222,6 +225,7 @@ 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_SYS_PM_VX=m
 # CONFIG_QTI_THERMAL_MINIDUMP is not set
 CONFIG_QTI_USERSPACE_CDEV=m
 CONFIG_REBOOT_MODE=m
diff --git a/arch/arm64/configs/vendor/niobe_consolidate.config b/arch/arm64/configs/vendor/niobe_consolidate.config
index 41ea5b77ccf5..ba8299bdbb09 100644
--- a/arch/arm64/configs/vendor/niobe_consolidate.config
+++ b/arch/arm64/configs/vendor/niobe_consolidate.config
@@ -3,6 +3,7 @@ CONFIG_CMA_DEBUG=y
 CONFIG_CMA_DEBUGFS=y
 CONFIG_CNSS2_DEBUG=y
 CONFIG_CORESIGHT_SOURCE_ETM4X=m
+CONFIG_CPU_IDLE_SIMPLE_GOV_QCOM_LPM=m
 CONFIG_DEBUG_PAGEALLOC=y
 CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y
 CONFIG_DEBUG_SPINLOCK=y
diff --git a/niobe.bzl b/niobe.bzl
index 6ba1a13b7303..68672ac14c14 100644
--- a/niobe.bzl
+++ b/niobe.bzl
@@ -28,6 +28,7 @@ def define_niobe():
         "drivers/clk/qcom/videocc-niobe.ko",
         "drivers/cpufreq/qcom-cpufreq-hw.ko",
         "drivers/cpufreq/qcom-cpufreq-hw-debug.ko",
+        "drivers/cpuidle/governors/qcom_lpm.ko",
         "drivers/dma-buf/heaps/qcom_dma_heaps.ko",
         "drivers/dma/qcom/bam_dma.ko",
         "drivers/dma/qcom/msm_gpi.ko",
@@ -151,10 +152,12 @@ def define_niobe():
         "drivers/soc/qcom/qcom_aoss.ko",
         "drivers/soc/qcom/qcom_cpu_vendor_hooks.ko",
         "drivers/soc/qcom/qcom_cpucp.ko",
+        "drivers/soc/qcom/qcom_cpuss_sleep_stats.ko",
         "drivers/soc/qcom/qcom_logbuf_boot_log.ko",
         "drivers/soc/qcom/qcom_logbuf_vendor_hooks.ko",
         "drivers/soc/qcom/qcom_ramdump.ko",
         "drivers/soc/qcom/qcom_rpmh.ko",
+        "drivers/soc/qcom/qcom_stats.ko",
         "drivers/soc/qcom/qcom_wdt_core.ko",
         "drivers/soc/qcom/qfprom-sys.ko",
         "drivers/soc/qcom/qmi_helpers.ko",
@@ -165,6 +168,7 @@ def define_niobe():
         "drivers/soc/qcom/smp2p_sleepstate.ko",
         "drivers/soc/qcom/socinfo.ko",
         "drivers/soc/qcom/sps/sps_drv.ko",
+        "drivers/soc/qcom/sys_pm_vx.ko",
         "drivers/soc/qcom/sysmon_subsystem_stats.ko",
         "drivers/soc/qcom/tmecom/tmecom-intf.ko",
         "drivers/spi/spi-msm-geni.ko",
@@ -213,6 +217,7 @@ def define_niobe():
 
     _niobe_consolidate_in_tree_modules = _niobe_in_tree_modules + [
         # keep sorted
+        "drivers/cpuidle/governors/qcom_simple_lpm.ko",
         "drivers/hwtracing/coresight/coresight-etm4x.ko",
         "drivers/misc/lkdtm/lkdtm.ko",
         "kernel/locking/locktorture.ko",