diff options
| author | Tom Rini <trini@ti.com> | 2012-12-22 05:55:19 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-22 05:55:19 -0700 |
| commit | da77a0e593c370c9ed79ea22c1df321d5f4e4bbf (patch) | |
| tree | d31ff68d217a80422845c82104098eef744f4cde /board/nvidia/common/board.c | |
| parent | ba6d4b64b33146740a15b3dd5a5f511a2bc8d6f6 (diff) | |
| parent | 96764df1b47ddebfb50fadf5af72530b07b5fc89 (diff) | |
| download | olio-uboot-2014.01-da77a0e593c370c9ed79ea22c1df321d5f4e4bbf.tar.xz olio-uboot-2014.01-da77a0e593c370c9ed79ea22c1df321d5f4e4bbf.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/nvidia/common/board.c')
| -rw-r--r-- | board/nvidia/common/board.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 2c7cd0d40..76ec6876e 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -26,10 +26,12 @@ #include <linux/compiler.h> #include <asm/io.h> #include <asm/arch/clock.h> +#include <asm/arch/display.h> #include <asm/arch/emc.h> #include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> #include <asm/arch/pmu.h> +#include <asm/arch/pwm.h> #include <asm/arch/tegra.h> #include <asm/arch/usb.h> #include <asm/arch-tegra/board.h> @@ -119,6 +121,13 @@ int board_init(void) pin_mux_spi(); spi_init(); #endif +#ifdef CONFIG_PWM_TEGRA + if (pwm_init(gd->fdt_blob)) + debug("%s: Failed to init pwm\n", __func__); +#endif +#ifdef CONFIG_LCD + tegra_lcd_check_next_stage(gd->fdt_blob, 0); +#endif /* boot param addr */ gd->bd->bi_boot_params = (NV_PA_SDRAM_BASE + 0x100); @@ -144,6 +153,9 @@ int board_init(void) pin_mux_usb(); board_usb_init(gd->fdt_blob); #endif +#ifdef CONFIG_LCD + tegra_lcd_check_next_stage(gd->fdt_blob, 0); +#endif #ifdef CONFIG_TEGRA_NAND pin_mux_nand(); @@ -174,7 +186,19 @@ int board_early_init_f(void) /* Initialize periph GPIOs */ gpio_early_init(); gpio_early_init_uart(); +#ifdef CONFIG_LCD + tegra_lcd_early_init(gd->fdt_blob); +#endif return 0; } #endif /* EARLY_INIT */ + +int board_late_init(void) +{ +#ifdef CONFIG_LCD + /* Make sure we finish initing the LCD */ + tegra_lcd_check_next_stage(gd->fdt_blob, 1); +#endif + return 0; +} |