diff options
| author | Tom Rini | 2015-11-12 15:59:35 -0500 |
|---|---|---|
| committer | Tom Rini | 2015-11-12 19:32:51 -0500 |
| commit | bc80109b117abe4ed2cd4d12c8dc188561bc298e (patch) | |
| tree | c51f0fcaa1bcc0c17a1119f7d47a0b943b063c7f /arch/arm/mach-tegra/board2.c | |
| parent | 42d1b818a866840a5009309b4901b5ce28572467 (diff) | |
| parent | e1cf5278024eb5c72abd69d6bda266ffc5832941 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'arch/arm/mach-tegra/board2.c')
| -rw-r--r-- | arch/arm/mach-tegra/board2.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 8ecc67459a1..8ba143d996c 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -128,7 +128,7 @@ int board_init(void) clock_init(); clock_verify(); - config_gpu(); + tegra_gpu_config(); #ifdef CONFIG_TEGRA_SPI pin_mux_spi(); @@ -403,3 +403,23 @@ ulong board_get_usable_ram_top(ulong total_size) { return CONFIG_SYS_SDRAM_BASE + usable_ram_size_below_4g(); } + +/* + * This function is called right before the kernel is booted. "blob" is the + * device tree that will be passed to the kernel. + */ +int ft_system_setup(void *blob, bd_t *bd) +{ + const char *gpu_path = +#if defined(CONFIG_TEGRA124) || defined(CONFIG_TEGRA210) + "/gpu@0,57000000"; +#else + NULL; +#endif + + /* Enable GPU node if GPU setup has been performed */ + if (gpu_path != NULL) + return tegra_gpu_enable_node(blob, gpu_path); + + return 0; +} |