From patchwork Fri Nov 12 22:38:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Rodriguez X-Patchwork-Id: 424471 Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBLEN8dd028672 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 21 Dec 2010 14:23:30 GMT Received: from dlep34.itg.ti.com ([157.170.170.115]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id oBLEN8KD021122 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 21 Dec 2010 08:23:08 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id oBLEN7uQ004037 for ; Tue, 21 Dec 2010 08:23:07 -0600 (CST) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 0E3E180639 for ; Tue, 21 Dec 2010 08:23:07 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id C746D80632 for ; Fri, 12 Nov 2010 16:39:51 -0600 (CST) Received: from white.ext.ti.com (localhost [127.0.0.1]) by dflp51.itg.ti.com (8.13.7/8.13.7) with ESMTP id oACMdpUr004164 for ; Fri, 12 Nov 2010 16:39:51 -0600 (CST) Received: from psmtp.com (na3sys009amx163.postini.com [74.125.149.89]) by white.ext.ti.com (8.13.7/8.13.7) with SMTP id oACMdosK007205 for ; Fri, 12 Nov 2010 16:39:51 -0600 Received: from source ([209.85.213.45]) by na3sys009amx163.postini.com ([74.125.148.10]) with SMTP; Fri, 12 Nov 2010 14:39:51 PST Received: by mail-yw0-f45.google.com with SMTP id 2so233019ywt.4 for ; Fri, 12 Nov 2010 14:39:50 -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=JnI8atDwaXEOYjaX1t8wXC4UlAISJmQsmuD1bNahHYc=; b=dA39GnwroSlnnYqf2wnAeHJK79OI2bN6SzvLVmTyPfwwzMHYLd36DszxdmkqV+/9wx 5E2foAVmkZRJ+qITghOrEdpU/kyVKbqKnwn3IJCZrJyLXcem21jKVPydbN/OoMnTuhWo 1k3cyFXgB1g+cXeS1t/y4acSHiovJ4EBgvrbQ= 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=k+NApqd8T0PMQJjxbvEP37HFalVve4W/zIcBh5wr9/SiqG9n2s0li8W77KuIBaD0hd WMAtsOWweC0zUiUVdkzKTzMpDDsbQJid496sKOUu5FPWNozgRKuZ5NZcrJgTanUUxsic jOeWfxZo2ye/Uxe9g8hBPSSH455UzMj044C6I= Received: by 10.151.150.7 with SMTP id c7mr4646693ybo.304.1289601590620; Fri, 12 Nov 2010 14:39:50 -0800 (PST) Received: from localhost.localdomain ([200.52.114.70]) by mx.google.com with ESMTPS id v39sm1060655yba.7.2010.11.12.14.39.44 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 12 Nov 2010 14:39:50 -0800 (PST) From: To: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH v8 6/9] davinci: MMC/SD and USB-OHCI configuration for Omapl138-Hawkboard Date: Fri, 12 Nov 2010 16:38:52 -0600 Message-Id: <1289601535-6746-7-git-send-email-vm.rod25@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1289601535-6746-1-git-send-email-vm.rod25@gmail.com> References: <1289601535-6746-1-git-send-email-vm.rod25@gmail.com> X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:65.41325/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] X-Mailman-Approved-At: Tue, 21 Dec 2010 08:22:41 -0600 Cc: Russell King , Thomas Koeller , Victor Rodriguez , linux-arm-kernel@lists.infradead.org, Miguel Aguilar 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+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 21 Dec 2010 14:23:35 +0000 (UTC) diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index f033a0a..4458bff 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, };