diff --git a/arch/arm64/configs/msm-auto-perf_defconfig b/arch/arm64/configs/msm-auto-perf_defconfig
index 0f624b69649d..0c934668bbca 100644
--- a/arch/arm64/configs/msm-auto-perf_defconfig
+++ b/arch/arm64/configs/msm-auto-perf_defconfig
@@ -429,6 +429,7 @@ CONFIG_USB_DWC3=y
 CONFIG_USB_ISP1760=y
 CONFIG_USB_EHSET_TEST_FIXTURE=y
 CONFIG_USB_QTI_KS_BRIDGE=y
+CONFIG_USB_QCOM_IPC_BRIDGE=y
 CONFIG_USB_QCOM_DIAG_BRIDGE=y
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MSM_SSPHY_QMP=y
diff --git a/arch/arm64/configs/msm-auto_defconfig b/arch/arm64/configs/msm-auto_defconfig
index 39a9b67d36b0..33dc2f0be818 100644
--- a/arch/arm64/configs/msm-auto_defconfig
+++ b/arch/arm64/configs/msm-auto_defconfig
@@ -433,6 +433,7 @@ CONFIG_USB_DWC3=y
 CONFIG_USB_ISP1760=y
 CONFIG_USB_EHSET_TEST_FIXTURE=y
 CONFIG_USB_QTI_KS_BRIDGE=y
+CONFIG_USB_QCOM_IPC_BRIDGE=y
 CONFIG_USB_QCOM_DIAG_BRIDGE=y
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MSM_SSPHY_QMP=y
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index 278df845f066..b8f3e4199e20 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -287,12 +287,14 @@ config USB_QCOM_IPC_BRIDGE
 	  Say Y here if you have a QTI modem device connected via USB that
 	  will be bridged in kernel space. This driver works as a transport
 	  layer for IPC router module that enables communication between
-	  APPS processor and MODEM processor.
+	  APPS processor and MODEM processor. This config depends on
+	  USB_QCOM_DIAG_BRIDGE because the core USB support for the transports
+	  of both diag and IPC messages is in the same driver. Select this
+	  config manually if you want to compile HSIC transport IPC router.
 
 config USB_QCOM_DIAG_BRIDGE
 	tristate "USB QTI diagnostic bridge driver"
 	depends on USB
-	select USB_QCOM_IPC_BRIDGE
 	help
 	  Say Y here if you have a QTI modem device connected via USB that
 	  will be bridged in kernel space. This driver communicates with the