summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/board2.c
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2015-10-19 13:57:03 +0900
committerTom Warren <twarren@nvidia.com>2015-11-12 09:21:07 -0700
commiteca676bd673f7737d1e85391d846f014d9c197da (patch)
treee5f51a49d960957e7b70fcc6ced26357f25794e8 /arch/arm/mach-tegra/board2.c
parentd6bf06c0c7edf347354b208adf7618c96fd61605 (diff)
downloadblackbird-obmc-uboot-eca676bd673f7737d1e85391d846f014d9c197da.tar.gz
blackbird-obmc-uboot-eca676bd673f7737d1e85391d846f014d9c197da.zip
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/arm/mach-tegra/board2.c')
-rw-r--r--arch/arm/mach-tegra/board2.c4
1 files changed, 2 insertions, 2 deletions
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;
}
OpenPOWER on IntegriCloud