@@ -515,7 +515,7 @@ int board_eth_init(bd_t *bis)
return cpu_eth_init(bis);
}
-#ifdef CONFIG_USB_EHCI_MX6
+#if defined(CONFIG_USB_EHCI_MX6) && !defined(CONFIG_DM_USB)
#define USB_OTHERREGS_OFFSET 0x800
#define UCTRL_PWR_POL (1 << 9)
@@ -599,7 +599,7 @@ int board_init(void)
#ifndef CONFIG_DM_I2C
setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
#endif
-#ifdef CONFIG_USB_EHCI_MX6
+#if defined(CONFIG_USB_EHCI_MX6) && !defined(CONFIG_DM_USB)
setup_usb();
#endif
@@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y
+CONFIG_DM_USB=y
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
CONFIG_DM_PMIC_PFUZE100=y
@@ -59,6 +59,7 @@ CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y
+CONFIG_DM_USB=y
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
CONFIG_DM_PMIC_PFUZE100=y
@@ -70,12 +70,15 @@
/* USB Configs */
#ifdef CONFIG_USB_EHCI_MX6
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_ASIX
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Enabled USB controller number */
+
+# ifndef CONFIG_DM_USB
+# define CONFIG_MXC_USB_FLAGS 0
+# define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Enabled USB controller number */
+# define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+# endif
#endif
#endif /* __MX6QSABRESD_CONFIG_H */