Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 15:37:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: tegra: rename GPU functions

Browse source 
Rename GPU functions to less generic names to avoid potential name
collisions.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Alexandre Courbot 2015-10-19 13:57:03 +09:00 committed by Tom Warren
parent d6bf06c0c7
commit eca676bd67
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/include/asm/arch-tegra/gpu.h
View file

@ -10,11 +10,11 @@
#if defined(CONFIG_TEGRA_GPU)
void config_gpu(void);
void tegra_gpu_config(void);
#else /* CONFIG_TEGRA_GPU */
static inline void config_gpu(void)
static inline void tegra_gpu_config(void)
{
}
@ -22,11 +22,11 @@ static inline void config_gpu(void)
#if defined(CONFIG_OF_LIBFDT)
int gpu_enable_node(void *blob, const char *gpupath);
int tegra_gpu_enable_node(void *blob, const char *gpupath);
#else /* CONFIG_OF_LIBFDT */
static inline int gpu_enable_node(void *blob, const char *gpupath)
static inline int tegra_gpu_enable_node(void *blob, const char *gpupath)
{
return 0;
}

4
arch/arm/mach-tegra/board2.c
View file

@ -128,7 +128,7 @@ int board_init(void)
clock_init();
clock_verify();
config_gpu();
tegra_gpu_config();
#ifdef CONFIG_TEGRA_SPI
pin_mux_spi();
@ -419,7 +419,7 @@ int ft_system_setup(void *blob, bd_t *bd)
/* Enable GPU node if GPU setup has been performed */
if (gpu_path != NULL)
return gpu_enable_node(blob, gpu_path);
return tegra_gpu_enable_node(blob, gpu_path);
return 0;
}

4
arch/arm/mach-tegra/gpu.c
View file

@ -25,7 +25,7 @@
static bool _configured;
void config_gpu(void)
void tegra_gpu_config(void)
{
struct mc_ctlr *mc = (struct mc_ctlr *)NV_PA_MC_BASE;
@ -43,7 +43,7 @@ void config_gpu(void)
#if defined(CONFIG_OF_LIBFDT)
int gpu_enable_node(void *blob, const char *gpupath)
int tegra_gpu_enable_node(void *blob, const char *gpupath)
{
int offset;