diff options
| author | Christian Hemp <c.hemp@phytec.de> | 2013-08-21 10:21:30 +0200 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2013-11-07 12:19:36 -0500 |
| commit | df8ea09db9dc5cc31bdfde91d6f89b759ba48cc0 (patch) | |
| tree | 37ff0733cc8c46b187dbf661d580a37092b98f85 | |
| parent | 2025936df7ca7e5e1a2591302123710a6c6db172 (diff) | |
imx6: phyFLEX: update gpu name
Signed-off-by: Christian Hemp <c.hemp@phytec.de>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_phyflex.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_phyflex.c b/arch/arm/mach-mx6/board-mx6q_phyflex.c index 390b22147065..9b6863d78ad6 100644 --- a/arch/arm/mach-mx6/board-mx6q_phyflex.c +++ b/arch/arm/mach-mx6/board-mx6q_phyflex.c @@ -495,7 +495,7 @@ static void __init mx6_phyflex_init_usb(void) #endif } -static struct viv_gpu_platform_data imx6_gpu_pdata __initdata = { +static struct viv_gpu_platform_data imx6q_gpu_pdata __initdata = { .reserved_mem_size = SZ_128M, }; @@ -1481,7 +1481,7 @@ if(cpu_is_mx6q()) { } - imx_add_viv_gpu(&imx6_gpu_data, &imx6_gpu_pdata); + imx_add_viv_gpu(&imx6_gpu_data, &imx6q_gpu_pdata); imx6q_add_vpu(); } /* Initialize SoC RTC */ @@ -1599,20 +1599,22 @@ static struct sys_timer mxc_timer = { static void __init mx6_phyflex_reserve(void) { +#if defined(CONFIG_MXC_GPU_VIV) || defined(CONFIG_MXC_GPU_VIV_MODULE) phys_addr_t phys; - if (imx6_gpu_pdata.reserved_mem_size) { + if (imx6q_gpu_pdata.reserved_mem_size) { #ifdef DDR_2GB - phys = memblock_alloc_base( - imx6_gpu_pdata.reserved_mem_size, SZ_4K, SZ_2G); + phys = memblock_alloc_base(imx6q_gpu_pdata.reserved_mem_size, + SZ_4K, SZ_2G); #else - phys = memblock_alloc_base( - imx6_gpu_pdata.reserved_mem_size, SZ_4K, SZ_1G); + phys = memblock_alloc_base(imx6q_gpu_pdata.reserved_mem_size, + SZ_4K, SZ_1G); #endif - memblock_free(phys, imx6_gpu_pdata.reserved_mem_size); - memblock_remove(phys, imx6_gpu_pdata.reserved_mem_size); - imx6_gpu_pdata.reserved_mem_base = phys; + memblock_remove(phys, imx6q_gpu_pdata.reserved_mem_size); + imx6q_gpu_pdata.reserved_mem_base = phys; } +#endif + } MACHINE_START(MX6Q_PHYFLEX, "Phytec i.MX 6Quad phyFLEX Board") |