From: Simon Glass <sjg@chromium.org>
Date: Wed, 6 May 2015 20:00:16 +0000 (-0600)
Subject: dm: tegra: usb: Move USB to driver model
X-Git-Tag: v2015.07-rc3~89^2~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=534f9d3feffdcccc0f21def87bb21b8aebb7ba30;p=u-boot

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 9b42871935..1fd6b6547e 100644
--- 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 ebcee4ed9a..8512afa792 100644
--- 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