leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: tegra: simplify GPU setup

Browse Source 
Enable the GPU node in the system-wide ft_system_setup() hook instead of
the board-specific ft_board_hook(). This allows us to enable GPU per SoC
generation instead of per-board as we did initially.

Reported-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Alexandre Courbot 2015-10-19 13:57:02 +09:00 committed by Tom Warren
parent 36e5f7ce1c
commit d6bf06c0c7
8 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm/mach-tegra/board2.c
View File

@ -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 gpu_enable_node(blob, gpu_path);
return 0;
}

8
board/nvidia/jetson-tk1/jetson-tk1.c
View File

@ -11,7 +11,6 @@
#include <asm/arch/gpio.h>
#include <asm/arch/pinmux.h>
#include <asm/arch-tegra/gpu.h>
#include "pinmux-config-jetson-tk1.h"
@ -80,10 +79,3 @@ int board_eth_init(bd_t *bis)
return pci_eth_init(bis);
}
#endif /* PCI */
int ft_board_setup(void *blob, bd_t *bd)
{
gpu_enable_node(blob, "/gpu@0,57000000");
return 0;
}

7
board/nvidia/p2571/p2571.c
View File

@ -11,7 +11,6 @@
#include <asm/arch/pinmux.h>
#include <asm/gpio.h>
#include "max77620_init.h"
#include <asm/arch-tegra/gpu.h>
#include "pinmux-config-p2571.h"
void pin_mux_mmc(void)
@ -62,9 +61,3 @@ void start_cpu_fan(void)
gpio_request(GPIO_PE4, "FAN_VDD");
gpio_direction_output(GPIO_PE4, 1);
}
int ft_board_setup(void *blob, bd_t *bd)
{
gpu_enable_node(blob, "/gpu@0,57000000");
return 0;
}

8
board/nvidia/venice2/venice2.c
View File

@ -8,7 +8,6 @@
#include <common.h>
#include <asm/arch/gpio.h>
#include <asm/arch/pinmux.h>
#include <asm/arch-tegra/gpu.h>
#include "pinmux-config-venice2.h"
/*
@ -28,10 +27,3 @@ void pinmux_init(void)
pinmux_config_drvgrp_table(venice2_drvgrps,
ARRAY_SIZE(venice2_drvgrps));
}
int ft_board_setup(void *blob, bd_t *bd)
{
gpu_enable_node(blob, "/gpu@0,57000000");
return 0;
}

2
include/configs/jetson-tk1.h
View File

@ -78,6 +78,4 @@
#define CONFIG_ARMV7_SECURE_BASE 0xfff00000
#define CONFIG_ARMV7_SECURE_RESERVE_SIZE 0x00100000
#define CONFIG_OF_BOARD_SETUP
#endif /* __CONFIG_H */

2
include/configs/p2571.h
View File

@ -60,6 +60,4 @@
#include "tegra-common-usb-gadget.h"
#include "tegra-common-post.h"
#define CONFIG_OF_BOARD_SETUP
#endif /* _P2571_H */

2
include/configs/tegra-common.h
View File

@ -143,4 +143,6 @@
#define CONFIG_FAT_WRITE
#endif
#define CONFIG_OF_SYSTEM_SETUP
#endif /* _TEGRA_COMMON_H_ */

2
include/configs/venice2.h
View File

@ -60,6 +60,4 @@
#include "tegra-common-usb-gadget.h"
#include "tegra-common-post.h"
#define CONFIG_OF_BOARD_SETUP
#endif /* __CONFIG_H */