[v1] AM35xx-Craneboard:Update

Commit Message

[e-mail] May 5, 2011, 7:15 a.m. UTC

From: Srinath.R <[e-mail]>

Replaced gpio_request()/gpio_direction_output() with gpio_request_one() in am3517_crane_init.

Signed-off-by: Srinath.R <[e-mail]>
---
 arch/arm/mach-omap2/board-am3517crane.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

Comments

Igor Grinberg May 5, 2011, 8:46 a.m. UTC | #1

Hi Srinath,


On 05/05/11 10:15, [e-mail] wrote:

> From: Srinath.R <[e-mail]>
>
> Replaced gpio_request()/gpio_direction_output() with gpio_request_one() in am3517_crane_init.

This has been already done and waits for Tony to apply.
Please, see:
http://www.spinics.net/lists/arm-kernel/msg123823.html

Patch

diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c
index a890d24..b8c7150 100644
--- a/arch/arm/mach-omap2/board-am3517crane.c
+++ b/arch/arm/mach-omap2/board-am3517crane.c
@@ -89,19 +89,13 @@  static void __init am3517_crane_init(void)
 		return;
 	}
 
-	ret = gpio_request(GPIO_USB_POWER, "usb_ehci_enable");
+	ret = gpio_request_one(GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
+				"usb_ehci_enable");
 	if (ret < 0) {
 		pr_err("Can not request GPIO %d\n", GPIO_USB_POWER);
 		return;
 	}
 
-	ret = gpio_direction_output(GPIO_USB_POWER, 1);
-	if (ret < 0) {
-		gpio_free(GPIO_USB_POWER);
-		pr_err("Unable to initialize EHCI power\n");
-		return;
-	}
-
 	usbhs_init(&usbhs_bdata);
 }