From patchwork Thu Aug 25 09:22:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan DE FARIA X-Patchwork-Id: 1095832 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7P9NiZo017318 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 25 Aug 2011 09:24:05 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QwW9o-0003iR-P3; Thu, 25 Aug 2011 09:23:28 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QwW9o-00071M-9g; Thu, 25 Aug 2011 09:23:28 +0000 Received: from mail-fx0-f49.google.com ([209.85.161.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QwW9k-00070p-W0 for linux-arm-kernel@lists.infradead.org; Thu, 25 Aug 2011 09:23:26 +0000 Received: by fxd20 with SMTP id 20so2026435fxd.36 for ; Thu, 25 Aug 2011 02:23:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=NNIXtrqigwc9kvjgK3PkndYZnU6j5x9ggqVS/2A76QE=; b=V0lf9xM2sulVTl++nFWXZyrb1Ow2bkYUmnpg9T8XXdb7/GPJekRH47AVIIXJ0XvNkr i/h+c3VEQVFdJSKTPtmnHrFxa+5FshqioahWNBfDirHe0UOaN8Vk+d/GYNelx5EuAIOW oYke+urDCrUau4mR3Bn6sn6KXJC6kEGi5Hed0= Received: by 10.223.26.69 with SMTP id d5mr9025758fac.136.1314264201804; Thu, 25 Aug 2011 02:23:21 -0700 (PDT) Received: from localhost.localdomain ([213.144.218.64]) by mx.google.com with ESMTPS id b13sm324708fak.16.2011.08.25.02.23.18 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Aug 2011 02:23:20 -0700 (PDT) From: Bryan DE FARIA To: tony@atomide.com Subject: [PATCH v4] OMAP3EVM: ehci: Fix EHCI support Date: Thu, 25 Aug 2011 11:22:49 +0200 Message-Id: <1314264169-32514-1-git-send-email-bdefaria@adeneo-embedded.com> X-Mailer: git-send-email 1.7.4.1 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110825_052325_184015_3032CF17 X-CRM114-Status: GOOD ( 13.45 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.161.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (bryan.defaria[at]gmail.com) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_TO_NO_BRKTS_FREEMAIL To: misformatted and free email service Cc: Bryan DE FARIA , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 25 Aug 2011 09:24:05 +0000 (UTC) Set the VAUX2 regulator supply to 1.8V for the HSUSB host interface. Tps65950 GPIO2 has to be set to zero in order to enable the EHCI select line. Signed-off-by: Bryan DE FARIA --- arch/arm/mach-omap2/board-omap3evm.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index c452b3f..d9e0f10 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -377,6 +377,10 @@ static int omap3evm_twl_gpio_setup(struct device *dev, if (r) printk(KERN_ERR "failed to get/set lcd_bkl gpio\n"); + /* gpio + 2 == EHCI, camera and audio lines on motherboard Enable*/ + if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) + gpio_request_one(gpio + 2, GPIOF_OUT_INIT_LOW, "EN_MB_LINES"); + /* gpio + 7 == DVI Enable */ gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "EN_DVI"); @@ -450,6 +454,25 @@ static struct regulator_init_data omap3evm_vio = { .consumer_supplies = omap3evm_vio_supply, }; +/* VAUX2 for EHCI */ +static struct regulator_consumer_supply omap3evm_vaux2_supplies[] = { + REGULATOR_SUPPLY("hsusb1", "ehci-omap.0"), +}; + +static struct regulator_init_data omap3evm_vaux2 = { + .constraints = { + .min_uV = 1800000, + .max_uV = 1800000, + .apply_uV = true, + .valid_modes_mask = REGULATOR_MODE_NORMAL + | REGULATOR_MODE_STANDBY, + .valid_ops_mask = REGULATOR_CHANGE_MODE + | REGULATOR_CHANGE_STATUS, + }, + .num_consumer_supplies = ARRAY_SIZE(omap3evm_vaux2_supplies), + .consumer_supplies = omap3evm_vaux2_supplies, +}; + #ifdef CONFIG_WL12XX_PLATFORM_DATA #define OMAP3EVM_WLAN_PMENA_GPIO (150) @@ -510,6 +533,8 @@ static int __init omap3_evm_i2c_init(void) omap3evm_twldata.vdac->constraints.apply_uV = true; omap3evm_twldata.vpll2->constraints.apply_uV = true; + if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) + omap3evm_twldata.vaux2 = &omap3evm_vaux2; omap3_pmic_init("twl4030", &omap3evm_twldata); omap_register_i2c_bus(2, 400, NULL, 0);