diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config
index 9bba3ff2102d..422d5096b672 100644
--- a/arch/arm64/configs/vendor/lahaina_debug.config
+++ b/arch/arm64/configs/vendor/lahaina_debug.config
@@ -10,3 +10,7 @@ CONFIG_TEST_USER_COPY=m
 CONFIG_PAGE_POISONING_ENABLE_DEFAULT=y
 CONFIG_OF_RESERVED_MEM_CHECK=y
 CONFIG_QTEE_SHM_BRIDGE=y
+CONFIG_SERIAL_MSM_GENI=y
+CONFIG_SERIAL_MSM_GENI_CONSOLE=y
+CONFIG_MSM_GENI_SE=y
+CONFIG_SERIAL_MSM_GENI_HALF_SAMPLING=y
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 7c179142a935..3ec80e46aa20 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -986,6 +986,15 @@ config SERIAL_MSM_GENI_CONSOLE
 	    Serial console driver for Qualcomm Technologies Inc's GENI based
 	    QUP hardware.
 
+config SERIAL_MSM_GENI_HALF_SAMPLING
+	bool "Changes clock divider which impacts sampling rate for QUP HW ver greater than 2.5.0"
+	depends on SERIAL_MSM_GENI
+	help
+	  Clock divider value should be doubled for QUP hardware version
+	  greater than 2.5.0.
+	  As earlycon can't have HW version awareness, decision is taken
+	  based on the configuration.
+
 config SERIAL_VT8500
 	bool "VIA VT8500 on-chip serial port support"
 	depends on ARCH_VT8500