From patchwork Wed Feb 16 11:17:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Gadiyar X-Patchwork-Id: 566561 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 p1GBHV39004549 for ; Wed, 16 Feb 2011 11:17:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755944Ab1BPLRa (ORCPT ); Wed, 16 Feb 2011 06:17:30 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:47816 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752313Ab1BPLRa (ORCPT ); Wed, 16 Feb 2011 06:17:30 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id p1GBHOIb025042 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 16 Feb 2011 05:17:26 -0600 Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id p1GBHLIV006208; Wed, 16 Feb 2011 16:47:21 +0530 (IST) Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by linfarm476.india.ti.com (8.12.11/8.12.11) with ESMTP id p1GBHLx3001406; Wed, 16 Feb 2011 16:47:21 +0530 Received: (from a0393673@localhost) by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id p1GBHKsF001404; Wed, 16 Feb 2011 16:47:20 +0530 From: Anand Gadiyar To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Anand Gadiyar , Tony Lindgren Subject: [PATCH 2/2] omap4: 4430sdp: mux GPIO_157 to safe mode Date: Wed, 16 Feb 2011 16:47:20 +0530 Message-Id: <1297855040-1337-2-git-send-email-gadiyar@ti.com> X-Mailer: git-send-email 1.5.6.6 In-Reply-To: <1297855040-1337-1-git-send-email-gadiyar@ti.com> References: <1297855040-1337-1-git-send-email-gadiyar@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]); Wed, 16 Feb 2011 11:17:32 +0000 (UTC) Index: linux-omap-usb/arch/arm/mach-omap2/board-4430sdp.c =================================================================== --- linux-omap-usb.orig/arch/arm/mach-omap2/board-4430sdp.c +++ linux-omap-usb/arch/arm/mach-omap2/board-4430sdp.c @@ -543,7 +543,15 @@ static void __init omap_sfh7741prox_init #ifdef CONFIG_OMAP_MUX static struct omap_board_mux board_mux[] __initdata = { - OMAP4_MUX(USBB2_ULPITLL_CLK, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT), + /* + * USBB2_ULPITLL_CLK/GPIO_157 controls the circuitry + * that turns on the PHY connected to the EHCI port. + * several revisions of the Blaze are affected by + * an accidental short-circuit that causes a reboot + * if this pad is driven high. So, explicitly configure + * the pad in safe mode to ensure this never happens + */ + OMAP4_MUX(USBB2_ULPITLL_CLK, OMAP_MUX_MODE7), { .reg_offset = OMAP_MUX_TERMINATOR }, }; #else