From patchwork Tue Dec 16 00:22:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 5498571 Return-Path: X-Original-To: patchwork-linux-mmc@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 E206B9F30B for ; Tue, 16 Dec 2014 00:23:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1DBFB20A14 for ; Tue, 16 Dec 2014 00:23:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B5CF20A01 for ; Tue, 16 Dec 2014 00:23:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751584AbaLPAWw (ORCPT ); Mon, 15 Dec 2014 19:22:52 -0500 Received: from mail-ie0-f181.google.com ([209.85.223.181]:38354 "EHLO mail-ie0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751452AbaLPAWa (ORCPT ); Mon, 15 Dec 2014 19:22:30 -0500 Received: by mail-ie0-f181.google.com with SMTP id tp5so11855806ieb.12 for ; Mon, 15 Dec 2014 16:22: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=HgIFRim75fzd2QFu3EK7Kcwi/TdhmNZxhYEx+ByNbik=; b=h+NqzmRtSDOXstfO+kxvDOdvFbYP4CF6OXh9nlCV5KMBB14BU6fPBhHNLlQRF6DGzX +tG3HJvUv8GaaOQ1PjCVF26SnhrSvqsrM5OcVsA0pj36sspmHe2xY8Ma3P13ZLsu+kTl i029yIGo9mmscfwnbxORN+oKa08/h/mOUJrKY= 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=HgIFRim75fzd2QFu3EK7Kcwi/TdhmNZxhYEx+ByNbik=; b=TFDx6wZa+rjjToiJprqqeyUX75x/wy/fhcCUPxa/D8m43KiN4OBqF/Wp5hxmxkSfE2 wV3moVdlR6nlQUo8onN8Er3YtgsqDPQB4hZLAm8CAj2YwEHg9x2RAEuoBSYmf+DCf8kR 7W30EhceCmHD3xXc8YXS96j2ivkFUIdMbP0U1ViTOyzJmli2TNR5f8m45HLBamTwP+8f zxV08ksLREYeFEpFO+LRdPTv0wchg+RrlLMclyu0Mm+9ilAgZebmQIOu/xmqbhdZY77x pVKdGeBQ8CaxZhTOJpQ6wVerKRxCtasIbxEUkjQXG9v6IRBv4KjyIugem6UcDnyR86mL HvLA== X-Gm-Message-State: ALoCoQk0sWXC6WBd5uw3mQXGBU80hsTT5GoxPxT1XypM0XnKCmxv+M022m6OcCqsQH0dD9lRy/9/ X-Received: by 10.43.163.69 with SMTP id mn5mr30391796icc.20.1418689349749; Mon, 15 Dec 2014 16:22:29 -0800 (PST) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by mx.google.com with ESMTPSA id v83sm5434330iov.30.2014.12.15.16.22.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Dec 2014 16:22:29 -0800 (PST) From: Doug Anderson To: Ulf Hansson , Heiko Stuebner , Jaehoon Chung , Seungwon Jeon Cc: Mark Brown , Alexandru Stan , Alim Akhtar , Sonny Rao , Andrew Bresticker , linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Doug Anderson , chris@printf.net, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] mmc: dw_mmc: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch Date: Mon, 15 Dec 2014 16:22:19 -0800 Message-Id: <1418689340-29517-2-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1418689340-29517-1-git-send-email-dianders@chromium.org> References: <1418689340-29517-1-git-send-email-dianders@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,T_DKIM_INVALID,T_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 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 Reviewed-by: Andrew Bresticker --- Changes in v3: - Continue to check for errors if VQMMC is not an error as per Andrew. Changes in v2: None drivers/mmc/host/dw_mmc.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 67c0451..b3993d4 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1160,7 +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; /* @@ -1169,22 +1168,18 @@ static int dw_mci_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) * does no harm but you need to set the regulator directly. Try both. */ uhs = mci_readl(host, UHS_REG); - if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) { - min_uv = 2700000; - max_uv = 3600000; + if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) uhs &= ~v18; - } else { - min_uv = 1700000; - max_uv = 1950000; + else uhs |= v18; - } + if (!IS_ERR(mmc->supply.vqmmc)) { - ret = regulator_set_voltage(mmc->supply.vqmmc, min_uv, max_uv); + ret = mmc_regulator_set_vqmmc(mmc, ios); if (ret) { dev_dbg(&mmc->class_dev, - "Regulator set error %d: %d - %d\n", - ret, min_uv, max_uv); + "Regulator set error %d - %s V\n", + ret, uhs & v18 ? "1.8" : "3.3"); return ret; } }