diff --git a/arch/arm64/configs/openkylin_generic_defconfig b/arch/arm64/configs/openkylin_generic_defconfig
index fc575de114ce4698eb1b4cd00ec8ba20294ffc96..7324bf247de71d38e7678ad1ade6a7737fd079ab 100644
--- a/arch/arm64/configs/openkylin_generic_defconfig
+++ b/arch/arm64/configs/openkylin_generic_defconfig
@@ -1714,7 +1714,6 @@ CONFIG_USB_CDNS3_HOST=y
 # CONFIG_USB_CDNS3_PCI_WRAP is not set
 CONFIG_USB_CDNSP_PCI=y
 CONFIG_USB_CDNSP_GADGET=y
-CONFIG_USB_CDNSP_SKY1=y
 CONFIG_USB_DWC3=y
 # CONFIG_USB_DWC3_PCI is not set
 # CONFIG_USB_DWC3_HAPS is not set
@@ -2008,8 +2007,8 @@ CONFIG_COMMON_RESET_HI6220=m
 CONFIG_PHY_XGENE=y
 CONFIG_PHY_HI6220_USB=m
 CONFIG_PHY_CIX_USBDP=y
-CONFIG_PHY_CIX_USB2=y
-CONFIG_PHY_CIX_USB3=y
+CONFIG_PHY_CIX_USB2=m
+CONFIG_PHY_CIX_USB3=m
 CONFIG_ARM_CCN=y
 CONFIG_ARM_CMN=m
 CONFIG_ARM_SMMU_V3_PMU=m
@@ -2333,9 +2332,6 @@ CONFIG_TEST_VMALLOC=m
 CONFIG_TEST_BPF=m
 CONFIG_LINEAR_RANGES_TEST=m
 CONFIG_GPIO_CADENCE=y
-CONFIG_PHY_CIX_USBDP=y
-CONFIG_PHY_CIX_USB2=y
-CONFIG_PHY_CIX_USB3=y
 CONFIG_PHY_CIX_PCIE=y
 CONFIG_USB_CDNS_SUPPORT=y
 CONFIG_USB_CDNS3=y
diff --git a/drivers/phy/cix/Kconfig b/drivers/phy/cix/Kconfig
index cad521756f30cb7f389ce1bb4c449c1a41c56f8b..f38ac0894a9e30c4aaf1212ce0b2a499c1273001 100644
--- a/drivers/phy/cix/Kconfig
+++ b/drivers/phy/cix/Kconfig
@@ -11,14 +11,14 @@ config PHY_CIX_USBDP
 	  Enable this to support the CIX USBDP PHY for TYPEC Connection
 
 config PHY_CIX_USB2
-	bool "Cix USB2 PHY Driver"
+	tristate "Cix USB2 PHY Driver"
 	depends on ARM64 && OF
 	select GENERIC_PHY
 	help
 	  Enable this to support the CIX USB2 PHY
 
 config PHY_CIX_USB3
-	bool "Cix USB3 PHY Driver"
+	tristate "Cix USB3 PHY Driver"
 	depends on ARM64 && OF && HAS_IOMEM
 	select GENERIC_PHY
 	help
diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
index 2953924094f5d542cc6ee483b15e34f546e4fc9f..bc0298735cc56b1802b814a13768d7d6782b7f7f 100644
--- a/drivers/usb/typec/Kconfig
+++ b/drivers/usb/typec/Kconfig
@@ -111,7 +111,7 @@ config TYPEC_WUSB3801
 	  module will be called wusb3801.ko.
 
 config TYPEC_RTS5453
-	tristate "Realtek rts5453 Type-C port controller driver"
+	bool "Realtek rts5453 Type-C port controller driver"
 	depends on I2C
 	select REGMAP_I2C
 	help