[s3c24xx] Post cleanup cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17055 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 e560ab7..41dd774 100644 (file)
--- 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 b6df59d..ce896d3 100644 (file)
--- 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 cf0b4fa..7d282fe 100644 (file)
--- 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