dm: tegra: usb: Move USB to driver model

Somehow this change was dropped in the various merges. I noticed when I
came to turn off the non-driver-model support for Tegra. We need to make
this change (and deal with any problems) before going further.

Change-Id: Ib9389a0d41008014eb0df0df98c27be65bc79ce6
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Marek Vasut <marex@denx.de>

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 9b4287193523cd400dc4cd3ff176ad9ca442625c..1fd6b6547eb717772c8ebea052d86bb1d12e702a 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -24,6 +24,9 @@ config SYS_MALLOC_F_LEN
 config USE_PRIVATE_LIBGCC
        default y
 
+config DM_USB
+       default y
+
 config SPL_DM
        default y
 

diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index ebcee4ed9a516529f1c04e79ea471316bf93f871..8512afa7925660aa53799f10ea28f4bd5049c730 100644 (file)
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -161,7 +161,9 @@ int board_init(void)
 
 #ifdef CONFIG_USB_EHCI_TEGRA
        pin_mux_usb();
+# ifndef CONFIG_DM_USB
        usb_process_devicetree(gd->fdt_blob);
+# endif
 #endif
 
 #ifdef CONFIG_LCD