From patchwork Tue Jun 14 10:29:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Poddar, Sourav" X-Patchwork-Id: 878672 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5EAUbWk019263 for ; Tue, 14 Jun 2011 10:30:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754651Ab1FNKag (ORCPT ); Tue, 14 Jun 2011 06:30:36 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:42941 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755872Ab1FNKag (ORCPT ); Tue, 14 Jun 2011 06:30:36 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id p5EAUSNH004931 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 14 Jun 2011 05:30:30 -0500 Received: from dbde70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id p5EAUQxm006819; Tue, 14 Jun 2011 16:00:26 +0530 (IST) Received: from dbdp31.itg.ti.com (172.24.170.98) by DBDE70.ent.ti.com (172.24.170.148) with Microsoft SMTP Server id 8.3.106.1; Tue, 14 Jun 2011 16:00:26 +0530 Received: from localhost.localdomain (bangitsubn15.apr.dhcp.ti.com [172.24.136.176]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id p5EAU1IZ014871; Tue, 14 Jun 2011 16:00:20 +0530 (IST) From: Sourav Poddar To: CC: , , , , , Sourav Poddar Subject: [PATCH v2] omap: hsmmc: fix ocr mask usage Date: Tue, 14 Jun 2011 15:59:59 +0530 Message-ID: <1308047399-8537-1-git-send-email-sourav.poddar@ti.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 14 Jun 2011 10:30:37 +0000 (UTC) From: Anand Gadiyar The OMAP HSMMC driver uses an ocr_mask to determine the list of voltages supported by the card. It populates this mask based on the list of voltages supported by the regulator that supplies the voltage. Commit 64be97822b (omap4 hsmmc: Update ocr mask for MMC2 for regulator to use) passed a fixed ocr_mask from the OMAP4 SDP board file to limit the voltage to 2.9-3.0 Volts, and updated the driver to use this mask if provided, instead of using the regulator's supported voltages. However the commit is buggy - the ocr_mask is overridden by the regulator's capabilities anyway. Fix this. (The bug shows up when a system-wide suspend is attempted on the OMAP4 SDP/Blaze platforms. The eMMC card comes up at 3V, but drops to 1.65V after the system resumes). Signed-off-by: Anand Gadiyar Acked-by: Balaji T K Tested-by: Kishore Kadiyala Signed-off-by: Sourav Poddar Acked-by: Venkatraman S --- v2: Rebase to latest kernel(Linux 3.0-rc3) v1: https://patchwork.kernel.org/patch/576871/ drivers/mmc/host/omap_hsmmc.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 5b2e215..8707bcd 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -429,7 +429,6 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) return -EINVAL; } } - mmc_slot(host).ocr_mask = mmc_regulator_get_ocrmask(reg); /* Allow an aux regulator */ reg = regulator_get(host->dev, "vmmc_aux");