From patchwork Wed Dec 10 20:58:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 5472281 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 5165D9F47A for ; Wed, 10 Dec 2014 20:59:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7AE5A2017D for ; Wed, 10 Dec 2014 20:59:14 +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 78334201BB for ; Wed, 10 Dec 2014 20:59:13 +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 1XyoLo-0005Mo-Uv; Wed, 10 Dec 2014 20:59:12 +0000 Received: from mail-ie0-x232.google.com ([2607:f8b0:4001:c03::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XyoLS-0004zr-2i for linux-rockchip@lists.infradead.org; Wed, 10 Dec 2014 20:58:52 +0000 Received: by mail-ie0-f178.google.com with SMTP id tp5so3525829ieb.9 for ; Wed, 10 Dec 2014 12:58:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cQZNT/60p3963yR73Zny2Lh2fNaSOqwCbyBEzhghXHc=; b=aKRBRAcwQK3iZbS+DJxldNsvt36yToQTOpnX99szNQ5V5VOyc/RNw4fG+TaDzmMHkA /T0qVwCIAACXguJHRnGXzPpzTxhp9TcED2I1aW4V4JKSwuLHChyozc2Heg3oDGZXVEw/ FJICnucQZHM5nEwxPlYewSIgJzppFTVgrzy9U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cQZNT/60p3963yR73Zny2Lh2fNaSOqwCbyBEzhghXHc=; b=bzT+fUeGIpNvW7PFAwOQc1JNy0nzTgJ4GbZfPnsUZXRT73084uvNwm5IjyLG+pFEPt rVeyIQzPlJLHaMwEENAOfPF0M0vYwPyrDHH0ZFHeB/PoYJ2Ev1se62F7F0EVh97+ZATI durfKD/Sm7sO8fpVVr2a/qIQfdupi7tN1+HN2TTzCgaCxZ1UcwK4ZrnU2BcL4XJyApWp RZqP3OSnqAh6M7yU8Hspciocqkg51RACJYGZOCn4XQAN1jiVDOzfgKWnB7NhmoShbhq8 PBDqNJt6ZrvuVtiKSHEnkRw7Av/8xpVkUD4Sqz0A6gx6+8B5NDneH8Dz11qt8/sVMasS xZCw== X-Gm-Message-State: ALoCoQn3rPM7tmrjzS0xayZcEBv/GIkVlxQtNPsD2aCBmuJ6iyqIq4NGnXJnqxnWphsdsbrOLSsI X-Received: by 10.50.28.49 with SMTP id y17mr10221396igg.3.1418245109428; Wed, 10 Dec 2014 12:58:29 -0800 (PST) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by mx.google.com with ESMTPSA id m15sm2091454iom.44.2014.12.10.12.58.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Dec 2014 12:58:29 -0800 (PST) From: Doug Anderson To: Ulf Hansson , Mark Brown , Heiko Stuebner , Jaehoon Chung , Seungwon Jeon Subject: [PATCH 3/4] mmc: dw_mmc: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch Date: Wed, 10 Dec 2014 12:58:04 -0800 Message-Id: <1418245085-9754-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1418245085-9754-1-git-send-email-dianders@chromium.org> References: <1418245085-9754-1-git-send-email-dianders@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141210_125850_200020_31D6A604 X-CRM114-Status: GOOD ( 10.09 ) X-Spam-Score: -0.8 (/) Cc: Alexandru Stan , Andrew Bresticker , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Doug Anderson , chris@printf.net, linux-rockchip@lists.infradead.org, Alim Akhtar , Sonny Rao , linux-arm-kernel@lists.infradead.org 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=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 We've introduced a new helper in the MMC core: mmc_regulator_set_vqmmc(). Let's use this in dw_mmc. Using this new helper has some advantages: 1. We get the mmc_regulator_set_vqmmc() behavior of trying to match VQMMC and VMMC when the signal voltage is 3.3V. This ensures max compatibility. 2. We get rid of a few more warnings when probing unsupported voltages. 3. We get rid of some non-dw_mmc specific code in dw_mmc. Signed-off-by: Doug Anderson --- drivers/mmc/host/dw_mmc.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 67c0451..4ae800c 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1160,8 +1160,6 @@ static int dw_mci_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) struct dw_mci *host = slot->host; u32 uhs; u32 v18 = SDMMC_UHS_18V << slot->id; - int min_uv, max_uv; - int ret; /* * Program the voltage. Note that some instances of dw_mmc may use @@ -1170,24 +1168,11 @@ 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; uhs &= ~v18; } else { - min_uv = 1700000; - max_uv = 1950000; uhs |= v18; } - if (!IS_ERR(mmc->supply.vqmmc)) { - ret = regulator_set_voltage(mmc->supply.vqmmc, min_uv, max_uv); - - if (ret) { - dev_dbg(&mmc->class_dev, - "Regulator set error %d: %d - %d\n", - ret, min_uv, max_uv); - return ret; - } - } + mmc_regulator_set_vqmmc(mmc, ios); mci_writel(host, UHS_REG, uhs); return 0;