From patchwork Mon Oct 11 17:08:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Rodriguez X-Patchwork-Id: 245821 Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9BHAeS3003643 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 11 Oct 2010 17:11:11 GMT Received: from dlep35.itg.ti.com ([157.170.170.118]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o9BH91HJ011739 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 11 Oct 2010 12:09:01 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o9BH90tm012554; Mon, 11 Oct 2010 12:09:00 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 6CF4E80627; Mon, 11 Oct 2010 12:09:00 -0500 (CDT) 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 4D8EE80626 for ; Mon, 11 Oct 2010 12:08:59 -0500 (CDT) 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 o9BH8x5s009487 for ; Mon, 11 Oct 2010 12:08:59 -0500 (CDT) Received: from psmtp.com (na3sys009amx258.postini.com [74.125.149.142]) by white.ext.ti.com (8.13.7/8.13.7) with SMTP id o9BH8wwe003828 for ; Mon, 11 Oct 2010 12:08:58 -0500 Received: from source ([209.85.213.173]) by na3sys009amx258.postini.com ([74.125.148.10]) with SMTP; Mon, 11 Oct 2010 10:08:58 PDT Received: by yxi11 with SMTP id 11so5427yxi.4 for ; Mon, 11 Oct 2010 10:08:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=f4JxvVq97bP2jj3MhJMRHU4gTorO4knuW3Kkhj4gjY8=; b=Mb+jcB4AFpPlNE3cO/2lakPqCjZOXIRcPzsHb34ZeErmYYeQPbLfeg9dvek4iw3ldk BfziicLuPUSodwQjCWvfl7+miOF3MSFRA2JPnBHCd8sYwi3r8kH/fciGt8ieUJ1mpORB S+ftZuyrkGVsXMb10kvD+Fg9/xDOqXrvu3944= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=f3D549JM5ra1jR780MGaEX0s1EQPIueS+HvULNH0yaeQyxCgLjztdhlVxkLRKwY2PF D6s8sp5T2rFDXXG8gkrtilPUsoZmgi0ctFRlX3g3OoxvQDIv6hc61ztTwnTf+sBGjHwa ll96t/fWGfAALYxH/C0rhgbxSGCDD9UqEbEiU= MIME-Version: 1.0 Received: by 10.42.171.196 with SMTP id k4mr1675714icz.202.1286816936409; Mon, 11 Oct 2010 10:08:56 -0700 (PDT) Received: by 10.42.177.70 with HTTP; Mon, 11 Oct 2010 10:08:56 -0700 (PDT) In-Reply-To: <4CB0625D.4040507@mvista.com> References: <1286586765-1347-1-git-send-email-vm.rod25@gmail.com> <4CB0625D.4040507@mvista.com> Date: Mon, 11 Oct 2010 12:08:56 -0500 Message-ID: Subject: Re: [PATCH v1 5/6] davinci: MMC/SD support for Omapl138-Hawkboard From: Victor Rodriguez To: Sergei Shtylyov X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:99.90000/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: davinci-linux-open-source@linux.davincidsp.com 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: , 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, 11 Oct 2010 17:11:11 +0000 (UTC) X-MIME-Autoconverted: from quoted-printable to 8bit by demeter1.kernel.org id o9BHAeS3003643 diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 4a39249..8a9f9c0 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -151,6 +151,13 @@ static struct snd_platform_data omapl138_hawk_snd_data = { .rxnumevt = 1, }; +static const short hawk_mmcsd0_pins[] = { + DA850_MMCSD0_DAT_0, DA850_MMCSD0_DAT_1, DA850_MMCSD0_DAT_2, + DA850_MMCSD0_DAT_3, DA850_MMCSD0_CLK, DA850_MMCSD0_CMD, + DA850_GPIO3_12, DA850_GPIO3_13, + -1 +}; + static int da850_hawk_mmc_get_ro(int index) { return gpio_get_value(DA850_HAWK_MMCSD_WP_PIN); @@ -200,7 +207,7 @@ static __init void omapl138_hawk_init(void) pr_warning("%s: mcasp mux setup failed: %d\n", __func__, ret); da8xx_register_mcasp(0, &omapl138_hawk_snd_data); - ret = davinci_cfg_reg_list(da850_mmcsd0_pins); + ret = davinci_cfg_reg_list(hawk_mmcsd0_pins); if (ret) pr_warning("%s: MMC/SD0 mux setup failed: %d\n", __func__, ret); diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index f033a0a..7787f5a 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -548,6 +548,8 @@ static const struct mux_config da850_pins[] = { MUX_CFG(DA850, GPIO2_15, 5, 0, 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, GPIO3_12, 7, 12, 15, 8, false) + MUX_CFG(DA850, GPIO3_13, 7, 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..e043f11 100644 --- a/arch/arm/mach-davinci/include/mach/mux.h +++ b/arch/arm/mach-davinci/include/mach/mux.h @@ -913,6 +913,8 @@ enum davinci_da850_index { DA850_GPIO2_15, DA850_GPIO4_0, DA850_GPIO4_1, + DA850_GPIO3_12, + DA850_GPIO3_13, DA850_RTC_ALARM, };