diff options
author | Laurie Bradshaw <bradshaw.laurie@googlemail.com> | 2010-02-10 11:10:43 -0500 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2010-02-10 11:31:30 -0500 |
commit | b2a731aa5cbca7e0252da75e16de7ae5feb1313a (patch) | |
tree | e4a3042aba055271c4599caec5058cb7b7942a94 /arch/arm | |
parent | 1afeea84bd821e9a8c1c6606ba677bc229dd57de (diff) |
[ARM] orion5x: D-link DNS-323 revision A1 power LED
This patch fixes the power LED on DNS-323 revision A1, and adds timer
support for (hopefully) both A1 and B1 revisions.
Power LED on revision A1 is active low and also requires GPIO 4 to be
low to work.
Tested on my DNS-323 revision A1.
I have set the default trigger to timer as that replicates the
behaviour of the original firmware, userspace can change the trigger
at the end of the boot process providing a useful indication that
booting has completed.
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-orion5x/dns323-setup.c | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index 8f159db4d08a..421b82f7c63d 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c | |||
@@ -34,7 +34,8 @@ | |||
34 | #define DNS323_GPIO_LED_RIGHT_AMBER 1 | 34 | #define DNS323_GPIO_LED_RIGHT_AMBER 1 |
35 | #define DNS323_GPIO_LED_LEFT_AMBER 2 | 35 | #define DNS323_GPIO_LED_LEFT_AMBER 2 |
36 | #define DNS323_GPIO_SYSTEM_UP 3 | 36 | #define DNS323_GPIO_SYSTEM_UP 3 |
37 | #define DNS323_GPIO_LED_POWER 5 | 37 | #define DNS323_GPIO_LED_POWER1 4 |
38 | #define DNS323_GPIO_LED_POWER2 5 | ||
38 | #define DNS323_GPIO_OVERTEMP 6 | 39 | #define DNS323_GPIO_OVERTEMP 6 |
39 | #define DNS323_GPIO_RTC 7 | 40 | #define DNS323_GPIO_RTC 7 |
40 | #define DNS323_GPIO_POWER_OFF 8 | 41 | #define DNS323_GPIO_POWER_OFF 8 |
@@ -237,11 +238,31 @@ error_fail: | |||
237 | * GPIO LEDs (simple - doesn't use hardware blinking support) | 238 | * GPIO LEDs (simple - doesn't use hardware blinking support) |
238 | */ | 239 | */ |
239 | 240 | ||
241 | #define ORION_BLINK_HALF_PERIOD 100 /* ms */ | ||
242 | |||
243 | static int dns323_gpio_blink_set(unsigned gpio, | ||
244 | unsigned long *delay_on, unsigned long *delay_off) | ||
245 | { | ||
246 | static int value = 0; | ||
247 | |||
248 | if (!*delay_on && !*delay_off) | ||
249 | *delay_on = *delay_off = ORION_BLINK_HALF_PERIOD; | ||
250 | |||
251 | if (ORION_BLINK_HALF_PERIOD == *delay_on | ||
252 | && ORION_BLINK_HALF_PERIOD == *delay_off) { | ||
253 | value = !value; | ||
254 | orion_gpio_set_blink(gpio, value); | ||
255 | return 0; | ||
256 | } | ||
257 | |||
258 | return -EINVAL; | ||
259 | } | ||
260 | |||
240 | static struct gpio_led dns323_leds[] = { | 261 | static struct gpio_led dns323_leds[] = { |
241 | { | 262 | { |
242 | .name = "power:blue", | 263 | .name = "power:blue", |
243 | .gpio = DNS323_GPIO_LED_POWER, | 264 | .gpio = DNS323_GPIO_LED_POWER2, |
244 | .default_state = LEDS_GPIO_DEFSTATE_ON, | 265 | .default_trigger = "timer", |
245 | }, { | 266 | }, { |
246 | .name = "right:amber", | 267 | .name = "right:amber", |
247 | .gpio = DNS323_GPIO_LED_RIGHT_AMBER, | 268 | .gpio = DNS323_GPIO_LED_RIGHT_AMBER, |
@@ -256,6 +277,7 @@ static struct gpio_led dns323_leds[] = { | |||
256 | static struct gpio_led_platform_data dns323_led_data = { | 277 | static struct gpio_led_platform_data dns323_led_data = { |
257 | .num_leds = ARRAY_SIZE(dns323_leds), | 278 | .num_leds = ARRAY_SIZE(dns323_leds), |
258 | .leds = dns323_leds, | 279 | .leds = dns323_leds, |
280 | .gpio_blink_set = dns323_gpio_blink_set, | ||
259 | }; | 281 | }; |
260 | 282 | ||
261 | static struct platform_device dns323_gpio_leds = { | 283 | static struct platform_device dns323_gpio_leds = { |
@@ -412,6 +434,14 @@ static void __init dns323_init(void) | |||
412 | orion5x_setup_dev_boot_win(DNS323_NOR_BOOT_BASE, DNS323_NOR_BOOT_SIZE); | 434 | orion5x_setup_dev_boot_win(DNS323_NOR_BOOT_BASE, DNS323_NOR_BOOT_SIZE); |
413 | platform_device_register(&dns323_nor_flash); | 435 | platform_device_register(&dns323_nor_flash); |
414 | 436 | ||
437 | /* The 5181 power LED is active low and requires | ||
438 | * DNS323_GPIO_LED_POWER1 to also be low. | ||
439 | */ | ||
440 | if (dns323_dev_id() == MV88F5181_DEV_ID) { | ||
441 | dns323_leds[0].active_low = 1; | ||
442 | gpio_direction_output(DNS323_GPIO_LED_POWER1, 0); | ||
443 | } | ||
444 | |||
415 | platform_device_register(&dns323_gpio_leds); | 445 | platform_device_register(&dns323_gpio_leds); |
416 | 446 | ||
417 | platform_device_register(&dns323_button_device); | 447 | platform_device_register(&dns323_button_device); |