shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update gpu pmem config

Browse Source
This commit is contained in:
杜坤明
2010-11-09 21:27:59 +08:00
parent 47023bf8d0
commit bf26b81a8d
3 changed files with 29 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
arch/arm/mach-rk29/board-rk29sdk.c
View File

@@ -316,21 +316,6 @@ static struct platform_device android_pmem_device = {
},
};
static struct android_pmem_platform_data android_pmem_gpu_pdata = {
.name = "pmem_gpu",
.start = PMEM_GPU_BASE,
.size = PMEM_GPU_SIZE,
.no_allocator = 0,
.cached = 0,
};
static struct platform_device android_pmem_gpu_device = {
.name = "android_pmem",
.id = 1,
.dev = {
.platform_data = &android_pmem_gpu_pdata,
},
};
static struct android_pmem_platform_data android_pmem_vpu_pdata = {
.name = "pmem_vpu",
@@ -408,6 +393,35 @@ struct rk29_sdmmc_platform_data default_sdmmc1_data = {
};
#endif
#ifdef CONFIG_VIVANTE
static struct resource resources_gpu[] = {
[0] = {
.name = "gpu_irq",
.start = IRQ_GPU,
.end = IRQ_GPU,
.flags = IORESOURCE_IRQ,
},
[1] = {
.name = "gpu_base",
.start = RK29_GPU_PHYS,
.end = RK29_GPU_PHYS + (256 << 10),
.flags = IORESOURCE_MEM,
},
[2] = {
.name = "gpu_mem",
.start = PMEM_GPU_BASE,
.end = PMEM_GPU_BASE + PMEM_GPU_SIZE,
.flags = IORESOURCE_MEM,
},
};
struct platform_device rk29_device_gpu = {
.name = "galcore",
.id = 0,
.num_resources = ARRAY_SIZE(resources_gpu),
.resource = resources_gpu,
};
#endif
static void __init rk29_board_iomux_init(void)
{
#ifdef CONFIG_UART0_RK29
@@ -461,7 +475,6 @@ static struct platform_device *devices[] __initdata = {
&rk29_device_gpu,
#endif
&android_pmem_device,
&android_pmem_gpu_device,
&android_pmem_vpu_device,
};

29
arch/arm/mach-rk29/devices.c
View File

@@ -167,35 +167,6 @@ struct platform_device rk29_device_uart3 = {
};
#endif
#ifdef CONFIG_VIVANTE
static struct resource resources_gpu[] = {
[0] = {
.name = "gpu_irq",
.start = IRQ_GPU,
.end = IRQ_GPU,
.flags = IORESOURCE_IRQ,
},
[1] = {
.name = "gpu_base",
.start = RK29_GPU_PHYS,
.end = RK29_GPU_PHYS + (256 << 10),
.flags = IORESOURCE_MEM,
},
[2] = {
.name = "gpu_mem",
.start = 0x66400000, //0x67C00000,
.end = 0x66400000 + (28 << 20), //0x67C00000 + (4 << 20),
.flags = IORESOURCE_MEM,
},
};
struct platform_device rk29_device_gpu = {
.name = "galcore",
.id = 0,
.num_resources = ARRAY_SIZE(resources_gpu),
.resource = resources_gpu,
};
#endif
#ifdef CONFIG_FB_RK29
/* rk29 fb resource */
static struct resource rk29_fb_resource[] = {

1
arch/arm/mach-rk29/devices.h
View File

@@ -22,7 +22,6 @@ extern struct platform_device rk29_device_uart0;
extern struct platform_device rk29_device_uart1;
extern struct platform_device rk29_device_uart2;
extern struct platform_device rk29_device_uart3;
extern struct platform_device rk29_device_gpu;
extern struct platform_device rk29_device_fb;
extern struct platform_device rk29_device_nand;
extern struct rk29_sdmmc_platform_data default_sdmmc0_data;