From patchwork Tue Jan 18 17:26:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kishore kadiyala X-Patchwork-Id: 486571 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0IHKJUp009815 for ; Tue, 18 Jan 2011 17:20:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752870Ab1ARRUQ (ORCPT ); Tue, 18 Jan 2011 12:20:16 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:42185 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752857Ab1ARRUN (ORCPT ); Tue, 18 Jan 2011 12:20:13 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id p0IHJxqN010047 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 18 Jan 2011 11:20:01 -0600 Received: from ucmsshproxy.india.ext.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with SMTP id p0IHJubP006657; Tue, 18 Jan 2011 22:49:56 +0530 (IST) Received: from localhost (unknown [10.24.244.160]) by ucmsshproxy.india.ext.ti.com (Postfix) with ESMTP id AA12A158006; Tue, 18 Jan 2011 22:49:56 +0530 (IST) From: Kishore Kadiyala To: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org Cc: tony@atomide.com, cjb@laptop.org, madhu.cr@ti.com, Kishore Kadiyala , Venkatraman S Subject: [PATCH 4/4] omap4: hsmmc: enable ADMA for MMC1 & MMC2 Date: Tue, 18 Jan 2011 22:56:31 +0530 Message-Id: <1295371591-13610-5-git-send-email-kishore.kadiyala@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1295371591-13610-1-git-send-email-kishore.kadiyala@ti.com> References: <1295371591-13610-1-git-send-email-kishore.kadiyala@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 18 Jan 2011 17:20:20 +0000 (UTC) diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 34272e4..2ac7271 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -307,8 +307,17 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers) else mmc->slots[0].features |= HSMMC_HAS_PBIAS; - if (cpu_is_omap44xx() && (omap_rev() > OMAP4430_REV_ES1_0)) - mmc->slots[0].features |= HSMMC_HAS_UPDATED_RESET; + /* + * OMAP4: MMC1 & MMC2 controllers support ADMA. + * Default works with SDMA. + * For ADMA support, update respective BIT in features. + */ + if (cpu_is_omap44xx()) { + mmc->slots[0].features |= HSMMC_HAS_ADMA_SUPPORT; + if (omap_rev() > OMAP4430_REV_ES1_0) + mmc->slots[0].features |= + HSMMC_HAS_UPDATED_RESET; + } switch (c->mmc) { case 1: