Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759631AbZIPQZ1 (ORCPT ); Wed, 16 Sep 2009 12:25:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759598AbZIPQZY (ORCPT ); Wed, 16 Sep 2009 12:25:24 -0400 Received: from mail.atmel.fr ([81.80.104.162]:63353 "EHLO atmel-es2.atmel.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759596AbZIPQZW (ORCPT ); Wed, 16 Sep 2009 12:25:22 -0400 From: Nicolas Ferre To: linux-usb@vger.kernel.org, avictor.za@gmail.com Cc: linux-kernel@vger.kernel.org, david-b@pacbell.net, haavard.skinnemoen@atmel.com, patrice.vilchez@atmel.com, linux-arm-kernel@lists.infradead.org, nicolas.ferre@atmel.com Subject: [PATCH] at91: use gpiolib calls for USB vbus pin on at91sam9g45 Date: Wed, 16 Sep 2009 19:29:29 +0200 Message-Id: <1253122169-14806-1-git-send-email-nicolas.ferre@atmel.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <4AB10F7D.9060706@atmel.com> References: <4AB10F7D.9060706@atmel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1856 Lines: 52 Change pin configuration for USB vbus on at91sam9g45: use the generic gpiolib call instead of the at91 specific one. Use gpio_request() function with same identifier for OHCI and EHCI hosts as they are sharing the same pin. Signed-off-by: Nicolas Ferre --- This patch is on top of at91sam9g45 USB integration one: "[PATCH 2/2] at91/USB: at91sam9g45 series USB host integration" http://lkml.org/lkml/2009/6/9/221 arch/arm/mach-at91/at91sam9g45_devices.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 5be8cf2..7d939c0 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -118,8 +118,10 @@ void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data) /* Enable VBus control for UHP ports */ for (i = 0; i < data->ports; i++) { - if (data->vbus_pin[i]) - at91_set_gpio_output(data->vbus_pin[i], 0); + if (data->vbus_pin[i]) { + gpio_request(data->vbus_pin[i], "usb host vbus"); + gpio_direction_output(data->vbus_pin[i], 0); + } } usbh_ohci_data = *data; @@ -173,8 +175,10 @@ void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data) /* Enable VBus control for UHP ports */ for (i = 0; i < data->ports; i++) { - if (data->vbus_pin[i]) - at91_set_gpio_output(data->vbus_pin[i], 0); + if (data->vbus_pin[i]) { + gpio_request(data->vbus_pin[i], "usb host vbus"); + gpio_direction_output(data->vbus_pin[i], 0); + } } usbh_ehci_data = *data; -- 1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/