Commit b2a731aa authored by Laurie Bradshaw's avatar Laurie Bradshaw Committed by Nicolas Pitre

[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: default avatarNicolas Pitre <nico@marvell.com>
parent 1afeea84
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
#define DNS323_GPIO_LED_RIGHT_AMBER 1 #define DNS323_GPIO_LED_RIGHT_AMBER 1
#define DNS323_GPIO_LED_LEFT_AMBER 2 #define DNS323_GPIO_LED_LEFT_AMBER 2
#define DNS323_GPIO_SYSTEM_UP 3 #define DNS323_GPIO_SYSTEM_UP 3
#define DNS323_GPIO_LED_POWER 5 #define DNS323_GPIO_LED_POWER1 4
#define DNS323_GPIO_LED_POWER2 5
#define DNS323_GPIO_OVERTEMP 6 #define DNS323_GPIO_OVERTEMP 6
#define DNS323_GPIO_RTC 7 #define DNS323_GPIO_RTC 7
#define DNS323_GPIO_POWER_OFF 8 #define DNS323_GPIO_POWER_OFF 8
...@@ -237,11 +238,31 @@ static int __init dns323_read_mac_addr(void) ...@@ -237,11 +238,31 @@ static int __init dns323_read_mac_addr(void)
* GPIO LEDs (simple - doesn't use hardware blinking support) * GPIO LEDs (simple - doesn't use hardware blinking support)
*/ */
#define ORION_BLINK_HALF_PERIOD 100 /* ms */
static int dns323_gpio_blink_set(unsigned gpio,
unsigned long *delay_on, unsigned long *delay_off)
{
static int value = 0;
if (!*delay_on && !*delay_off)
*delay_on = *delay_off = ORION_BLINK_HALF_PERIOD;
if (ORION_BLINK_HALF_PERIOD == *delay_on
&& ORION_BLINK_HALF_PERIOD == *delay_off) {
value = !value;
orion_gpio_set_blink(gpio, value);
return 0;
}
return -EINVAL;
}
static struct gpio_led dns323_leds[] = { static struct gpio_led dns323_leds[] = {
{ {
.name = "power:blue", .name = "power:blue",
.gpio = DNS323_GPIO_LED_POWER, .gpio = DNS323_GPIO_LED_POWER2,
.default_state = LEDS_GPIO_DEFSTATE_ON, .default_trigger = "timer",
}, { }, {
.name = "right:amber", .name = "right:amber",
.gpio = DNS323_GPIO_LED_RIGHT_AMBER, .gpio = DNS323_GPIO_LED_RIGHT_AMBER,
...@@ -256,6 +277,7 @@ static struct gpio_led dns323_leds[] = { ...@@ -256,6 +277,7 @@ static struct gpio_led dns323_leds[] = {
static struct gpio_led_platform_data dns323_led_data = { static struct gpio_led_platform_data dns323_led_data = {
.num_leds = ARRAY_SIZE(dns323_leds), .num_leds = ARRAY_SIZE(dns323_leds),
.leds = dns323_leds, .leds = dns323_leds,
.gpio_blink_set = dns323_gpio_blink_set,
}; };
static struct platform_device dns323_gpio_leds = { static struct platform_device dns323_gpio_leds = {
...@@ -412,6 +434,14 @@ static void __init dns323_init(void) ...@@ -412,6 +434,14 @@ static void __init dns323_init(void)
orion5x_setup_dev_boot_win(DNS323_NOR_BOOT_BASE, DNS323_NOR_BOOT_SIZE); orion5x_setup_dev_boot_win(DNS323_NOR_BOOT_BASE, DNS323_NOR_BOOT_SIZE);
platform_device_register(&dns323_nor_flash); platform_device_register(&dns323_nor_flash);
/* The 5181 power LED is active low and requires
* DNS323_GPIO_LED_POWER1 to also be low.
*/
if (dns323_dev_id() == MV88F5181_DEV_ID) {
dns323_leds[0].active_low = 1;
gpio_direction_output(DNS323_GPIO_LED_POWER1, 0);
}
platform_device_register(&dns323_gpio_leds); platform_device_register(&dns323_gpio_leds);
platform_device_register(&dns323_button_device); platform_device_register(&dns323_button_device);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment