diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index baba41ee2517..76eae1d07dea 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -125,6 +125,15 @@ config QCOM_GENI_MINICORE
 	help
 	  Enable support for minicores in Qualcomm GENI and its peripherals.
 
+config QCOM_GENI_FW_LOAD
+	bool "Load Qualcomm GENI peripheral firmware at late init"
+	depends on QCOM_GENI
+	default y
+	help
+	  Load firmware for GENI peripherals from the firmware partition
+	  at late init. Disable if no GENI peripheral needs firmware
+	  loading.
+
 config ROCKCHIP_EFUSE
 	bool "Rockchip e-fuse support"
 	depends on MISC
diff --git a/drivers/misc/qcom_geni.c b/drivers/misc/qcom_geni.c
index f3133f858858..f3cba695f103 100644
--- a/drivers/misc/qcom_geni.c
+++ b/drivers/misc/qcom_geni.c
@@ -626,7 +626,9 @@ static int qcom_geni_fw_initialise(void)
 	return 0;
 }
 
+#if IS_ENABLED(CONFIG_QCOM_GENI_FW_LOAD)
 EVENT_SPY_SIMPLE(EVT_LAST_STAGE_INIT, qcom_geni_fw_initialise);
+#endif
 
 static const struct udevice_id geni_ids[] = {
 	{ .compatible = "qcom,geni-se-qup" },