diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2015-10-19 13:57:03 +0900 |
|---|---|---|
| committer | Tom Warren <twarren@nvidia.com> | 2015-11-12 09:21:07 -0700 |
| commit | eca676bd673f7737d1e85391d846f014d9c197da (patch) | |
| tree | e5f51a49d960957e7b70fcc6ced26357f25794e8 /arch | |
| parent | d6bf06c0c7edf347354b208adf7618c96fd61605 (diff) | |
ARM: tegra: rename GPU functions
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/gpu.h | 8 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board2.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/gpu.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/include/asm/arch-tegra/gpu.h b/arch/arm/include/asm/arch-tegra/gpu.h index 2fdb2c5049..4423386f28 100644 --- a/arch/arm/include/asm/arch-tegra/gpu.h +++ b/arch/arm/include/asm/arch-tegra/gpu.h @@ -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; } diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index ff9e77cfa3..8ba143d996 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(); @@ -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; } diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c index dc29b79e01..c7d705d8ef 100644 --- a/arch/arm/mach-tegra/gpu.c +++ b/arch/arm/mach-tegra/gpu.c @@ -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; |