imx: cx9020: migrate cx9020 to CONFIG_DM_USB

Note: gpio7_8 was never used for usb power regulator so we remove it here

Acked-by: Patrick Bruenn <p.bruenn@beckhoff.com>
Signed-off-by: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>

diff --git a/arch/arm/dts/imx53-cx9020.dts b/arch/arm/dts/imx53-cx9020.dts
index 2b7f7288088a4f50f05538f202e60adf7e424dd7..e08850999b1b02a46833384eb54ee0587e89f378 100644 (file)
--- a/arch/arm/dts/imx53-cx9020.dts
+++ b/arch/arm/dts/imx53-cx9020.dts
@@ -36,7 +36,6 @@
                                MX53_PAD_GPIO_1__GPIO1_1          0x80000000
                                MX53_PAD_GPIO_4__GPIO1_4          0x80000000
                                MX53_PAD_PATA_DA_0__GPIO7_6       0x80000000
-                               MX53_PAD_PATA_DA_2__GPIO7_8       0x80000000
                                MX53_PAD_GPIO_16__GPIO7_11        0x80000000
 
                                MX53_PAD_EIM_OE__EMI_WEIM_OE            0x80000000
@@ -220,3 +219,13 @@
                full-duplex;
        };
 };
+
+&usbh1 {
+       phy_type = "utmi";
+       status = "okay";
+};
+
+&usbotg {
+       dr_mode = "host";
+       status = "okay";
+};

diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c
index 63a54f59b88888529fb0fa2df07eb536ec5327b7..398e4ed72028319de2eedfa20eec78646399170b 100644 (file)
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020.c
@@ -129,16 +129,6 @@ static void setup_gpio_leds(void)
        gpio_direction_output(GPIO_LED_PWR_G, 0);
 }
 
-#ifdef CONFIG_USB_EHCI_MX5
-int board_ehci_hcd_init(int port)
-{
-       /* request VBUS power enable pin, GPIO7_8 */
-       gpio_direction_output(IMX_GPIO_NR(7, 8), 1);
-       return 0;
-}
-#endif
-
-
 static int power_init(void)
 {
        /* nothing to do on CX9020 */

diff --git a/configs/mx53cx9020_defconfig b/configs/mx53cx9020_defconfig
index 5ed3e13272a82d85265fc68debabaa5919189284..dee7c37913abbb22da144bcc16a38c491b8cf4af 100644 (file)
--- a/configs/mx53cx9020_defconfig
+++ b/configs/mx53cx9020_defconfig
@@ -21,7 +21,13 @@ CONFIG_CMD_PXE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_USB=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_EHCI_MX5=y
+CONFIG_USB_STORAGE=y
+CONFIG_DM_REGULATOR=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx53-cx9020"
 CONFIG_ENV_IS_IN_MMC=y