From patchwork Mon Sep 10 04:13:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Liu X-Patchwork-Id: 1429691 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6B3D9DF28C for ; Mon, 10 Sep 2012 04:25:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751655Ab2IJEZX (ORCPT ); Mon, 10 Sep 2012 00:25:23 -0400 Received: from na3sys009aog133.obsmtp.com ([74.125.149.82]:44184 "EHLO na3sys009aog133.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751408Ab2IJEZX (ORCPT ); Mon, 10 Sep 2012 00:25:23 -0400 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob133.postini.com ([74.125.148.12]) with SMTP ID DSNKUE1rq7VxTs0xN5Tl6PttMkmskdrkNGRz@postini.com; Sun, 09 Sep 2012 21:25:22 PDT Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Sun, 9 Sep 2012 21:17:00 -0700 Received: from localhost.localdomain (unknown [10.38.36.240]) by maili.marvell.com (Postfix) with ESMTP id 96E454E513; Sun, 9 Sep 2012 21:16:59 -0700 (PDT) From: Kevin Liu To: linux-mmc@vger.kernel.org, cjb@laptop.org, pierre@ossman.eu Cc: cxie4@marvell.com, hzhuang1@marvell.com, prakity@marvell.com, jlfu@marvell.com, kliu5@marvell.com Subject: [PATCH] mmc: sdhci: set regulator min/max voltage according to spec Date: Mon, 10 Sep 2012 12:13:36 +0800 Message-Id: <1347250416-20891-1-git-send-email-keyuan.liu@gmail.com> X-Mailer: git-send-email 1.7.0.4 X-OriginalArrivalTime: 10 Sep 2012 04:17:00.0953 (UTC) FILETIME=[2018F090:01CD8F0B] Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Kevin Liu Use voltage range as below rather than a specific value 3.3v: (3.2v, 3.4v) 3.0v: (2.9v, 3.1v) 1.8v: (1.65v, 1.95v) Signed-off-by: Jialing Fu Signed-off-by: Kevin Liu --- drivers/mmc/host/sdhci.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 962f696..08dae93 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1632,7 +1632,7 @@ static int sdhci_do_3_3v_signal_voltage_switch(struct sdhci_host *host, sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); if (host->vqmmc) { - ret = regulator_set_voltage(host->vqmmc, 3300000, 3300000); + ret = regulator_set_voltage(host->vqmmc, 3200000, 3400000); if (ret) { pr_warning("%s: Switching to 3.3V signalling voltage " " failed\n", mmc_hostname(host->mmc)); @@ -1676,7 +1676,7 @@ static int sdhci_do_1_8v_signal_voltage_switch(struct sdhci_host *host, */ if (host->vqmmc) ret = regulator_set_voltage(host->vqmmc, - 1800000, 1800000); + 1650000, 1950000); else ret = 0; @@ -2860,7 +2860,7 @@ int sdhci_add_host(struct sdhci_host *host) pr_info("%s: no vqmmc regulator found\n", mmc_hostname(mmc)); host->vqmmc = NULL; } - else if (regulator_is_supported_voltage(host->vqmmc, 1800000, 1800000)) + else if (regulator_is_supported_voltage(host->vqmmc, 1650000, 1950000)) regulator_enable(host->vqmmc); else caps[1] &= ~(SDHCI_SUPPORT_SDR104 | SDHCI_SUPPORT_SDR50 | @@ -2935,16 +2935,16 @@ int sdhci_add_host(struct sdhci_host *host) #ifdef CONFIG_REGULATOR if (host->vmmc) { - ret = regulator_is_supported_voltage(host->vmmc, 3300000, - 3300000); + ret = regulator_is_supported_voltage(host->vmmc, 3200000, + 3400000); if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_330))) caps[0] &= ~SDHCI_CAN_VDD_330; - ret = regulator_is_supported_voltage(host->vmmc, 3000000, - 3000000); + ret = regulator_is_supported_voltage(host->vmmc, 2900000, + 3100000); if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_300))) caps[0] &= ~SDHCI_CAN_VDD_300; - ret = regulator_is_supported_voltage(host->vmmc, 1800000, - 1800000); + ret = regulator_is_supported_voltage(host->vmmc, 1650000, + 1950000); if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_180))) caps[0] &= ~SDHCI_CAN_VDD_180; }