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

werner at sita.openmoko.org werner at sita.openmoko.org
Tue Jan 22 13:27:17 CET 2008


Author: werner
Date: 2008-01-22 13:27:14 +0100 (Tue, 22 Jan 2008)
New Revision: 3914

Modified:
   branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
Log:
2.6.24 did not match the vibrator LED device to the right driver

This fixes that and allows control of the vibrator by the following
path:

echo 127 >/sys/bus/platform/devices/neo1973-vibrator.0/leds/neo1973\:vibrator/brightness

Signed-off-by: warmcat <andy at openmoko.com>

gta02-core.patch
- arch/arm/mach-s3c2440/mach-gta02.c (gta01_led_dev): changed name from 
  gta01-led to neo1973-vibrator



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	2008-01-22 12:00:10 UTC (rev 3913)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch	2008-01-22 12:27:14 UTC (rev 3914)
@@ -1,7 +1,7 @@
-Index: linux-2.6.24-rc7/arch/arm/mach-s3c2440/mach-gta02.c
+Index: linux-2.6.24-rc8/arch/arm/mach-s3c2440/mach-gta02.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.24-rc7/arch/arm/mach-s3c2440/mach-gta02.c
++++ linux-2.6.24-rc8/arch/arm/mach-s3c2440/mach-gta02.c
 @@ -0,0 +1,821 @@
 +/*
 + * linux/arch/arm/mach-s3c2440/mach-gta02.c
@@ -501,7 +501,7 @@
 +};
 +
 +static struct platform_device gta01_led_dev = {
-+	.name		= "gta01-led",
++	.name		= "neo1973-vibrator",
 +	.num_resources	= ARRAY_SIZE(gta01_led_resources),
 +	.resource	= gta01_led_resources,
 +};
@@ -824,10 +824,10 @@
 +	.init_machine	= gta02_machine_init,
 +	.timer		= &s3c24xx_timer,
 +MACHINE_END
-Index: linux-2.6.24-rc7/include/asm-arm/arch-s3c2410/gta02.h
+Index: linux-2.6.24-rc8/include/asm-arm/arch-s3c2410/gta02.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.24-rc7/include/asm-arm/arch-s3c2410/gta02.h
++++ linux-2.6.24-rc8/include/asm-arm/arch-s3c2410/gta02.h
 @@ -0,0 +1,97 @@
 +#ifndef _GTA02_H
 +#define _GTA02_H
@@ -926,10 +926,10 @@
 +#define GTA02v3_IRQ_nGSM_OC	IRQ_EINT19	/* v3 + v4 only */
 +
 +#endif /* _GTA02_H */
-Index: linux-2.6.24-rc7/arch/arm/mach-s3c2440/Kconfig
+Index: linux-2.6.24-rc8/arch/arm/mach-s3c2440/Kconfig
 ===================================================================
---- linux-2.6.24-rc7.orig/arch/arm/mach-s3c2440/Kconfig
-+++ linux-2.6.24-rc7/arch/arm/mach-s3c2440/Kconfig
+--- linux-2.6.24-rc8.orig/arch/arm/mach-s3c2440/Kconfig
++++ linux-2.6.24-rc8/arch/arm/mach-s3c2440/Kconfig
 @@ -74,5 +74,20 @@
  	help
  	   Say Y here if you are using the FIC Neo1973 GSM Phone
@@ -951,19 +951,19 @@
 +
  endmenu
  
-Index: linux-2.6.24-rc7/arch/arm/mach-s3c2440/Makefile
+Index: linux-2.6.24-rc8/arch/arm/mach-s3c2440/Makefile
 ===================================================================
---- linux-2.6.24-rc7.orig/arch/arm/mach-s3c2440/Makefile
-+++ linux-2.6.24-rc7/arch/arm/mach-s3c2440/Makefile
+--- linux-2.6.24-rc8.orig/arch/arm/mach-s3c2440/Makefile
++++ linux-2.6.24-rc8/arch/arm/mach-s3c2440/Makefile
 @@ -22,3 +22,4 @@
  obj-$(CONFIG_ARCH_S3C2440)	+= mach-smdk2440.o
  obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
  obj-$(CONFIG_MACH_HXD8)		+= mach-hxd8.o
 +obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-Index: linux-2.6.24-rc7/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+Index: linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
 ===================================================================
---- linux-2.6.24-rc7.orig/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-+++ linux-2.6.24-rc7/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+--- linux-2.6.24-rc8.orig/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
++++ linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
 @@ -19,7 +19,9 @@
  #include <linux/pcf50606.h>
  
@@ -1081,10 +1081,10 @@
  	/* we pull reset to low to make sure that the chip doesn't
  	 * drain power through the reset line */
  	s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-Index: linux-2.6.24-rc7/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+Index: linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
 ===================================================================
---- linux-2.6.24-rc7.orig/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ linux-2.6.24-rc7/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+--- linux-2.6.24-rc8.orig/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
++++ linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
 @@ -19,8 +19,14 @@
  #include <linux/errno.h>
  
@@ -1193,11 +1193,11 @@
  
  	return sysfs_create_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
  }
-Index: linux-2.6.24-rc7/drivers/leds/leds-neo1973-vibrator.c
+Index: linux-2.6.24-rc8/drivers/leds/leds-neo1973-vibrator.c
 ===================================================================
---- linux-2.6.24-rc7.orig/drivers/leds/leds-neo1973-vibrator.c
-+++ linux-2.6.24-rc7/drivers/leds/leds-neo1973-vibrator.c
-@@ -107,7 +107,7 @@
+--- linux-2.6.24-rc8.orig/drivers/leds/leds-neo1973-vibrator.c
++++ linux-2.6.24-rc8/drivers/leds/leds-neo1973-vibrator.c
+@@ -113,7 +113,7 @@
  	struct resource *r;
  	int rc;
  
@@ -1206,10 +1206,10 @@
  		return -EIO;
  
  	r = platform_get_resource(pdev, 0, 0);
-Index: linux-2.6.24-rc7/sound/soc/s3c24xx/neo1973_wm8753.c
+Index: linux-2.6.24-rc8/sound/soc/s3c24xx/neo1973_wm8753.c
 ===================================================================
---- linux-2.6.24-rc7.orig/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ linux-2.6.24-rc7/sound/soc/s3c24xx/neo1973_wm8753.c
+--- linux-2.6.24-rc8.orig/sound/soc/s3c24xx/neo1973_wm8753.c
++++ linux-2.6.24-rc8/sound/soc/s3c24xx/neo1973_wm8753.c
 @@ -672,6 +672,12 @@
  {
  	int ret;





More information about the commitlog mailing list