Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2641375d authored by Simon Guinot's avatar Simon Guinot Committed by Nicolas Pitre
Browse files

[ARM] Kirkwood: update LED support for Network Space v2 



Signed-off-by: default avatarSimon Guinot <sguinot@lacie.com>
Signed-off-by: default avatarNicolas Pitre <nico@fluxnic.net>
parent 11efe71f

arch/arm/mach-kirkwood/netspace_v2-setup.c

+30 −41
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <mach/kirkwood.h>

#include <mach/leds-ns2.h>

#include <plat/time.h>

#include "common.h"

#include "mpp.h"
@@ -172,33 +173,9 @@ static struct platform_device netspace_v2_gpio_buttons = { 
 * GPIO LEDs

 ****************************************************************************/



/*

 * The blue front LED is wired to a CPLD and can blink in relation with the

 * SATA activity.

 *

 * The following array detail the different LED registers and the combination

 * of their possible values:

 *

 *  cmd_led   |  slow_led  | /SATA active | LED state

 *            |            |              |

 *     1      |     0      |      x       |  off

 *     -      |     1      |      x       |  on

 *     0      |     0      |      1       |  on

 *     0      |     0      |      0       |  blink (rate 300ms)

 */



#define NETSPACE_V2_GPIO_RED_LED	12

#define NETSPACE_V2_GPIO_BLUE_LED_SLOW	29

#define NETSPACE_V2_GPIO_BLUE_LED_CMD	30





static struct gpio_led netspace_v2_gpio_led_pins[] = {

	{

		.name			= "ns_v2:blue:sata",

		.default_trigger	= "default-on",

		.gpio			= NETSPACE_V2_GPIO_BLUE_LED_CMD,

		.active_low		= 1,

	},

	{

		.name	= "ns_v2:red:fail",

		.gpio	= NETSPACE_V2_GPIO_RED_LED,
@@ -218,22 +195,33 @@ static struct platform_device netspace_v2_gpio_leds = { 
	},

};



static void __init netspace_v2_gpio_leds_init(void)

/*****************************************************************************

 * Dual-GPIO CPLD LEDs

 ****************************************************************************/



#define NETSPACE_V2_GPIO_BLUE_LED_SLOW	29

#define NETSPACE_V2_GPIO_BLUE_LED_CMD	30



static struct ns2_led netspace_v2_led_pins[] = {

	{

	int err;

		.name	= "ns_v2:blue:sata",

		.cmd	= NETSPACE_V2_GPIO_BLUE_LED_CMD,

		.slow	= NETSPACE_V2_GPIO_BLUE_LED_SLOW,

	},

};



	/* Configure register slow_led to allow SATA activity LED blinking */

	err = gpio_request(NETSPACE_V2_GPIO_BLUE_LED_SLOW, "blue LED slow");

	if (err == 0) {

		err = gpio_direction_output(NETSPACE_V2_GPIO_BLUE_LED_SLOW, 0);

		if (err)

			gpio_free(NETSPACE_V2_GPIO_BLUE_LED_SLOW);

	}

	if (err)

		pr_err("netspace_v2: failed to configure blue LED slow GPIO\n");

static struct ns2_led_platform_data netspace_v2_leds_data = {

	.num_leds	= ARRAY_SIZE(netspace_v2_led_pins),

	.leds		= netspace_v2_led_pins,

};



	platform_device_register(&netspace_v2_gpio_leds);

}

static struct platform_device netspace_v2_leds = {

	.name		= "leds-ns2",

	.id		= -1,

	.dev		= {

		.platform_data	= &netspace_v2_leds_data,

	},

};



/*****************************************************************************

 * Timer
@@ -316,7 +304,8 @@ static void __init netspace_v2_init(void) 
	i2c_register_board_info(0, netspace_v2_i2c_info,

				ARRAY_SIZE(netspace_v2_i2c_info));



	netspace_v2_gpio_leds_init();

	platform_device_register(&netspace_v2_leds);

	platform_device_register(&netspace_v2_gpio_leds);

	platform_device_register(&netspace_v2_gpio_buttons);



	if (gpio_request(NETSPACE_V2_GPIO_POWER_OFF, "power-off") == 0 &&