From patchwork Thu Jan 6 15:50:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 459351 X-Patchwork-Delegate: khilman@deeprootsystems.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 p06FolPt024730 for ; Thu, 6 Jan 2011 15:50:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753388Ab1AFPuH (ORCPT ); Thu, 6 Jan 2011 10:50:07 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:53497 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752811Ab1AFPuF (ORCPT ); Thu, 6 Jan 2011 10:50:05 -0500 Received: by wwa36 with SMTP id 36so17543580wwa.1 for ; Thu, 06 Jan 2011 07:50:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=lMaMyw4qnezoEjAwyGkkWF9en0p36SLcduHnoSHMZYg=; b=yFpMpEQLXUifaXdzQmVA9Dn1BXuohlFYiywDo7aQSztO4mreYVqtPBxvWyTByA5tve bVXFfT88f1iN5hRZnNJNjlRvEySQvtkJdFIk6H9/j8Is6PuCWfASFPlhb2yLrlIgZBlf H8dKO+3StDD3isuebDPAGQWiFhU6u565bkYDw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=XestSu4gzrfDHDGaYhYC2F2TxlWhTzq43DTrJFWclJh1U07Fy4DwIB4Nlso3dTKFl8 CQmvPTuZ9tTcWqWj8F32DzNGQkQ4o0YlA48dcMZFkvjEKrDWaAElh6sfK8wAh0oT0clS sF11ITeKoBufMaWCQZb+BgFiHHd/gsTu9cFDM= MIME-Version: 1.0 Received: by 10.216.171.19 with SMTP id q19mr669491wel.53.1294329002844; Thu, 06 Jan 2011 07:50:02 -0800 (PST) Received: by 10.216.64.73 with HTTP; Thu, 6 Jan 2011 07:50:02 -0800 (PST) In-Reply-To: References: <20101223171859.f6842045.sfr@canb.auug.org.au> <4D139517.3010608@ti.com> <4ce0f816f951f24ca3de9c84d9f70842@mail.gmail.com> Date: Thu, 6 Jan 2011 23:50:02 +0800 Message-ID: Subject: Re: linux-next: manual merge of the usb tree with the omap tree From: Ming Lei To: Anand Gadiyar Cc: Benoit Cousson , Stephen Rothwell , Paul Walmsley , Greg KH , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Felipe Balbi , Tony Lindgren , 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 06 Jan 2011 15:50:48 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index f1a8ede..3e130ae 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -299,7 +299,10 @@ 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, 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) */ gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; -- 1.7.3