diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-11-17 23:45:29 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2010-05-22 19:01:11 +0200 |
| commit | 0c38c5d7bcce1b62534e76419ee04eea0fe50128 (patch) | |
| tree | 758ed1f7e3ab61d2b13d26b9f4a910a44d8585dc /drivers/mfd/glamo/glamo-core.c | |
| parent | 4fe52e62cc86fc303cbc0f9a3c5081e38f95b950 (diff) | |
Work on Glamo-core for DRM
This adds modifications to the core of the Glamo driver to expose functionality
to support DRM and KMS.
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 | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index 23073fedea2..f894c91476a 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -222,10 +222,25 @@ static struct resource glamo_fb_resources[] = { .flags = IORESOURCE_MEM, }, { .name = "glamo-fb-mem", - .start = GLAMO_OFFSET_FB, - .end = GLAMO_OFFSET_FB + GLAMO_FB_SIZE - 1, + .start = GLAMO_MEM_BASE + GLAMO_OFFSET_FB, + .end = GLAMO_MEM_BASE + GLAMO_OFFSET_FB + GLAMO_FB_SIZE - 1, .flags = IORESOURCE_MEM, - }, + }, { + .name = "glamo-cmdq-regs", + .start = GLAMO_REGOFS_CMDQUEUE, + .end = GLAMO_REGOFS_RISC - 1, + .flags = IORESOURCE_MEM, + }, { + .name = "glamo-2d-regs", + .start = GLAMO_REGOFS_2D, + .end = GLAMO_REGOFS_3D- 1, + .flags = IORESOURCE_MEM, + }, { + .name = "glamo-2d-irq", + .start = GLAMO_IRQ_2D, + .end = GLAMO_IRQ_2D, + .flags = IORESOURCE_IRQ, + } }; static struct resource glamo_mmc_resources[] = { @@ -236,9 +251,9 @@ static struct resource glamo_mmc_resources[] = { .flags = IORESOURCE_MEM }, { .name = "glamo-mmc-mem", - .start = GLAMO_OFFSET_FB + GLAMO_FB_SIZE, - .end = GLAMO_OFFSET_FB + GLAMO_FB_SIZE + - GLAMO_MMC_BUFFER_SIZE - 1, + .start = GLAMO_MEM_BASE + GLAMO_OFFSET_MMC, + .end = GLAMO_MEM_BASE + GLAMO_OFFSET_MMC + + GLAMO_MMC_BUFFER_SIZE - 1, .flags = IORESOURCE_MEM }, { .start = GLAMO_IRQ_MMC, |