arm: mach-kirkwood: leds on eSATA SheevaPlug regression

PATCH New Sean Young 1 participant 1 message Apr 19, 2011

Subsystems (2)

Arm (32-bit) Arm sub-architectures

lore

Share & tools

lore

Sean Young

author

2011-04-19 16:42 UTC #0 lore raw

PATCH 1/1 arm: mach-kirkwood: leds on eSATA SheevaPlug regression

Fix regression in 2.6.39-rc2 on eSATA SheevaPlug where the leds are no longer probed correctly.

[    6.188278] leds-gpio: probe of leds-gpio failed with error -22

Also add missing blue led which was incorrectly wired to the green led.

Tested on both SheevaPlug models (original and eSATA).

Signed-off-by Robin Becker <[email protected]>

Signed-off-by Sean Young <[email protected]>

---

arch/arm/mach-kirkwood/sheevaplug-setup.c +11 -2

index 17de0bf..e6b864a 100644
@@ -65,6 +65,12 @@ static struct gpio_led sheevaplug_led_pins[] = {
 	},
 	{
 		.name			= "plug:green:health",
+		.default_trigger	= "none",
+		.gpio			= 48,
+		.active_low		= 1,
+	},
+	{
+		.name			= "plug:blue:health",
 		.default_trigger	= "default-on",
 		.gpio			= 49,
 		.active_low		= 1,

@@ -87,15 +93,18 @@ static struct platform_device sheevaplug_leds = {
 static unsigned int sheevaplug_mpp_config[] __initdata = {
 	MPP29_GPIO,	/* USB Power Enable */
 	MPP46_GPIO,	/* LED Red */
-	MPP49_GPIO,	/* LED */
+	MPP48_GPIO,	/* LED Green */
+	MPP49_GPIO,	/* LED Blue */
 	0
 };
 
 static unsigned int sheeva_esata_mpp_config[] __initdata = {
 	MPP29_GPIO,	/* USB Power Enable */
 	MPP44_GPIO,	/* SD Write Protect */
+	MPP46_GPIO,	/* LED Red */
 	MPP47_GPIO,	/* SD Card Detect */
-	MPP49_GPIO,	/* LED Green */
+	MPP48_GPIO,	/* LED Green */
+	MPP49_GPIO,	/* LED Blue */
 	0
 };