MLK-16758-2 imx8qxp_mek: Enable USBOTG1 support on MEK base board for android

Android needs to use USBOTG port on MEK base board for fastboot (USB device mode).
Add relevant node to DTS and update configurations to enable the port in android build.

Signed-off-by: Ye Li <ye.li@nxp.com>

diff --git a/arch/arm/dts/fsl-imx8qxp-mek.dts b/arch/arm/dts/fsl-imx8qxp-mek.dts
index 8f1f483..7d25a21 100644 (file)
--- a/arch/arm/dts/fsl-imx8qxp-mek.dts
+++ b/arch/arm/dts/fsl-imx8qxp-mek.dts
@@ -52,6 +52,16 @@
                        off-on-delay-us = <12000>;
                };
 
+               reg_usb_otg1_vbus: regulator@0 {
+                       compatible = "regulator-fixed";
+                       reg = <0>;
+                       regulator-name = "usb_otg1_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&pca9557_b 2 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
+
        };
 };
 
@@ -404,6 +414,16 @@
        status = "okay";
 };
 
+&usbotg1 {
+       vbus-supply = <&reg_usb_otg1_vbus>;
+       srp-disable;
+       hnp-disable;
+       adp-disable;
+       power-polarity-active-high;
+       disable-over-current;
+       status = "okay";
+};
+
 &usb2 {
        status = "okay";
 };

diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index 13dc6a9..79bec62 100644 (file)
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -415,14 +415,6 @@ void pci_init_board(void)
 
 #endif
 
-#ifdef CONFIG_USB_EHCI_MX6
-static void setup_otg(void)
-{
-       /* power control by IO expander 2 IO02*/
-
-}
-#endif
-
 #ifdef CONFIG_USB_XHCI_IMX8
 
 #define USB_TYPEC_SEL IMX_GPIO_NR(5, 9)
@@ -513,10 +505,6 @@ int board_init(void)
        setup_fec(CONFIG_FEC_ENET_DEV);
 #endif
 
-#ifdef CONFIG_USB_EHCI_MX6
-       setup_otg();
-#endif
-
 #ifdef CONFIG_USB_XHCI_IMX8
        setup_typec();
 #endif

diff --git a/configs/mx8qxp_mek_android_defconfig b/configs/mx8qxp_mek_android_defconfig
index f7385e8..7e5623b 100644 (file)
--- a/configs/mx8qxp_mek_android_defconfig
+++ b/configs/mx8qxp_mek_android_defconfig
@@ -19,19 +19,19 @@ CONFIG_CMD_I2C=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 
-# CONFIG_CMD_USB=y
-# CONFIG_USB=y
-# CONFIG_DM_USB=y
-# CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_STORAGE=y
+CONFIG_CMD_USB=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=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_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_CMD_GPIO=y
 CONFIG_DM_GPIO=y

diff --git a/include/configs/imx8qxp_mek_android.h b/include/configs/imx8qxp_mek_android.h
index 9660b29..4537c35 100644 (file)
--- a/include/configs/imx8qxp_mek_android.h
+++ b/include/configs/imx8qxp_mek_android.h
@@ -31,7 +31,7 @@
 #endif
 
 #define CONFIG_USB_FUNCTION_FASTBOOT
-/*#define CONFIG_CMD_FASTBOOT*/
+#define CONFIG_CMD_FASTBOOT
 
 #define CONFIG_ANDROID_BOOT_IMAGE
 #define CONFIG_FASTBOOT_FLASH