r3112 - trunk/src/target/kernel/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-10-08 13:26:02 +0200 (Mon, 08 Oct 2007)
New Revision: 3112

Modified:
   trunk/src/target/kernel/patches/gta02-core.patch
   trunk/src/target/kernel/patches/smedia-glamo.patch
Log:
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)


Modified: trunk/src/target/kernel/patches/gta02-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta02-core.patch	2007-10-08 10:08:49 UTC (rev 3111)
+++ trunk/src/target/kernel/patches/gta02-core.patch	2007-10-08 11:26:02 UTC (rev 3112)
@@ -580,7 +580,7 @@
 +static struct resource gta02_glamo_resources[] = {
 +	[0] = {
 +		.start	= S3C2410_CS1,
-+		.end	= S3C2410_CS1 + 0x1000000,
++		.end	= S3C2410_CS1 + 0x1000000 - 1,
 +		.flags	= IORESOURCE_MEM,
 +	},
 +	[1] = {

Modified: trunk/src/target/kernel/patches/smedia-glamo.patch
===================================================================
--- trunk/src/target/kernel/patches/smedia-glamo.patch	2007-10-08 10:08:49 UTC (rev 3111)
+++ trunk/src/target/kernel/patches/smedia-glamo.patch	2007-10-08 11:26:02 UTC (rev 3112)
@@ -73,7 +73,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.22.5-moko/drivers/video/glamo/glamo-regs.h
-@@ -0,0 +1,466 @@
+@@ -0,0 +1,467 @@
 +#ifndef _GLAMO_REGS_H
 +#define _GLAMO_REGS_H
 +
@@ -115,6 +115,7 @@
 +	GLAMO_REGOFS_RISC	= 0x1680,
 +	GLAMO_REGOFS_2D		= 0x1700,
 +	GLAMO_REGOFS_3D		= 0x1b00,
++	GLAMO_REGOFS_END	= 0x2400,
 +};
 +
 +
@@ -697,7 +698,7 @@
 +	{
 +		/* 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
 +	}, {
 +		.start	= IRQ_GLAMO_MMC,
@@ -715,7 +716,7 @@
 +static struct resource glamo_jpeg_resources[] = {
 +	{
 +		.start	= GLAMO_REGOFS_JPEG,
-+		.end	= GLAMO_REGOFS_MPEG,
++		.end	= GLAMO_REGOFS_MPEG - 1,
 +		.flags	= IORESOURCE_MEM,
 +	}, {
 +		.start	= IRQ_GLAMO_JPEG,
@@ -733,7 +734,7 @@
 +static struct resource glamo_mpeg_resources[] = {
 +	{
 +		.start	= GLAMO_REGOFS_MPEG,
-+		.end	= GLAMO_REGOFS_LCD,
++		.end	= GLAMO_REGOFS_LCD - 1,
 +		.flags	= IORESOURCE_MEM,
 +	}, {
 +		.start	= IRQ_GLAMO_MPEG,
@@ -751,7 +752,7 @@
 +static struct resource glamo_2d_resources[] = {
 +	{
 +		.start	= GLAMO_REGOFS_2D,
-+		.end	= GLAMO_REGOFS_3D,
++		.end	= GLAMO_REGOFS_3D - 1,
 +		.flags	= IORESOURCE_MEM,
 +	}, {
 +		.start	= IRQ_GLAMO_2D,
@@ -769,15 +770,15 @@
 +static struct resource glamo_3d_resources[] = {
 +	{
 +		.start	= GLAMO_REGOFS_3D,
-+		.end	= GLAMO_REGOFS_3D + 0x600,
++		.end	= GLAMO_REGOFS_END - 1,
 +		.flags	= IORESOURCE_MEM,
 +	},
 +};
 +
 +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),
 +};
 +
 +static struct platform_device glamo_spigpio_dev = {
@@ -800,12 +801,12 @@
 +	{
 +		.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,
 +	},
 +};