diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-11-28 12:29:54 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-11-28 12:29:54 +0000 |
| commit | 1bb5d1e139a9d43e4209169801cf7bb41be5a05f (patch) | |
| tree | b26aed314b16f330abf5dc41f7e351b102752e58 | |
| parent | 47a35c8ffa76923855512de473fce839280aebca (diff) | |
| download | upstream-1bb5d1e139a9d43e4209169801cf7bb41be5a05f.tar.gz upstream-1bb5d1e139a9d43e4209169801cf7bb41be5a05f.tar.bz2 upstream-1bb5d1e139a9d43e4209169801cf7bb41be5a05f.zip | |
add latch driver modifications for the mi424wr
SVN-Revision: 13392
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.27/295-latch_led_driver.patch | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.27/295-latch_led_driver.patch b/target/linux/ixp4xx/patches-2.6.27/295-latch_led_driver.patch index c1f5059ef2..2d025337dd 100644 --- a/target/linux/ixp4xx/patches-2.6.27/295-latch_led_driver.patch +++ b/target/linux/ixp4xx/patches-2.6.27/295-latch_led_driver.patch @@ -15,7 +15,7 @@ depends on LEDS_CLASS && MACH_ARMCORE --- /dev/null +++ b/drivers/leds/leds-latch.c -@@ -0,0 +1,141 @@ +@@ -0,0 +1,149 @@ +/* + * LEDs driver for Memory Latched Devices + * @@ -44,8 +44,19 @@ + struct work_struct work; + u8 new_level; + u8 bit; ++ void (*set_led)(u8 bit, enum led_brightness value); +}; + ++static void latch_set_led(u8 bit, enum led_brightness value) ++{ ++ if (value == LED_OFF) ++ mem_keep |= (0x1 << bit); ++ else ++ mem_keep &= ~(0x1 << bit); ++ ++ writeb(mem_keep, iobase); ++} ++ +static void latch_led_set(struct led_classdev *led_cdev, + enum led_brightness value) +{ @@ -54,12 +65,7 @@ + + spin_lock(mem_lock); + -+ if (value == LED_OFF) -+ mem_keep |= (0x1 << led_dat->bit); -+ else -+ mem_keep &= ~(0x1 << led_dat->bit); -+ -+ writeb(mem_keep, iobase); ++ led_dat->set_led(led_dat->bit, value); + + spin_unlock(mem_lock); +} @@ -79,9 +85,6 @@ + if (!leds_data) + return -ENOMEM; + -+ iobase = ioremap_nocache(pdata->mem, 0x1000); -+ writeb(0xFF, iobase); -+ + for (i = 0; i < pdata->num_leds; i++) { + cur_led = &pdata->leds[i]; + led_dat = &leds_data[i]; @@ -91,6 +94,7 @@ + led_dat->cdev.brightness_set = latch_led_set; + led_dat->cdev.brightness = LED_OFF; + led_dat->bit = cur_led->bit; ++ led_dat->set_led = pdata->set_led ? pdata->set_led : latch_set_led; + + ret = led_classdev_register(&pdev->dev, &led_dat->cdev); + if (ret < 0) { @@ -98,6 +102,10 @@ + } + } + ++ if (!pdata->set_led) { ++ iobase = ioremap_nocache(pdata->mem, 0x1000); ++ writeb(0xFF, iobase); ++ } + platform_set_drvdata(pdev, leds_data); + + return 0; @@ -169,7 +177,7 @@ obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o --- a/include/linux/leds.h +++ b/include/linux/leds.h -@@ -148,5 +148,18 @@ struct gpio_led_platform_data { +@@ -148,5 +148,19 @@ struct gpio_led_platform_data { unsigned long *delay_off); }; @@ -184,6 +192,7 @@ + int num_leds; + u32 mem; + struct latch_led *leds; ++ void (*set_led)(u8 bit, enum led_brightness value); +}; + |