diff --git a/arch/arm64/configs/vendor/genericarmv8-64_defconfig b/arch/arm64/configs/vendor/genericarmv8-64_defconfig
index e63cd6aa59f8..714139a25820 100644
--- a/arch/arm64/configs/vendor/genericarmv8-64_defconfig
+++ b/arch/arm64/configs/vendor/genericarmv8-64_defconfig
@@ -332,6 +332,8 @@ CONFIG_VFIO=y
 CONFIG_VFIO_PCI=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_HAVEN_DRIVERS=y
+CONFIG_HH_CTRL=y
+# CONFIG_HH_DISABLE_UART is not set
 CONFIG_HH_MSGQ=y
 CONFIG_HH_RM_DRV=y
 CONFIG_HH_DBL=y
diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index 3966a7c5a5cb..7a2990c98aa2 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -144,6 +144,7 @@ CONFIG_QCOM_PROXY_OF_CONSUMER=m
 CONFIG_BTFM_SLIM=m
 CONFIG_VIRT_DRIVERS=y
 CONFIG_HAVEN_DRIVERS=y
+CONFIG_HH_CTRL=m
 CONFIG_HH_MSGQ=m
 CONFIG_HH_RM_DRV=m
 CONFIG_HH_MEM_NOTIFIER=m
diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config
index 22b47c1710d0..2276f85a1c7d 100644
--- a/arch/arm64/configs/vendor/lahaina_debug.config
+++ b/arch/arm64/configs/vendor/lahaina_debug.config
@@ -70,3 +70,4 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_QTI_PMIC_GLINK_CLIENT_DEBUG=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_I2C_CHARDEV=y
+# CONFIG_HH_DISABLE_UART is not set