Changeset 3126

Timestamp:

10/09/07 17:14:59 (6 years ago)

Author:

shoragan

Message:

Follow change in 2.6.22:
(orig r3112): laforge | 2007-10-08 13:26:02 +0200

glamo/gta02: The end address of resouces should be minus by one. This patch
also fixes a typo where glamo-3d uses glamo-2d's resources. (Chia-I Wu)

Location:

branches/src/target/kernel/2.6.23.x/patches

Files:

• gta02-core.patch (modified) (1 diff)
• smedia-glamo.patch (modified) (9 diffs)

branches/src/target/kernel/2.6.23.x/patches/gta02-core.patch

@@ -581 +581 @@
 +       [0] = {
 +               .start  = S3C2410_CS1,
-+               .end    = S3C2410_CS1 + 0x1000000,
++               .end    = S3C2410_CS1 + 0x1000000 - 1,
 +               .flags  = IORESOURCE_MEM,
 +       },

branches/src/target/kernel/2.6.23.x/patches/smedia-glamo.patch

@@ -74 +74 @@
 --- /dev/null
 +++ linux-2.6.23-rc8/drivers/video/glamo/glamo-regs.h
-@@ -0,0 +1,466 @@
+@@ -0,0 +1,467 @@
 +#ifndef _GLAMO_REGS_H
 +#define _GLAMO_REGS_H
@@ -116 +116 @@
 +       GLAMO_REGOFS_2D         = 0x1700,
 +       GLAMO_REGOFS_3D         = 0x1b00,
++       GLAMO_REGOFS_END        = 0x2400,
 +};
 +
@@ -698 +699 @@
 +               /* FIXME: those need to be incremented by parent base */
 +               .start  = GLAMO_REGOFS_MMC,
-+               .end    = GLAMO_REGOFS_MMC + 0x100,
++               .end    = GLAMO_REGOFS_MPROC0 - 1,
 +               .flags  = IORESOURCE_MEM
 +       }, {
@@ -716 +717 @@
 +       {
 +               .start  = GLAMO_REGOFS_JPEG,
-+               .end    = GLAMO_REGOFS_MPEG,
++               .end    = GLAMO_REGOFS_MPEG - 1,
 +               .flags  = IORESOURCE_MEM,
 +       }, {
@@ -734 +735 @@
 +       {
 +               .start  = GLAMO_REGOFS_MPEG,
-+               .end    = GLAMO_REGOFS_LCD,
++               .end    = GLAMO_REGOFS_LCD - 1,
 +               .flags  = IORESOURCE_MEM,
 +       }, {
@@ -752 +753 @@
 +       {
 +               .start  = GLAMO_REGOFS_2D,
-+               .end    = GLAMO_REGOFS_3D,
++               .end    = GLAMO_REGOFS_3D - 1,
 +               .flags  = IORESOURCE_MEM,
 +       }, {
@@ -770 +771 @@
 +       {
 +               .start  = GLAMO_REGOFS_3D,
-+               .end    = GLAMO_REGOFS_3D + 0x600,
++               .end    = GLAMO_REGOFS_END - 1,
 +               .flags  = IORESOURCE_MEM,
 +       },
@@ -777 +778 @@
 +static struct platform_device glamo_3d_dev = {
 +       .name           = "glamo-3d",
-+       .resource       = glamo_2d_resources,
-+       .num_resources  = ARRAY_SIZE(glamo_2d_resources),
++       .resource       = glamo_3d_resources,
++       .num_resources  = ARRAY_SIZE(glamo_3d_resources),
 +};
 +
@@ -801 +802 @@
 +               .name   = "glamo-fb-regs",
 +               .start  = GLAMO_REGOFS_LCD,
-+               .end    = GLAMO_REGOFS_LCD + 0x100,
++               .end    = GLAMO_REGOFS_MMC - 1,
 +               .flags  = IORESOURCE_MEM,
 +       }, {
 +               .name   = "glamo-fb-mem",
 +               .start  = GLAMO_OFFSET_FB,
-+               .end    = GLAMO_OFFSET_FB + GLAMO_FB_SIZE,
++               .end    = GLAMO_OFFSET_FB + GLAMO_FB_SIZE - 1,
 +               .flags  = IORESOURCE_MEM,
 +       },