diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-07-30 23:17:53 +0000 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-07-30 23:17:53 +0000 |
| commit | f5ad888a7c5b86e67a585d5c1abe00aa5f631d64 (patch) | |
| tree | d02f04eca9cb431b23e678f4a3851869b3e07fa1 | |
| parent | 9887dc61008ac45f29b36f5d91cef6933ca4571b (diff) | |
| download | upstream-f5ad888a7c5b86e67a585d5c1abe00aa5f631d64.tar.gz upstream-f5ad888a7c5b86e67a585d5c1abe00aa5f631d64.tar.bz2 upstream-f5ad888a7c5b86e67a585d5c1abe00aa5f631d64.zip | |
Post cleanup cleanup
SVN-Revision: 17055
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 <plat/regs-timer.h> #include <linux/gta02-vibrator.h> -#include <linux/gta02-shadow.h> - #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 <linux/spinlock.h> #include <linux/mfd/core.h> #include <linux/mfd/glamo.h> -#include <linux/spi/glamo.h> -#include <linux/glamo-gpio.h> #include <linux/glamofb.h> #include <linux/io.h> @@ -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. @@ -10,24 +10,16 @@ + 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 |