diff --git a/arch/arm64/configs/db845c_gki.fragment b/arch/arm64/configs/db845c_gki.fragment
index dc3749aefd70..363a46569ff2 100644
--- a/arch/arm64/configs/db845c_gki.fragment
+++ b/arch/arm64/configs/db845c_gki.fragment
@@ -29,7 +29,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=m
 # CONFIG_USB_DWC3_OF_SIMPLE is not set
 CONFIG_USB_GADGET_VBUS_DRAW=500
 # CONFIG_USB_DUMMY_HCD is not set
-CONFIG_USB_ROLE_SWITCH=m
+CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_ULPI_BUS=m
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_RTC_DRV_PM8XXX=m
@@ -75,7 +75,6 @@ CONFIG_QCOM_AOSS_QMP=m
 CONFIG_QCOM_SMP2P=m
 CONFIG_QCOM_SOCINFO=m
 CONFIG_QCOM_APR=m
-CONFIG_QCOM_GLINK_SSR=m
 CONFIG_RPMSG_QCOM_GLINK_RPM=m
 CONFIG_QCOM_PDC=m
 CONFIG_QCOM_SCM=m
@@ -287,7 +286,6 @@ CONFIG_PINCTRL_SM8250=m
 CONFIG_PINCTRL_SM8250_LPASS_LPI=m
 CONFIG_PINCTRL_LPASS_LPI=m
 CONFIG_QCOM_SPMI_ADC_TM5=m
-CONFIG_MFD_QCOM_QCA639X=m
 CONFIG_REGULATOR_QCOM_USB_VBUS=m
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_LONTIUM_LT9611UXC=m
@@ -342,7 +340,6 @@ CONFIG_SM_VIDEOCC_8550=m
 CONFIG_INTERCONNECT_QCOM_SM8650=m
 CONFIG_PINCTRL_SM8650=m
 CONFIG_PINCTRL_SM8650_LPASS_LPI=m
-CONFIG_SM_DISPCC_8650=m
 CONFIG_SM_GCC_8650=m
 CONFIG_SM_GPUCC_8650=m
 CONFIG_SM_TCSRCC_8650=m