From patchwork Tue Sep 1 21:55:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 45104 X-Patchwork-Delegate: me@felipebalbi.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n81Ltatf017846 for ; Tue, 1 Sep 2009 21:55:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754310AbZIAVzd (ORCPT ); Tue, 1 Sep 2009 17:55:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755169AbZIAVzd (ORCPT ); Tue, 1 Sep 2009 17:55:33 -0400 Received: from qw-out-2122.google.com ([74.125.92.27]:1056 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752294AbZIAVzc (ORCPT ); Tue, 1 Sep 2009 17:55:32 -0400 Received: by qw-out-2122.google.com with SMTP id 8so178414qwh.37 for ; Tue, 01 Sep 2009 14:55:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=V2ni2i21eaMk5SQQr9w1EdAV6Ght2pyTC2+hDUeCUOg=; b=mCvu1Vc0kGpRtzQOLXsmCPoTdDE4qYh4vRIopUGa4nLph1+nuc7lqmmiUSbTr1RM9j 7m6pyhOURtWMZF+yBaeXj6462Y76lF7Sofg2rEmGg2rGYI68O50Bc00fhmMhelYgP5Sa AS5GZRGCTfOfXPbV2ZbcuwZ0ciH4kGe9RzPYY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=L3+YA68TgE2RNeqU0EUzgdKEHlx1Rizn2wbsUoC4C0jXNQk7sSacecm6eySAIEXMxR xmr0vbF08jOrEXSbm6j2vbAYCGmTksumtbw0nhXD34NbsezsX/URUZaAHkuFuXUdg38N 1mnFhvr118um+AaUZaJ6NTFxlO/zWFec2m0Vc= MIME-Version: 1.0 Received: by 10.229.119.154 with SMTP id z26mr2247143qcq.38.1251842134063; Tue, 01 Sep 2009 14:55:34 -0700 (PDT) Date: Tue, 1 Sep 2009 14:55:34 -0700 Message-ID: <5e088bd90909011455y48ce86c4t532ed5a66bac01fe@mail.gmail.com> Subject: ARM: OMAP3: Beagleboard: Fix EHCI initialization From: Steve Sakoman To: linux-omap@vger.kernel.org Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Enable USB power, use correct gpio for usb_ehci_init Signed-off-by: Steve Sakoman Tested-by: Eric Witcher --- arch/arm/mach-omap2/board-omap3beagle.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 07aee90..65934ea 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -161,7 +161,7 @@ static int beagle_twl_gpio_setup(struct device *dev, /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */ gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); - gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1); + gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; @@ -412,7 +412,8 @@ static void __init omap3_beagle_init(void) gpio_direction_output(170, true); usb_musb_init(); - usb_ehci_init(EHCI_HCD_OMAP_MODE_PHY, true, true, 57, 61); + usb_ehci_init(EHCI_HCD_OMAP_MODE_PHY, false, true, + -EINVAL, 147); omap3beagle_flash_init(); /* Ensure SDRC pins are mux'd for self-refresh */