diff --git a/arch/arm64/configs/vendor/lahaina-nqgki_defconfig b/arch/arm64/configs/vendor/lahaina-nqgki_defconfig
index 31c3548fdc8f..40bcf06d6163 100644
--- a/arch/arm64/configs/vendor/lahaina-nqgki_defconfig
+++ b/arch/arm64/configs/vendor/lahaina-nqgki_defconfig
@@ -242,6 +242,7 @@ CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_U32=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_QRTR=y
+CONFIG_QRTR_WAKEUP_MS=500
 CONFIG_QRTR_SMD=y
 CONFIG_QRTR_MHI=y
 CONFIG_QRTR_HAVEN=y
diff --git a/arch/arm64/configs/vendor/lahaina-qgki_defconfig b/arch/arm64/configs/vendor/lahaina-qgki_defconfig
index 97f9605cae46..16bf0ee44baa 100644
--- a/arch/arm64/configs/vendor/lahaina-qgki_defconfig
+++ b/arch/arm64/configs/vendor/lahaina-qgki_defconfig
@@ -243,6 +243,7 @@ CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_U32=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_QRTR=y
+CONFIG_QRTR_WAKEUP_MS=500
 CONFIG_QRTR_SMD=y
 CONFIG_QRTR_MHI=y
 CONFIG_QRTR_HAVEN=y
@@ -294,7 +295,6 @@ CONFIG_OEM_QMI=y
 CONFIG_AW8697_HAPTIC=m
 CONFIG_OPLUS_TRIKEY_HALL=y
 CONFIG_OPLUS_TRIKEY_MAIN=y
-CONFIG_OPLUS_TRI_STATE_KEY=y
 CONFIG_IST_UP=y
 CONFIG_IST_DOWN=y
 CONFIG_MXM_UP=y
diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index f01a9847854d..92ca3e409b33 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -251,3 +251,4 @@ CONFIG_REGULATOR_QPNP_LCDB=m
 CONFIG_LEDS_QPNP_VIBRATOR_LDO=m
 CONFIG_BACKLIGHT_QCOM_SPMI_WLED=m
 # CONFIG_CFG80211_CRDA_SUPPORT is not set
+CONFIG_QRTR_WAKEUP_MS=500
diff --git a/arch/arm64/configs/vendor/lahaina_NGKI.config b/arch/arm64/configs/vendor/lahaina_NGKI.config
index adf1742fcf66..bafe1f882a7c 100644
--- a/arch/arm64/configs/vendor/lahaina_NGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_NGKI.config
@@ -251,3 +251,4 @@ CONFIG_REGULATOR_QPNP_LCDB=y
 CONFIG_LEDS_QPNP_VIBRATOR_LDO=y
 CONFIG_BACKLIGHT_QCOM_SPMI_WLED=y
 # CONFIG_CFG80211_CRDA_SUPPORT is not set
+CONFIG_QRTR_WAKEUP_MS=500