From patchwork Mon Dec 27 22:43:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Rodriguez X-Patchwork-Id: 435281 Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBRMjuew018638 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 27 Dec 2010 22:46:17 GMT Received: from dlep36.itg.ti.com ([157.170.170.91]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id oBRMiTY7028499 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 27 Dec 2010 16:44:29 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id oBRMiSKv011632; Mon, 27 Dec 2010 16:44:28 -0600 (CST) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 2EBE780635; Mon, 27 Dec 2010 16:44:27 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id 7363B8062C for ; Mon, 27 Dec 2010 16:43:26 -0600 (CST) Received: from white.ext.ti.com (localhost [127.0.0.1]) by dflp52.itg.ti.com (8.13.7/8.13.7) with ESMTP id oBRMhQNL001563 for ; Mon, 27 Dec 2010 16:43:26 -0600 (CST) Received: from psmtp.com (na3sys009amx210.postini.com [74.125.149.50]) by white.ext.ti.com (8.13.7/8.13.7) with SMTP id oBRMhPP5017897 for ; Mon, 27 Dec 2010 16:43:25 -0600 Received: from source ([74.125.83.173]) by na3sys009amx210.postini.com ([74.125.148.10]) with SMTP; Mon, 27 Dec 2010 16:43:25 CST Received: by mail-pv0-f173.google.com with SMTP id 11so2552093pvh.4 for ; Mon, 27 Dec 2010 14:43:25 -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=aekPBRru3iusCypKMu989ie+obi1E2EK6Lc8jLIpG7I=; b=CBDEVOMyMh30sf+sNiTZJi5nugHoxiIqCMb5epzVF3lq7Dj1ZtmhqqArCwt689o9tv blealsmZ/OQPufxqH1hwHGoW8NBFBh9ZF7X7FQy/NnQOYGIke3sFmdbAvqnkY1rAiTzy Mm8Dm2P2Dmj+HWWaxZ79094PNabbfG+T54hKk= 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=EmCpooMVzhEkM5gYSRzA+X7n1ABm61n7dRWON+GAC8jrk7iS258Lw1eMwQaFCAbOQ7 3SPOssR4x4++8YqO83hPsYJjPK1EdolynIqa2uCJ/D8lwNaX0VyVN2gYkw0ybg2vo1lN YGNug/Z7Yu58fz+N03cRvqAVIxv0ya1INN6D4= Received: by 10.142.6.35 with SMTP id 35mr10316234wff.303.1293489805452; Mon, 27 Dec 2010 14:43:25 -0800 (PST) Received: from localhost.localdomain ([189.138.143.93]) by mx.google.com with ESMTPS id f5sm18305417wfg.14.2010.12.27.14.43.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 27 Dec 2010 14:43:24 -0800 (PST) From: To: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH v11 3/6] davinci: MMC/SD and USB-OHCI configuration for Omapl138-Hawkboard Date: Mon, 27 Dec 2010 16:43:10 -0600 Message-Id: <1293489793-23312-4-git-send-email-vm.rod25@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1293489793-23312-1-git-send-email-vm.rod25@gmail.com> References: <1293489793-23312-1-git-send-email-vm.rod25@gmail.com> X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:76.18843/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.0750) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] Cc: Russell King , Thomas Koeller , Mark Brown , Victor Rodriguez , linux-arm-kernel@lists.infradead.org X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Dec 2010 22:46:20 +0000 (UTC) diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 78b5ae2..f55a60f 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -543,11 +543,15 @@ static const struct mux_config da850_pins[] = { MUX_CFG(DA850, EMA_WAIT_1, 6, 24, 15, 1, false) MUX_CFG(DA850, NEMA_CS_2, 7, 0, 15, 1, false) /* GPIO function */ + MUX_CFG(DA850, GPIO2_4, 6, 12, 15, 8, false) MUX_CFG(DA850, GPIO2_6, 6, 4, 15, 8, false) MUX_CFG(DA850, GPIO2_8, 5, 28, 15, 8, false) MUX_CFG(DA850, GPIO2_15, 5, 0, 15, 8, false) + MUX_CFG(DA850, GPIO3_12, 7, 12, 15, 8, false) + MUX_CFG(DA850, GPIO3_13, 7, 8, 15, 8, false) MUX_CFG(DA850, GPIO4_0, 10, 28, 15, 8, false) MUX_CFG(DA850, GPIO4_1, 10, 24, 15, 8, false) + MUX_CFG(DA850, GPIO6_13, 13, 8, 15, 8, false) MUX_CFG(DA850, RTC_ALARM, 0, 28, 15, 2, false) #endif }; diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h index de11aac..5d4e0fe 100644 --- a/arch/arm/mach-davinci/include/mach/mux.h +++ b/arch/arm/mach-davinci/include/mach/mux.h @@ -908,11 +908,15 @@ enum davinci_da850_index { DA850_NEMA_CS_2, /* GPIO function */ + DA850_GPIO2_4, DA850_GPIO2_6, DA850_GPIO2_8, DA850_GPIO2_15, + DA850_GPIO3_12, + DA850_GPIO3_13, DA850_GPIO4_0, DA850_GPIO4_1, + DA850_GPIO6_13, DA850_RTC_ALARM, };