From patchwork Thu Mar 3 10:19:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 8490941 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 593BBC0553 for ; Thu, 3 Mar 2016 10:20:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7D42820351 for ; Thu, 3 Mar 2016 10:20:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 852D0202FF for ; Thu, 3 Mar 2016 10:20:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756709AbcCCKUG (ORCPT ); Thu, 3 Mar 2016 05:20:06 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:33464 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756635AbcCCKUE (ORCPT ); Thu, 3 Mar 2016 05:20:04 -0500 Received: by mail-pa0-f42.google.com with SMTP id fl4so12520792pad.0 for ; Thu, 03 Mar 2016 02:20:03 -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=TijQK38ThESkvhUzd/PsSkV583403HLxA8v5t1/usg8=; b=iCULWF0lCBbOQvokh+KusK8Uwnua4h4uVdcH/RlK1Llyb2FYLc7+AFHTovgkDgu9jx Sciw7W7G/ux9WabdUAKPaJqxtA62GvOHLLiK6G8KrPcnN7RUXvME9BX5y1kLx4fzqI62 XxzBQVAMnsoD0NEF2pyvUoI7qorrGQuiva5AY= 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=TijQK38ThESkvhUzd/PsSkV583403HLxA8v5t1/usg8=; b=BHgTPS37uolpC01uGTSTBM2XeNTzljORBa1MNr+lzxDa8OUAjegQJflldAs5hsH+7r WHg+MUcNZzxQ5F2uGzC4OK9byawJ76XN4Yze3KbN+ImwtEnckHpmBbx2fnNZDwwewRqC KU/06K9BY7/M7lZrjPBfrz62XtXo2Ohcp8RzwluNLdZ2GeSlz4fXr5YkdBCgnKWGAfaJ AbrxXLftwdE8yzYiV4mjYfJ0uAgOqJmycYAH5rwQWMPsDO1wMG0lavdeMbS0w7LSW3ZY 99q5BskGx37hYhZGWLn2dhif8iZizkzEFZIIq9ns367S04fOKw7csJ1QHcLoNRlkSwfd gOBg== X-Gm-Message-State: AD7BkJK9dPGSlFEIsvGrYT9pJs248uXWpf+/++BQuw+nlAYfInYjWbZlfG6jWE70YCP5ng== X-Received: by 10.66.140.39 with SMTP id rd7mr2497164pab.92.1457000403120; Thu, 03 Mar 2016 02:20:03 -0800 (PST) Received: from drinkcat.tpe.corp.google.com ([172.30.210.53]) by smtp.gmail.com with ESMTPSA id wx3sm57842230pab.25.2016.03.03.02.20.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Mar 2016 02:20:02 -0800 (PST) From: Nicolas Boichat To: Ulf Hansson Cc: Matthias Brugger , Chaotian Jing , Nicolas Boichat , Geert Uytterhoeven , linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, dianders@chromium.org Subject: [PATCH 2/2] mmc: mediatek: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch Date: Thu, 3 Mar 2016 18:19:45 +0800 Message-Id: <1457000385-2317-2-git-send-email-drinkcat@chromium.org> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: <1457000385-2317-1-git-send-email-drinkcat@chromium.org> References: <1457000385-2317-1-git-send-email-drinkcat@chromium.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 We've introduced a new helper in the MMC core: mmc_regulator_set_vqmmc(). Let's use this in mtk-sd. 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-mediatek specific code in mtk-sd. Signed-off-by: Nicolas Boichat Reviewed-by: Douglas Anderson --- Similar to e0848f5d294c703917260a6228cc08b8be46c527 mmc: dw_mmc: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch , where I copied the commit message from. drivers/mmc/host/mtk-sd.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 07809f4..b17f30d 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -1021,26 +1021,19 @@ static void msdc_set_buswidth(struct msdc_host *host, u32 width) static int msdc_ops_switch_volt(struct mmc_host *mmc, struct mmc_ios *ios) { struct msdc_host *host = mmc_priv(mmc); - int min_uv, max_uv; int ret = 0; if (!IS_ERR(mmc->supply.vqmmc)) { - if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) { - min_uv = 3300000; - max_uv = 3300000; - } else if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_180) { - min_uv = 1800000; - max_uv = 1800000; - } else { + if (ios->signal_voltage != MMC_SIGNAL_VOLTAGE_330 && + ios->signal_voltage != MMC_SIGNAL_VOLTAGE_180) { dev_err(host->dev, "Unsupported signal voltage!\n"); return -EINVAL; } - ret = regulator_set_voltage(mmc->supply.vqmmc, min_uv, max_uv); + ret = mmc_regulator_set_vqmmc(mmc, ios); if (ret) { - dev_dbg(host->dev, - "Regulator set error %d: %d - %d\n", - ret, min_uv, max_uv); + dev_dbg(host->dev, "Regulator set error %d (%d)\n", + ret, ios->signal_voltage); } else { /* Apply different pinctrl settings for different signal voltage */ if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_180)