From patchwork Tue Nov 11 04:02:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: addy ke X-Patchwork-Id: 5270441 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C86E29F2F1 for ; Tue, 11 Nov 2014 04:04:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 019C520166 for ; Tue, 11 Nov 2014 04:04:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1D5A12015A for ; Tue, 11 Nov 2014 04:04:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xo2go-00027K-M3; Tue, 11 Nov 2014 04:04:22 +0000 Received: from regular1.263xmail.com ([211.150.99.134]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xo2gX-0001oS-BD; Tue, 11 Nov 2014 04:04:07 +0000 Received: from addy.ke?rock-chips.com (unknown [192.168.167.78]) by regular1.263xmail.com (Postfix) with SMTP id CFE945DC5; Tue, 11 Nov 2014 12:03:32 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id 1136829AF4; Tue, 11 Nov 2014 12:03:21 +0800 (CST) X-RL-SENDER: addy.ke@rock-chips.com X-FST-TO: robh+dt@kernel.org X-SENDER-IP: 127.0.0.1 X-LOGIN-NAME: addy.ke@rock-chips.com X-UNIQUE-TAG: <3a385bc6bd14c1c8e0a55fa52cafa097> X-ATTACHMENT-NUM: 0 X-SENDER: kfx@rock-chips.com X-DNS-TYPE: 0 Received: from localhost.localdomain (unknown [127.0.0.1]) by smtp.263.net (Postfix) whith ESMTP id 11042AEG391; Tue, 11 Nov 2014 12:03:29 +0800 (CST) From: Addy Ke To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, rdunlap@infradead.org, tgih.jun@samsung.com, jh80.chung@samsung.com, chris@printf.net, ulf.hansson@linaro.org, dinguyen@altera.com, heiko@sntech.de, olof@lixom.net, dianders@chromium.org, sonnyrao@chromium.org, amstan@chromium.org Subject: [PATCH] mmc: dw_mmc: try pick the exact same voltage as vmmc for vqmmc Date: Tue, 11 Nov 2014 12:02:53 +0800 Message-Id: <1415678573-6093-1-git-send-email-addy.ke@rock-chips.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1415109789-7046-1-git-send-email-addy.ke@rock-chips.com> References: <1415109789-7046-1-git-send-email-addy.ke@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141110_200405_774071_755F357A X-CRM114-Status: UNSURE ( 7.92 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: huangtao@rock-chips.com, devicetree@vger.kernel.org, Addy Ke , hl@rock-chips.com, linux-doc@vger.kernel.org, yzq@rock-chips.com, zyw@rock-chips.com, zhangqing@rock-chips.com, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, kever.yang@rock-chips.com, lintao@rock-chips.com, linux-rockchip@lists.infradead.org, xjq@rock-chips.com, zhenfu.fang@rock-chips.com, chenfen@rock-chips.com, cf@rock-chips.com, hj@rock-chips.com, linux-arm-kernel@lists.infradead.org, zyf@rock-chips.com X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP SD2.0 cards need vqmmc and vmmc to be the same. But vqmmc call regulator_set_voltage to set min_uv(2.7v) as far as possible. So if we set vmmc 3.3V in dt table, we will get error information as follows: [ 17.785398] mmc_host mmc1: Bus speed (slot 0) = 50000000Hz (slot req 50000000Hz, actual 50000000HZ div = 0) [ 17.795175] mmc1: new high speed SDHC card at address e624 [ 17.801283] mmcblk1: mmc1:e624 SU08G 7.40 GiB [ 17.816033] mmcblk1: p1 [ 17.839318] mmcblk1: error -110 sending status command, retrying [ 17.845363] mmcblk1: error -115 sending stop command, original cmd response 0x900, card status 0x800b00 [ 17.854758] mmcblk1: error -84 transferring data, sector 32, nr 24, cmd response 0x900, card status 0xb00 [ 17.864328] mmcblk1: retrying using single block read [ 17.873647] mmcblk1: error -110 sending status command, retrying [ 17.879660] mmcblk1: error -84 transferring data, sector 44, nr 12, cmd response 0x900, card status 0x0 [ 17.889051] end_request: I/O error, dev mmcblk1, sector 44 [ 17.895594] Buffer I/O error on device mmcblk1, logical block 5 [ 17.902484] mmcblk1: error -110 sending status command, retrying [ 17.908498] mmcblk1: error -84 transferring data, sector 50, nr 6, cmd response 0x900, card status 0x0 [ 17.917802] end_request: I/O error, dev mmcblk1, sector 50 [ 17.924984] Buffer I/O error on device mmcblk1, logical block 6 [ 18.431258] mmc_host mmc1: Timeout sending command (cmd 0x200000 arg 0x0 status 0x80200000) Signed-off-by: Addy Ke --- drivers/mmc/host/dw_mmc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index b4c3044..a8b70b5 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1163,8 +1163,14 @@ static int dw_mci_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) */ uhs = mci_readl(host, UHS_REG); if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) { - min_uv = 2700000; - max_uv = 3600000; + /* try pick the exact same voltage as vmmc for vqmmc */ + if (!IS_ERR(mmc->supply.vmmc)) { + min_uv = regulator_get_voltage(mmc->supply.vmmc); + max_uv = min_uv; + } else { + min_uv = 2700000; + max_uv = 3600000; + } uhs &= ~v18; } else { min_uv = 1700000;