From patchwork Sun Dec 19 14:42:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 418781 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 oBJEgVlj011212 for ; Sun, 19 Dec 2010 14:42:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756420Ab0LSOma (ORCPT ); Sun, 19 Dec 2010 09:42:30 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:60016 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755708Ab0LSOm3 (ORCPT ); Sun, 19 Dec 2010 09:42:29 -0500 Received: by wyb28 with SMTP id 28so2115532wyb.19 for ; Sun, 19 Dec 2010 06:42:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=8pb00M8E9rdZ8L7XEPbwsdd3fNFFVDRcXCyrnx0ibZU=; b=R4yc9fBpmH74Au2dV9TatQr29Q1Q6xRnne6WLoMIEj0v1BIpaSbuJUFTygqetEkA0g DnhZUDYuGJT6n+wpUZU0jdGCoAD4D1MxEz6vevRCAJmYPIdQkMtBNlZm6LvmBMhryZMB B8z5AkrT2UPpSF4lX0NILCOcLJJdnZ75qOCZg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=TOlZNN1QSpw75CKtRZ8Akg5vTHNWV0+3tAOFxrdjqd98KCf14F0wEKcWGhEbTe+rbM LM9/bgfsWJ5IU4Y7aSV8wc7HQfuWunATdLS4cmTOLYzceWDFFfmMAkygj5CJmYcvMBX0 ZG+qcj0Stk+ILRsgxfi5at68v9IMI8XCEjYKw= Received: by 10.227.141.129 with SMTP id m1mr1979330wbu.68.1292769748417; Sun, 19 Dec 2010 06:42:28 -0800 (PST) Received: from localhost (ip545070eb.adsl-surfen.hetnet.nl [84.80.112.235]) by mx.google.com with ESMTPS id 11sm1911092wbi.18.2010.12.19.06.42.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 19 Dec 2010 06:42:25 -0800 (PST) From: Koen Kooi To: linux-omap@vger.kernel.org Cc: Koen Kooi , Koen Kooi Subject: [PATCH v2] ARM: OMAP: Power on EHCI, serial, camera and DVI on beagleboard-xM Date: Sun, 19 Dec 2010 15:42:15 +0100 Message-Id: <1292769735-54159-1-git-send-email-koen@dominion.thruhere.net> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1291725639-86397-1-git-send-email-koen@beagleboard.org> References: <1291725639-86397-1-git-send-email-koen@beagleboard.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]); Sun, 19 Dec 2010 14:42:31 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index f1a8ede..4756ac7 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -297,13 +297,35 @@ 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); + + /* DVI reset GPIO is different between revisions */ + if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) + beagle_dvi_device.reset_gpio = 129; + else + beagle_dvi_device.reset_gpio = 170; + + /* Power on DVI, Serial and PWR led */ + if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { + gpio_request(gpio + 1, "nDVI_PWR_EN"); + gpio_direction_output(gpio + 1, 0); + } /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; + /* Power on camera interface on P7/P8 or DVI on A2 and beyond */ + if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { + gpio_request(gpio + 2, "CAM_EN"); + gpio_direction_output(gpio + 2, 1); + } + return 0; }