From patchwork Wed Dec 1 19:32:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Rodriguez X-Patchwork-Id: 372361 Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB1JZcBK005724 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 1 Dec 2010 19:35:59 GMT Received: from dlep36.itg.ti.com ([157.170.170.91]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id oB1JXhsX010771 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 1 Dec 2010 13:33:43 -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 oB1JXhO5001407; Wed, 1 Dec 2010 13:33:43 -0600 (CST) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 1D79380627; Wed, 1 Dec 2010 13:33:43 -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 0A27580626 for ; Wed, 1 Dec 2010 13:33:41 -0600 (CST) Received: from neches.ext.ti.com (localhost [127.0.0.1]) by dflp51.itg.ti.com (8.13.7/8.13.7) with ESMTP id oB1JXeCH012499 for ; Wed, 1 Dec 2010 13:33:40 -0600 (CST) Received: from psmtp.com (na3sys009amx259.postini.com [74.125.149.143]) by neches.ext.ti.com (8.13.7/8.13.7) with SMTP id oB1JXeFV002038 for ; Wed, 1 Dec 2010 13:33:40 -0600 Received: from source ([209.85.213.173]) by na3sys009amx259.postini.com ([74.125.148.10]) with SMTP; Wed, 01 Dec 2010 13:33:40 CST Received: by mail-yx0-f173.google.com with SMTP id 31so3946449yxl.4 for ; Wed, 01 Dec 2010 11:33:40 -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=wNzybegcdRU6qKRjNBG0ITedzhMIdQLbdr05bgo7IxI=; b=YgoaC96gm1DuKOOw/BxraVwR/JIRDJiRDfQ22MTUNC4URgrmVkQnQLVNDYm2eEX3fx QaR8G5q8rsaRhw3oEJtRFQHVw8Kfv4sJ9GvlHtaNF5RqD9hapeRe5EvSQfGZ1Kif42I5 b/FDSesYrzZJXTSTBG5BciW8iW7wuBheT32Lo= 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=av8243YbV7fM1aE7SOGhv0BZFkbcBpuYyez3x0OnS94DTnb4iDAu7/6Ik1Ax0DfZhk k4FnqNqbEdLEkRRDwhGVgLya/G2vP/IyModE1T8XcUkWE/xJo9qcquJGF/dwm9/esl2z DQUCuqg5uFVM0bKNXuTPgoUk7R/u1U7+IsyxQ= Received: by 10.101.163.5 with SMTP id q5mr6570687ano.262.1291232020011; Wed, 01 Dec 2010 11:33:40 -0800 (PST) Received: from localhost.localdomain ([200.52.114.70]) by mx.google.com with ESMTPS id t39sm307591ano.7.2010.12.01.11.33.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 01 Dec 2010 11:33:39 -0800 (PST) From: To: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH v9 3/6] davinci: MMC/SD and USB-OHCI configuration for Omapl138-Hawkboard Date: Wed, 1 Dec 2010 13:32:26 -0600 Message-Id: <1291231949-23835-4-git-send-email-vm.rod25@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1291231949-23835-1-git-send-email-vm.rod25@gmail.com> References: <1291231949-23835-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] 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]); Wed, 01 Dec 2010 19:35:59 +0000 (UTC) diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 63916b9..80803fa 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, };