r3595 - branches/src/target/kernel/2.6.24.x/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-12-06 11:52:46 +0100 (Thu, 06 Dec 2007)
New Revision: 3595

Modified:
   branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
Log:
merge commit 3214 from 2.6.22.5 patchset: 
fix GTA02 led definitions and resource names


Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch	2007-12-06 10:50:42 UTC (rev 3594)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch	2007-12-06 10:52:46 UTC (rev 3595)
@@ -461,17 +461,17 @@
 +
 +static struct resource gta02_led_resources[] = {
 +	{
-+		.name	= "gta02-power:color",
-+		.start	= GTA02_GPIO_PWR_LED,
-+		.end	= GTA02_GPIO_PWR_LED,
++		.name	= "gta02-power:orange",
++		.start	= GTA02_GPIO_PWR_LED1,
++		.end	= GTA02_GPIO_PWR_LED1,
 +	}, {
-+		.name	= "gta02-aux:foo",
-+		.start	= GTA02_GPIO_AUX_LED1,
-+		.end	= GTA02_GPIO_AUX_LED1,
++		.name	= "gta02-power:blue",
++		.start	= GTA02_GPIO_PWR_LED2,
++		.end	= GTA02_GPIO_PWR_LED2,
 +	}, {
-+		.name	= "gta02-aux:bar",
-+		.start	= GTA02_GPIO_AUX_LED2,
-+		.end	= GTA02_GPIO_AUX_LED2,
++		.name	= "gta02-aux:red",
++		.start	= GTA02_GPIO_AUX_LED,
++		.end	= GTA02_GPIO_AUX_LED,
 +	},
 +};
 +
@@ -685,9 +685,9 @@
 +
 +#define GTA02_GPIO_n3DL_GSM	S3C2410_GPA13	/* v1 + v2 + v3 only */
 +
-+#define GTA02_GPIO_AUX_LED1	S3C2410_GPB0
-+#define GTA02_GPIO_AUX_LED2	S3C2410_GPB1
-+#define GTA02_GPIO_PWR_LED	S3C2410_GPB2
++#define GTA02_GPIO_PWR_LED1	S3C2410_GPB0
++#define GTA02_GPIO_PWR_LED2	S3C2410_GPB1
++#define GTA02_GPIO_AUX_LED	S3C2410_GPB2
 +#define GTA02_GPIO_VIBRATOR_ON	S3C2410_GPB3
 +#define GTA02v1_GPIO_GPS_PWRON	S3C2410_GPB4	/* v1 only */
 +#define GTA02_GPIO_MODEM_RST	S3C2410_GPB5