32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From: Arnaud Patard <arnaud.patard@rtp-net.org>
|
|
Date: Sat, 3 Apr 2010 08:31:33 +0000 (+0200)
|
|
Subject: [ARM] dns323-setup.c: fix WARN() when booting
|
|
X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=5efda86f74aa62f589297d0638c400b3f3fc6c64
|
|
|
|
[ARM] dns323-setup.c: fix WARN() when booting
|
|
|
|
Since commit b2a731aa5cbca7e0252da75e16de7ae5feb1313a, dns323_init() is
|
|
setting the power led gpio direction with gpio_direction_output() but
|
|
doesn't request the gpio before (which is not permitted by the gpio
|
|
layer afaik). This behaviour is triggering a WARN() at boot time.
|
|
|
|
Tested-by: Christian Samsel <csamsel@gmxpro.de>
|
|
Cc: Martin Michlmayr <tbm@cyrius.com>
|
|
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
|
|
Signed-off-by: Nicolas Pitre <nico@marvell.com>
|
|
[ Part 2: "Attached Text" ]
|
|
---
|
|
|
|
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
|
|
index 421b82f..685f34a 100644
|
|
--- a/arch/arm/mach-orion5x/dns323-setup.c
|
|
+++ b/arch/arm/mach-orion5x/dns323-setup.c
|
|
@@ -439,6 +439,7 @@ static void __init dns323_init(void)
|
|
*/
|
|
if (dns323_dev_id() == MV88F5181_DEV_ID) {
|
|
dns323_leds[0].active_low = 1;
|
|
+ gpio_request(DNS323_GPIO_LED_POWER1, "Power Led Enable");
|
|
gpio_direction_output(DNS323_GPIO_LED_POWER1, 0);
|
|
}
|
|
|