From c96d709f30cdf57ba78ef780066784a09276705f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 5 Jun 2015 14:39:42 -0600 Subject: tegra: Allow board-specific init Add a hook to allows boards to add their own init to board_init(). Signed-off-by: Simon Glass Signed-off-by: Tom Warren --- arch/arm/mach-tegra/board2.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-tegra/board2.c') diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 131802ae62..ebcee4ed9a 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -107,6 +107,11 @@ __weak int tegra_lcd_pmic_init(int board_it) return 0; } +__weak int nvidia_board_init(void) +{ + return 0; +} + /* * Routine: board_init * Description: Early hardware init. @@ -180,8 +185,7 @@ int board_init(void) /* prepare the WB code to LP0 location */ warmboot_prepare_code(TEGRA_LP0_ADDR, TEGRA_LP0_SIZE); #endif - - return 0; + return nvidia_board_init(); } #ifdef CONFIG_BOARD_EARLY_INIT_F -- cgit From 534f9d3feffdcccc0f21def87bb21b8aebb7ba30 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 6 May 2015 14:00:16 -0600 Subject: 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 Acked-by: Marek Vasut --- arch/arm/mach-tegra/board2.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-tegra/board2.c') 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 -- cgit From 257bfd2e215ff02aacce23e14bf17b61524a723f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 25 Mar 2015 12:23:06 -0600 Subject: dm: usb: tegra: Drop legacy USB code Drop the code that doesn't use driver model for USB. Signed-off-by: Simon Glass --- arch/arm/mach-tegra/board2.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch/arm/mach-tegra/board2.c') diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 8512afa792..ce9b6959ef 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -161,9 +161,6 @@ 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 -- cgit