From patchwork Mon Oct 4 22:37:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Thrun X-Patchwork-Id: 230791 X-Patchwork-Delegate: me@felipebalbi.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o94MbSoC002524 for ; Mon, 4 Oct 2010 22:37:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756328Ab0JDWhS (ORCPT ); Mon, 4 Oct 2010 18:37:18 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:49055 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755246Ab0JDWhR (ORCPT ); Mon, 4 Oct 2010 18:37:17 -0400 Received: by ewy23 with SMTP id 23so2289904ewy.19 for ; Mon, 04 Oct 2010 15:37:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:content-type; bh=2pqa6UtX3aOWa+FjY+XCBC6Xk9O5V2h4CO64OCHsTrg=; b=k3xHFr5lsDdJCVBdR6wEzzopaUL/KH8XMxm9ujY47/pgBGGa0RjIpafP2716an7bIs 8/n4SRmIAc7LjyXTw1iq0zHCeQe6NocfERdIhcis7ueAtibB2An3pGaiB1QeJ+hTp1XT g3nsoGNlis5QnGvrwWyd/gturiGzPo9S3bnkU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=WSsBOb0kocc8oIM8KrPwHqITJg4HvBuvvNC9gOuOvW5ZsNtFuLk5WbeG3zpyCARzq9 KpzMBvFdeXVm23lu7xnM65Kzz9Tdaeyz8BlCCPEWfoPaBKTg/NyxOcq4h4DSLP/ucRPy wu8pxDnrqAZp12KOKou/ridwu7PULdK6loXhI= MIME-Version: 1.0 Received: by 10.213.17.195 with SMTP id t3mr7799462eba.61.1286231836339; Mon, 04 Oct 2010 15:37:16 -0700 (PDT) Received: by 10.14.119.8 with HTTP; Mon, 4 Oct 2010 15:37:16 -0700 (PDT) Date: Mon, 4 Oct 2010 18:37:16 -0400 Message-ID: Subject: [PATCH] beagle xm: enable USB hub at startup From: Max Thrun To: tony@atomide.com, linux-omap@vger.kernel.org Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 04 Oct 2010 22:37:29 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 73689c0..5a649b7 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -297,9 +297,13 @@ static int beagle_twl_gpio_setup(struct device *dev, gpio_request(gpio + 1, "EHCI_nOC"); gpio_direction_input(gpio + 1); - /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */ + /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active high / others active low) */ gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); - gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); + if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { + gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1); + } else { + gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); + } /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */