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>

diff --git a/arch/arm/plat-mxc/devices/platform-viv_gpu.c b/arch/arm/plat-mxc/devices/platform-viv_gpu.c
index 40cd3fca56d78e42a63d6b80261919fdf7bdd110..9b0219695c0054bc073e044728762e7579dc2060 100644 (file)
--- 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 eaddb7e3a4f68a0231573269ba16066bda36e819..369ec0f6bd4a94e3632166d16d484403907f6904 100755 (executable)
--- 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;