From patchwork Thu Jan 6 18:21:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 460081 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 p06ILbiw013790 for ; Thu, 6 Jan 2011 18:21:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752465Ab1AFSVN (ORCPT ); Thu, 6 Jan 2011 13:21:13 -0500 Received: from na3sys009aog111.obsmtp.com ([74.125.149.205]:49086 "EHLO na3sys009aog111.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752204Ab1AFSVM (ORCPT ); Thu, 6 Jan 2011 13:21:12 -0500 Received: from source ([209.85.161.176]) by na3sys009aob111.postini.com ([74.125.148.12]) with SMTP ID DSNKTSYIF2ZwAVGfWeKyTyn73zXVOFkLfMG1@postini.com; Thu, 06 Jan 2011 10:21:12 PST Received: by mail-gx0-f176.google.com with SMTP id 4so8002697gxk.7 for ; Thu, 06 Jan 2011 10:21:11 -0800 (PST) Received: by 10.150.49.14 with SMTP id w14mr23617088ybw.128.1294338069821; Thu, 06 Jan 2011 10:21:09 -0800 (PST) Received: from [128.247.74.250] (dragon.ti.com [192.94.94.33]) by mx.google.com with ESMTPS id q33sm12355755yba.19.2011.01.06.10.21.07 (version=SSLv3 cipher=RC4-MD5); Thu, 06 Jan 2011 10:21:08 -0800 (PST) Message-ID: <4D260812.3010605@ti.com> Date: Thu, 06 Jan 2011 12:21:06 -0600 From: Nishanth Menon User-Agent: Thunderbird 2.0.0.24 (X11/20101027) MIME-Version: 1.0 To: Kevin Hilman CC: Koen Kooi , Brad Parker , Anand Gadiyar , Ming Lei , 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 Subject: Re: linux-next: manual merge of the usb tree with the omap tree References: <20101223171859.f6842045.sfr@canb.auug.org.au> <4D139517.3010608@ti.com> <4ce0f816f951f24ca3de9c84d9f70842@mail.gmail.com> <4D25E313.4060202@heeltoe.com> <8B3471BB-CB3F-4CE6-B523-D9C5E87B9CEC@dominion.thruhere.net> <87pqs9vqya.fsf@ti.com> In-Reply-To: <87pqs9vqya.fsf@ti.com> 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 18:21:37 +0000 (UTC) From d34971b71d61f3fc20e724a48dbdfe347aa53802 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 6 Jan 2011 12:14:00 -0600 Subject: [PATCH 2/2] omap3: beaglexm: fix DVI reset GPIO GPIO reset line for Beagle XM is different from vanilla beagle so we populate it as part of gpio update routine. Signed-off-by: Nishanth Menon Signed-off-by: Koen Kooi --- arch/arm/mach-omap2/board-omap3beagle.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 1b5aa7a..d628f5e 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -199,7 +199,7 @@ static struct omap_dss_device beagle_dvi_device = { .name = "dvi", .driver_name = "generic_panel", .phy.dpi.data_lines = 24, - .reset_gpio = 170, + .reset_gpio = -EINVAL, .platform_enable = beagle_enable_dvi, .platform_disable = beagle_disable_dvi, }; @@ -308,6 +308,12 @@ static int beagle_twl_gpio_setup(struct device *dev, else gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); + /* DVI reset GPIO is different between beagle revisions */ + if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) + beagle_dvi_device.reset_gpio = 129; + else + beagle_dvi_device.reset_gpio = 170; + /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; -- 1.6.3.3