MLK-17821-4 imx8qm/qxp: Enable CDNS3 USB gadget driver for MEK and ARM2

The u-boot does not support to use two different gadget drivers at same time.
So for all iMX8QM/QXP MEK and ARM2 defconfigs, enable the CDNS3 usb gadget
to support device mode on typec port and disable CI UDC driver for OTG port.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

diff --git a/configs/imx8qm_ddr4_arm2_defconfig b/configs/imx8qm_ddr4_arm2_defconfig
index 7c458a2..c46750b 100644 (file)
--- a/configs/imx8qm_ddr4_arm2_defconfig
+++ b/configs/imx8qm_ddr4_arm2_defconfig
@@ -27,12 +27,16 @@ CONFIG_USB_STORAGE=y
 
 CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_CI_UDC=y
+# CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET_DUALSPEED=y
+
 CONFIG_CMD_GPIO=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y

diff --git a/configs/imx8qm_lpddr4_arm2_defconfig b/configs/imx8qm_lpddr4_arm2_defconfig
index 79f9709..7e46aae 100644 (file)
--- a/configs/imx8qm_lpddr4_arm2_defconfig
+++ b/configs/imx8qm_lpddr4_arm2_defconfig
@@ -27,12 +27,16 @@ CONFIG_USB_STORAGE=y
 
 CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_CI_UDC=y
+# CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET_DUALSPEED=y
+
 CONFIG_CMD_GPIO=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y

diff --git a/configs/imx8qm_lpddr4_arm2_fspi_defconfig b/configs/imx8qm_lpddr4_arm2_fspi_defconfig
index 7878c97..e17d5ad 100644 (file)
--- a/configs/imx8qm_lpddr4_arm2_fspi_defconfig
+++ b/configs/imx8qm_lpddr4_arm2_fspi_defconfig
@@ -27,12 +27,16 @@ CONFIG_USB_STORAGE=y
 
 CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_CI_UDC=y
+# CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET_DUALSPEED=y
+
 CONFIG_CMD_GPIO=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y

diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig
index e60b9fb..37800a3 100644 (file)
--- a/configs/imx8qm_mek_defconfig
+++ b/configs/imx8qm_mek_defconfig
@@ -19,19 +19,24 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_IMX8=y
 
 CONFIG_DM_USB=y
+CONFIG_USB_EHCI_HCD=y
 
 CONFIG_CMD_USB=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_TCPC=y
 
-# CONFIG_CMD_USB_MASS_STORAGE=y
-# CONFIG_USB_GADGET=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_USB_GADGET=y
 # CONFIG_CI_UDC=y
-# CONFIG_USB_GADGET_DOWNLOAD=y
-# CONFIG_G_DNL_MANUFACTURER="FSL"
-# CONFIG_G_DNL_VENDOR_NUM=0x0525
-# CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="FSL"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET_DUALSPEED=y
 
 CONFIG_CMD_GPIO=y
 CONFIG_DM_GPIO=y

diff --git a/configs/imx8qm_mek_fspi_defconfig b/configs/imx8qm_mek_fspi_defconfig
index 36b5f4b..aa86c8f 100644 (file)
--- a/configs/imx8qm_mek_fspi_defconfig
+++ b/configs/imx8qm_mek_fspi_defconfig
@@ -19,19 +19,24 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_IMX8=y
 
 CONFIG_DM_USB=y
+CONFIG_USB_EHCI_HCD=y
 
 CONFIG_CMD_USB=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_TCPC=y
 
-# CONFIG_CMD_USB_MASS_STORAGE=y
-# CONFIG_USB_GADGET=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_USB_GADGET=y
 # CONFIG_CI_UDC=y
-# CONFIG_USB_GADGET_DOWNLOAD=y
-# CONFIG_G_DNL_MANUFACTURER="FSL"
-# CONFIG_G_DNL_VENDOR_NUM=0x0525
-# CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="FSL"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET_DUALSPEED=y
 
 CONFIG_CMD_GPIO=y
 CONFIG_DM_GPIO=y

diff --git a/configs/imx8qxp_ddr3_arm2_defconfig b/configs/imx8qxp_ddr3_arm2_defconfig
index 0a8255d..0399cbb 100644 (file)
--- a/configs/imx8qxp_ddr3_arm2_defconfig
+++ b/configs/imx8qxp_ddr3_arm2_defconfig
@@ -27,12 +27,16 @@ CONFIG_USB_STORAGE=y
 
 CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_CI_UDC=y
+# CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET_DUALSPEED=y
+
 CONFIG_CMD_GPIO=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y

diff --git a/configs/imx8qxp_lpddr4_arm2_defconfig b/configs/imx8qxp_lpddr4_arm2_defconfig
index 53e4f5e..bd654d6 100644 (file)
--- a/configs/imx8qxp_lpddr4_arm2_defconfig
+++ b/configs/imx8qxp_lpddr4_arm2_defconfig
@@ -27,12 +27,16 @@ CONFIG_USB_STORAGE=y
 
 CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_CI_UDC=y
+# CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET_DUALSPEED=y
+
 CONFIG_CMD_GPIO=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y

diff --git a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig
index 714b57c..4bf7900 100644 (file)
--- a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig
+++ b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig
@@ -27,12 +27,16 @@ CONFIG_USB_STORAGE=y
 
 CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_CI_UDC=y
+# CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET_DUALSPEED=y
+
 CONFIG_CMD_GPIO=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y

diff --git a/configs/imx8qxp_lpddr4_arm2_nand_defconfig b/configs/imx8qxp_lpddr4_arm2_nand_defconfig
index ecb3a7e..6b63b7f 100644 (file)
--- a/configs/imx8qxp_lpddr4_arm2_nand_defconfig
+++ b/configs/imx8qxp_lpddr4_arm2_nand_defconfig
@@ -26,12 +26,16 @@ CONFIG_USB_STORAGE=y
 
 CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_CI_UDC=y
+# CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET_DUALSPEED=y
+
 CONFIG_CMD_GPIO=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y

diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig
index cd84875..f36c504 100644 (file)
--- a/configs/imx8qxp_mek_defconfig
+++ b/configs/imx8qxp_mek_defconfig
@@ -30,12 +30,16 @@ CONFIG_USB_TCPC=y
 
 CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_CI_UDC=y
+# CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET_DUALSPEED=y
+
 CONFIG_CMD_GPIO=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y

diff --git a/configs/imx8qxp_mek_fspi_defconfig b/configs/imx8qxp_mek_fspi_defconfig
index b621a7f..dfa1f94 100644 (file)
--- a/configs/imx8qxp_mek_fspi_defconfig
+++ b/configs/imx8qxp_mek_fspi_defconfig
@@ -30,12 +30,16 @@ CONFIG_USB_TCPC=y
 
 CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_CI_UDC=y
+# CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET_DUALSPEED=y
+
 CONFIG_CMD_GPIO=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y