From patchwork Sun Nov 22 21:26:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cory Maccarrone X-Patchwork-Id: 62077 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 nAMLPEHc026851 for ; Sun, 22 Nov 2009 21:26:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755747AbZKVVZ6 (ORCPT ); Sun, 22 Nov 2009 16:25:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755758AbZKVVZ6 (ORCPT ); Sun, 22 Nov 2009 16:25:58 -0500 Received: from mail-pz0-f171.google.com ([209.85.222.171]:53478 "EHLO mail-pz0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755742AbZKVVZ5 (ORCPT ); Sun, 22 Nov 2009 16:25:57 -0500 Received: by pzk1 with SMTP id 1so3539235pzk.33 for ; Sun, 22 Nov 2009 13:26:03 -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=4FXpTf9dV47mSWok9YUCe7A6N5P+yeKp5ydTHHuvmb0=; b=if3MuXju+F+LUjsM8F3Xzb8qHt5aQPOt/w5gmReNh9jybuniQtcNttKSZ83Iv5Og8s V8O8cv6Warbyzi2BrgATlkcq6eCe4cMd0AED3aaxGBYVpt1jIQk3UuXfE8zTw+TWmF04 i9luAP3Po74P0Qysdm2UOkekUpXNlTNspURhI= 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=dZrNw6Mrn+Vg9exnl/drV7vTapatEshfrt0ConzIeb2AJRaRwKelYFkmYw/VyKk0lN Cz1LaH9LEbnvmsJv7LPqLuvHnu5Yt66SPZe8E3SjmVgiH6iO/HTk2uW2MlqgWhoteHm3 3dFmMp/KnhoX8LYOqYI/t+CEFQCHT9Dk4hFmY= Received: by 10.115.39.8 with SMTP id r8mr7008234waj.104.1258925163892; Sun, 22 Nov 2009 13:26:03 -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 22sm2362723pxi.6.2009.11.22.13.26.03 (version=SSLv3 cipher=RC4-MD5); Sun, 22 Nov 2009 13:26:03 -0800 (PST) Subject: [PATCH 1/3] [OMAP1] MUX: Add omap7xx-specific USB mux pins From: Cory Maccarrone To: linux-omap@vger.kernel.org Date: Sun, 22 Nov 2009 13:26:01 -0800 Message-ID: <1258925161.11242.2.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/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c index 785371e..5e183cd 100644 --- a/arch/arm/mach-omap1/mux.c +++ b/arch/arm/mach-omap1/mux.c @@ -50,7 +50,9 @@ MUX_CFG_7XX("E3_7XX_KBC4", 13, 25, 0, 24, 1, 0) MUX_CFG_7XX("AA17_7XX_USB_DM", 2, 21, 0, 20, 0, 0) MUX_CFG_7XX("W16_7XX_USB_PU_EN", 2, 25, 0, 24, 0, 0) -MUX_CFG_7XX("W17_7XX_USB_VBUSI", 2, 29, 0, 28, 0, 0) +MUX_CFG_7XX("W17_7XX_USB_VBUSI", 2, 29, 6, 28, 1, 0) +MUX_CFG_7XX("W18_7XX_USB_DMCK_OUT",3, 3, 1, 2, 0, 0) +MUX_CFG_7XX("W19_7XX_USB_DCRST", 3, 7, 1, 6, 0, 0) /* MMC Pins */ MUX_CFG_7XX("MMC_7XX_CMD", 2, 9, 0, 8, 1, 0) diff --git a/arch/arm/plat-omap/include/plat/mux.h b/arch/arm/plat-omap/include/plat/mux.h index ba77de6..436c12e 100644 --- a/arch/arm/plat-omap/include/plat/mux.h +++ b/arch/arm/plat-omap/include/plat/mux.h @@ -219,6 +219,8 @@ enum omap7xx_index { AA17_7XX_USB_DM, W16_7XX_USB_PU_EN, W17_7XX_USB_VBUSI, + W18_7XX_USB_DMCK_OUT, + W19_7XX_USB_DCRST, /* MMC */ MMC_7XX_CMD,