From patchwork Sun Nov 22 21:27:08 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cory Maccarrone X-Patchwork-Id: 62078 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 nAMLPEHe026851 for ; Sun, 22 Nov 2009 21:27:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755768AbZKVV1F (ORCPT ); Sun, 22 Nov 2009 16:27:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755769AbZKVV1F (ORCPT ); Sun, 22 Nov 2009 16:27:05 -0500 Received: from mail-px0-f204.google.com ([209.85.216.204]:49599 "EHLO mail-px0-f204.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755767AbZKVV1D (ORCPT ); Sun, 22 Nov 2009 16:27:03 -0500 Received: by pxi42 with SMTP id 42so2880405pxi.5 for ; Sun, 22 Nov 2009 13:27:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:content-type :date:message-id:mime-version:x-mailer:content-transfer-encoding; bh=9gdHgKUFmqqebC7vX2cTbxg5ZcgP1R1Qw18xU7fzGgM=; b=KrVGYaGGSLy3SNr6CDsNE+soNid3F6nWwR3inBbrzc5s9aqbAOCn98EDhBuwwLcZUs Jlq1hXnbhiVE/pqwPVd1bJf3dUiPE/l6TDP98ilWNWnsWQFRB/sVF65pzy56qMV0ygVF otWCIS8qlPI5Uf0B87gKe/emy48UaGnz5jaT8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=ASFgjLqlzEspYsNkSp8dYQp+W+qRDv9mFt4gNVon/FCxGtJ86m29SoxGFdhk5WiM+n KAErn0M5TcJid+BD8fg8Gi0LY7Acjm7RYZOUl3Dm5wki1F0e2GuamEf+tDVw7ITGY7eZ hGdoYS1HDVBZIUyMF66k4ufwmOzMM4nUY1XcM= Received: by 10.114.17.11 with SMTP id 11mr6993932waq.188.1258925230157; Sun, 22 Nov 2009 13:27:10 -0800 (PST) Received: from ?192.168.0.102? (97-126-104-157.tukw.qwest.net [97.126.104.157]) by mx.google.com with ESMTPS id 23sm2285412pxi.1.2009.11.22.13.27.09 (version=SSLv3 cipher=RC4-MD5); Sun, 22 Nov 2009 13:27:09 -0800 (PST) Subject: [PATCH 2/3] [OMAP] USB: Add omap7xx-specific pin muxing From: Cory Maccarrone To: linux-omap@vger.kernel.org Date: Sun, 22 Nov 2009 13:27:08 -0800 Message-ID: <1258925228.11242.4.camel@runt> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 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 51033a4..d3bf17c 100644 --- a/arch/arm/plat-omap/usb.c +++ b/arch/arm/plat-omap/usb.c @@ -137,7 +137,13 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device) if (is_device) { if (cpu_is_omap24xx()) omap_cfg_reg(J20_24XX_USB0_PUEN); - else + else if (cpu_is_omap7xx()) { + omap_cfg_reg(AA17_7XX_USB_DM); + omap_cfg_reg(W16_7XX_USB_PU_EN); + omap_cfg_reg(W17_7XX_USB_VBUSI); + omap_cfg_reg(W18_7XX_USB_DMCK_OUT); + omap_cfg_reg(W19_7XX_USB_DCRST); + } else omap_cfg_reg(W4_USB_PUEN); }