From patchwork Mon Oct 5 14:50:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cory Maccarrone X-Patchwork-Id: 51743 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n95EtKIe015399 for ; Mon, 5 Oct 2009 14:55:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752733AbZJEOvZ (ORCPT ); Mon, 5 Oct 2009 10:51:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752223AbZJEOvZ (ORCPT ); Mon, 5 Oct 2009 10:51:25 -0400 Received: from mail-yx0-f173.google.com ([209.85.210.173]:65506 "EHLO mail-yx0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751082AbZJEOvY (ORCPT ); Mon, 5 Oct 2009 10:51:24 -0400 Received: by yxe3 with SMTP id 3so2902509yxe.4 for ; Mon, 05 Oct 2009 07:50:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:from:date:message-id :subject:to:content-type; bh=S3g726+QrMqHZX/OdSs2egF5DAR4WDfHdT+KDgKyMco=; b=D+cuDiSx+h+qSTSrJkRrOEUTmk4Xqd+47d842RUrZXmhj0st6+mnTGDmtLgYW/dQuK 0QPuDX6zCl/b/WB3LGEIVP61VT0V8YHfSvjZ3FHooiH34X2ZGHP99D+bkcgfsvlf/t7U Pp1uWe8znLVajSBguioeT9znjIKtNeHVGvywU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=pYBg6cZMcwdgy0CUXzTt4Dzu2BTtDf1D8QGWBeemvqzqEKk9RA4z3PKkJp+Ou+qftN xSfl6OsPW+ey3vOMtvoGyIZ/7M4FM49KFmkfb+P1WIbSUBcPcVPmriAf3+TCFCzjfsXO FclFVGc5PAy8t7qq6vWoRtoWBEaAQKCvE4KGE= MIME-Version: 1.0 Received: by 10.150.114.3 with SMTP id m3mr199915ybc.56.1254754247069; Mon, 05 Oct 2009 07:50:47 -0700 (PDT) From: Cory Maccarrone Date: Mon, 5 Oct 2009 07:50:27 -0700 Message-ID: <6cb013310910050750q183abe82qbfd60064d774fe62@mail.gmail.com> Subject: [PATCH 2/4] [OMAP] omap_udc: Updates for omap7xx IRQs and config To: linux-omap@vger.kernel.org Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c index 3c40b85..1ac252a 100644 --- a/arch/arm/plat-omap/usb.c +++ b/arch/arm/plat-omap/usb.c @@ -159,11 +159,14 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device) * - OTG support on this port not yet written */ - l = omap_readl(USB_TRANSCEIVER_CTRL); - l &= ~(7 << 4); - if (!is_device) - l |= (3 << 1); - omap_writel(l, USB_TRANSCEIVER_CTRL); + /* Don't do this for omap7xx -- it causes USB to not work correctly */ + if (!cpu_is_omap7xx()) { + l = omap_readl(USB_TRANSCEIVER_CTRL); + l &= ~(7 << 4); + if (!is_device) + l |= (3 << 1); + omap_writel(l, USB_TRANSCEIVER_CTRL); + } return 3 << 16;