From patchwork Sat Feb 4 14:51:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 6655 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 0434323E0E for ; Sat, 4 Feb 2012 14:52:02 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id BFFECA18095 for ; Sat, 4 Feb 2012 14:52:01 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id z7so8410368iab.11 for ; Sat, 04 Feb 2012 06:52:01 -0800 (PST) Received: by 10.42.177.133 with SMTP id bi5mr12689198icb.40.1328367121542; Sat, 04 Feb 2012 06:52:01 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.169.210 with SMTP id a18cs44987ibz; Sat, 4 Feb 2012 06:52:01 -0800 (PST) Received: by 10.236.46.193 with SMTP id r41mr13710969yhb.123.1328367119482; Sat, 04 Feb 2012 06:51:59 -0800 (PST) Received: from arroyo.ext.ti.com (arroyo.ext.ti.com. [192.94.94.40]) by mx.google.com with ESMTPS id y1si10114448yha.73.2012.02.04.06.51.59 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 04 Feb 2012 06:51:59 -0800 (PST) Received-SPF: neutral (google.com: 192.94.94.40 is neither permitted nor denied by best guess record for domain of a0131687@ula0131687) client-ip=192.94.94.40; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.94.94.40 is neither permitted nor denied by best guess record for domain of a0131687@ula0131687) smtp.mail=a0131687@ula0131687 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id q14Epso4012094; Sat, 4 Feb 2012 08:51:55 -0600 Received: from DBDE71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id q14EpnuA018202; Sat, 4 Feb 2012 20:21:53 +0530 (IST) Received: from dbdp31.itg.ti.com (172.24.170.98) by DBDE71.ent.ti.com (172.24.170.149) with Microsoft SMTP Server id 14.1.323.3; Sat, 4 Feb 2012 20:21:49 +0530 Received: from ula0131687 (h81-226.vpn.ti.com [172.24.81.226]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id q14Epk00009872; Sat, 4 Feb 2012 20:21:46 +0530 (IST) Received: from a0131687 by ula0131687 with local (Exim 4.72) (envelope-from ) id 1Rtgxr-0002iT-UR; Sat, 04 Feb 2012 20:21:43 +0530 From: Rajendra Nayak To: , , CC: , , , , , Rajendra Nayak Subject: [PATCH 3/6] mmc: omap_hsmmc: Use OMAP_HSMMC_SUPPORTS_DUAL_VOLT flag to remove host->id based hardcoding Date: Sat, 4 Feb 2012 20:21:27 +0530 Message-ID: <1328367090-10402-4-git-send-email-rnayak@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1328367090-10402-1-git-send-email-rnayak@ti.com> References: <1328367090-10402-1-git-send-email-rnayak@ti.com> MIME-Version: 1.0 From: Balaji T K Use OMAP_HSMMC_SUPPORTS_DUAL_VOLT flag instead of host->id for identifying SD bus voltage capabilities. Signed-off-by: Balaji T K Signed-off-by: Rajendra Nayak --- drivers/mmc/host/omap_hsmmc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 9955aee..91faf42 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -650,7 +650,7 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host) OMAP_HSMMC_WRITE(host->base, SYSCONFIG, OMAP_HSMMC_READ(host->base, SYSCONFIG) | AUTOIDLE); - if (host->id == OMAP_MMC1_DEVID) { + if (host->pdata->controller_flags & OMAP_HSMMC_SUPPORTS_DUAL_VOLT) { if (host->power_mode != MMC_POWER_OFF && (1 << ios->vdd) <= MMC_VDD_23_24) hctl = SDVS18;