diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-06-02 22:06:50 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-06-02 22:06:50 +0100 |
| commit | 31f56d4cb19c8ba73bd2b5fba91ce7d626dc642e (patch) | |
| tree | 74ddc4935f557a7a24f8b96c289f7839983d1172 /drivers/mfd/glamo/glamo-core.c | |
| parent | 740d8196e83bd7eaccf2f3575019a7bd96444c1d (diff) | |
Reorganise memory map (again)
This reuinites the "framebuffer" and "work" VRAM areas. With KMS, both roles will be done
by one pool of memory.
Signed-off-by: Thomas White <taw@bitwiz.org.uk>
Diffstat (limited to 'drivers/mfd/glamo/glamo-core.c')
| -rw-r--r-- | drivers/mfd/glamo/glamo-core.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index a485e34f748..075b9a05a0e 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -182,17 +182,17 @@ static struct resource glamo_cmdq_resources[] = { .end = GLAMO_REGOFS_RISC - 1, .flags = IORESOURCE_MEM, }, { - .name = "glamo-work-mem", - .start = GLAMO_MEM_BASE + GLAMO_OFFSET_WORK, - .end = GLAMO_MEM_BASE + GLAMO_OFFSET_WORK + - GLAMO_WORK_SIZE - 1, - .flags = IORESOURCE_MEM, - }, { .name = "glamo-command-queue", .start = GLAMO_MEM_BASE + GLAMO_OFFSET_CMDQ, .end = GLAMO_MEM_BASE + GLAMO_OFFSET_CMDQ + GLAMO_CMDQ_SIZE - 1, .flags = IORESOURCE_MEM, + }, { + .name = "glamo-fb-mem", + .start = GLAMO_MEM_BASE + GLAMO_OFFSET_FB, + .end = GLAMO_MEM_BASE + GLAMO_OFFSET_FB + + GLAMO_FB_SIZE - 1, + .flags = IORESOURCE_MEM, }, }; @@ -213,13 +213,7 @@ static struct resource glamo_fb_resources[] = { .start = GLAMO_REGOFS_LCD, .end = GLAMO_REGOFS_MMC - 1, .flags = IORESOURCE_MEM, - }, { - .name = "glamo-fb-mem", - .start = GLAMO_MEM_BASE + GLAMO_OFFSET_FB, - .end = GLAMO_MEM_BASE + GLAMO_OFFSET_FB + - GLAMO_FB_SIZE - 1, - .flags = IORESOURCE_MEM, - }, + } }; static struct platform_device glamo_fb_dev = { |