summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-05-06 14:00:16 -0600
committerSimon Glass <sjg@chromium.org>2015-06-10 19:26:54 -0600
commit534f9d3feffdcccc0f21def87bb21b8aebb7ba30 (patch)
tree1c9e9aef0bbc9be9dd564c676b9b8cdb14af0df4 /arch/arm
parenta2879764ba392229dc7aba89951e74524750af18 (diff)
downloadu-boot-imx-534f9d3feffdcccc0f21def87bb21b8aebb7ba30.zip
u-boot-imx-534f9d3feffdcccc0f21def87bb21b8aebb7ba30.tar.gz
u-boot-imx-534f9d3feffdcccc0f21def87bb21b8aebb7ba30.tar.bz2
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-tegra/Kconfig3
-rw-r--r--arch/arm/mach-tegra/board2.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 9b42871..1fd6b65 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 ebcee4e..8512afa 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