From 02289b759221dc646ff53a551b1504f1d31c6e6e Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Thu, 30 Jul 2009 23:17:53 +0000 Subject: [PATCH] [s3c24xx] Post cleanup cleanup SVN-Revision: 17055 --- .../files-2.6.30/drivers/leds/leds-gta02-vibrator.c | 2 -- .../files-2.6.30/drivers/mfd/glamo/glamo-core.c | 11 +++++++++-- .../s3c24xx/patches-2.6.30/055-gta02-leds.patch | 12 ++---------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02-vibrator.c b/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02-vibrator.c index e560ab76c3..41dd77430a 100644 --- a/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02-vibrator.c +++ b/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02-vibrator.c @@ -24,8 +24,6 @@ #include #include -#include - #define COUNTER 64 static struct gta02_vib_priv { diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.c b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.c index b6df59d34e..ce896d31ed 100644 --- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.c +++ b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-core.c @@ -36,8 +36,6 @@ #include #include #include -#include -#include #include #include @@ -129,6 +127,15 @@ static void reg_set_bit_mask(struct glamo_core *glamo, spin_unlock(&glamo->lock); } +static int __reg_write_batch(struct glamo_core *glamo, + uint16_t start, size_t num, uint16_t *regs) +{ + int end = start + num * 2 + for(end = start + num * 2; start < end; start += 2, ++regs) { + *regs = __reg_read(glamo, start); + } +} + static inline void __reg_set_bit(struct glamo_core *glamo, u_int16_t reg, u_int16_t bit) { diff --git a/target/linux/s3c24xx/patches-2.6.30/055-gta02-leds.patch b/target/linux/s3c24xx/patches-2.6.30/055-gta02-leds.patch index cf0b4fa250..7d282feb33 100644 --- a/target/linux/s3c24xx/patches-2.6.30/055-gta02-leds.patch +++ b/target/linux/s3c24xx/patches-2.6.30/055-gta02-leds.patch @@ -1,6 +1,6 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -227,6 +227,19 @@ config LEDS_BD2802 +@@ -227,6 +227,12 @@ config LEDS_BD2802 This option enables support for BD2802GU RGB LED driver chips accessed via the I2C bus. @@ -9,25 +9,17 @@ + depends on LEDS_CLASS && MACH_NEO1973_GTA02 + help + This option enables support for the vibrator on the Openmoko Freerunner. -+ -+config LEDS_GTA02 -+ tristate "LED Support for the Openmoko Freerunner GSM phone" -+ depends on LEDS_CLASS && MACH_NEO1973_GTA02 -+ help -+ This option enables support for the LEDs on the Openmoko Freerunner. -+ + comment "LED Triggers" config LEDS_TRIGGERS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -30,6 +30,8 @@ obj-$(CONFIG_LEDS_PWM) += leds-pwm.o +@@ -30,6 +30,7 @@ obj-$(CONFIG_LEDS_PWM) += leds-pwm.o # LED SPI Drivers obj-$(CONFIG_LEDS_DAC124S085) += leds-dac124s085.o +obj-$(CONFIG_LEDS_GTA02_VIBRATOR) += leds-gta02-vibrator.o -+obj-$(CONFIG_LEDS_GTA02) += leds-gta02.o # LED Triggers obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o -- 2.30.2