summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry Li <b20787@freescale.com>2012-06-25 16:04:08 +0800
committerLarry Li <b20787@freescale.com>2012-06-28 17:22:13 +0800
commitee1dc652785f7a39b7a023f151ad25e926f924c6 (patch)
tree9852fde6f30386716dd54023ae6b4bc49258c1ce
parent518c9e8a292d56d8bd4fe1733bfecd4435c77a92 (diff)
ENGR00214791-1 [MX6] Add baseAddress parameter for GPU resource
Add baseAddress parameter for GPU resource according to different SOC Signed-off-by: Larry Li <b20787@freescale.com>
-rw-r--r--arch/arm/plat-mxc/devices/platform-viv_gpu.c8
-rwxr-xr-xarch/arm/plat-mxc/include/mach/devices-common.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-viv_gpu.c b/arch/arm/plat-mxc/devices/platform-viv_gpu.c
index 40cd3fca56d7..9b0219695c00 100644
--- a/arch/arm/plat-mxc/devices/platform-viv_gpu.c
+++ b/arch/arm/plat-mxc/devices/platform-viv_gpu.c
@@ -24,6 +24,7 @@
#ifdef CONFIG_ARCH_MX6
#ifdef CONFIG_SOC_IMX6SL
const struct imx_viv_gpu_data imx6_gpu_data __initconst = {
+ .phys_baseaddr = MX6SL_MMDC0_ARB_BASE_ADDR,
.iobase_3d = 0,
.irq_3d = -1,
.iobase_2d = MX6SL_GPU_2D_ARB_BASE_ADDR,
@@ -33,6 +34,7 @@ const struct imx_viv_gpu_data imx6_gpu_data __initconst = {
};
#else
const struct imx_viv_gpu_data imx6_gpu_data __initconst = {
+ .phys_baseaddr = 0,
.iobase_3d = GPU_3D_ARB_BASE_ADDR,
.irq_3d = MXC_INT_GPU3D_IRQ,
.iobase_2d = GPU_2D_ARB_BASE_ADDR,
@@ -50,6 +52,12 @@ struct platform_device *__init imx_add_viv_gpu(
u32 res_count = 0;
struct resource res[] = {
{
+ .name = "phys_baseaddr",
+ .start = data->phys_baseaddr,
+ .end = data->phys_baseaddr,
+ .flags = IORESOURCE_MEM,
+ }, {
+
.name = "iobase_3d",
.start = data->iobase_3d,
.end = data->iobase_3d + SZ_16K - 1,
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h
index eaddb7e3a4f6..369ec0f6bd4a 100755
--- a/arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/arch/arm/plat-mxc/include/mach/devices-common.h
@@ -513,6 +513,7 @@ struct platform_device *__init imx_add_spdif_audio_device(void);
#include <mach/viv_gpu.h>
struct imx_viv_gpu_data {
+ resource_size_t phys_baseaddr;
resource_size_t irq_3d;
resource_size_t iobase_3d;
resource_size_t irq_2d;