From patchwork Sun Dec 13 01:34:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cory Maccarrone X-Patchwork-Id: 66943 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nBD1Zig2006711 for ; Sun, 13 Dec 2009 01:35:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933506AbZLMBfn (ORCPT ); Sat, 12 Dec 2009 20:35:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933501AbZLMBfn (ORCPT ); Sat, 12 Dec 2009 20:35:43 -0500 Received: from mail-pz0-f171.google.com ([209.85.222.171]:49729 "HELO mail-pz0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S933490AbZLMBfm (ORCPT ); Sat, 12 Dec 2009 20:35:42 -0500 Received: by mail-pz0-f171.google.com with SMTP id 1so1530960pzk.33 for ; Sat, 12 Dec 2009 17:35:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=mfKCYJOW8Fq6Au6ghHXIV+Lx+Q6P19zErKbeI+R9Kqk=; b=OXQyWHMtu83IpniXIuhs/ITb57+SNu39jp8D/JNuscf9KB3mxNPP7B5J5sjMU3s7l5 iBwxjTA77XP3YPa3XSHpjEPP1tfOhqjgVn2oWq4kfjuRldGwsidWI7VQn6Yt74ZqCQO7 HDc2QtUd/0viKHyT+ujtVvgb9g4DniRepzL4A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=kk4rr0u7uRoYHQkn5j4L232bBElPmYYjupuLGQCTXhUgmJSe2Uz3GkjXjIIduZg6u6 zrtNCOf3iGnDG2MDJa8M19e2JhXk6pdMLvibdnhcuedkFMKCEwVrdQOKSLZ8XHH/j970 Lyp75B4h9rkHK5m/LqEOv+B1S0uD8TtWF2+pM= Received: by 10.142.59.20 with SMTP id h20mr1938945wfa.279.1260668141872; Sat, 12 Dec 2009 17:35:41 -0800 (PST) Received: from localhost (97-126-116-159.tukw.qwest.net [97.126.116.159]) by mx.google.com with ESMTPS id 20sm3333049pzk.1.2009.12.12.17.35.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 12 Dec 2009 17:35:41 -0800 (PST) From: Cory Maccarrone To: spi-devel-general@lists.sourceforge.net, linux-omap@vger.kernel.org Cc: Cory Maccarrone Subject: [PATCH v2 3/3] [OMAP] Add OMAP 7xx pin muxes for SPI Date: Sat, 12 Dec 2009 17:34:48 -0800 Message-Id: <1260668088-27555-4-git-send-email-darkstar6262@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1260668088-27555-1-git-send-email-darkstar6262@gmail.com> References: <1260668088-27555-1-git-send-email-darkstar6262@gmail.com> 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 07212cc..8434137 100644 --- a/arch/arm/mach-omap1/mux.c +++ b/arch/arm/mach-omap1/mux.c @@ -62,6 +62,14 @@ MUX_CFG_7XX("MMC_7XX_DAT0", 2, 17, 0, 16, 1, 0) /* I2C interface */ MUX_CFG_7XX("I2C_7XX_SCL", 5, 1, 0, 0, 1, 0) MUX_CFG_7XX("I2C_7XX_SDA", 5, 5, 0, 0, 1, 0) + +/* SPI pins */ +MUX_CFG_7XX("SPI_7XX_1", 6, 5, 4, 4, 1, 0) +MUX_CFG_7XX("SPI_7XX_2", 6, 9, 4, 8, 1, 0) +MUX_CFG_7XX("SPI_7XX_3", 6, 13, 4, 12, 1, 0) +MUX_CFG_7XX("SPI_7XX_4", 6, 17, 4, 16, 1, 0) +MUX_CFG_7XX("SPI_7XX_5", 8, 25, 0, 24, 0, 0) +MUX_CFG_7XX("SPI_7XX_6", 9, 5, 0, 4, 0, 0) }; #define OMAP7XX_PINS_SZ ARRAY_SIZE(omap7xx_pins) #else diff --git a/arch/arm/plat-omap/include/plat/mux.h b/arch/arm/plat-omap/include/plat/mux.h index 8f069cc..692c90e 100644 --- a/arch/arm/plat-omap/include/plat/mux.h +++ b/arch/arm/plat-omap/include/plat/mux.h @@ -183,6 +183,14 @@ enum omap7xx_index { /* I2C */ I2C_7XX_SCL, I2C_7XX_SDA, + + /* SPI */ + SPI_7XX_1, + SPI_7XX_2, + SPI_7XX_3, + SPI_7XX_4, + SPI_7XX_5, + SPI_7XX_6, }; enum omap1xxx_index {