From patchwork Wed Mar 11 22:15:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 5988951 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AAB3F9F380 for ; Wed, 11 Mar 2015 22:18:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D05FA20374 for ; Wed, 11 Mar 2015 22:18:30 +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 EABD92034B for ; Wed, 11 Mar 2015 22:18:29 +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 1YVovn-0002ik-K0; Wed, 11 Mar 2015 22:16:47 +0000 Received: from mail-ie0-x229.google.com ([2607:f8b0:4001:c03::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YVovP-0002Oh-VY for linux-arm-kernel@lists.infradead.org; Wed, 11 Mar 2015 22:16:25 +0000 Received: by ieclw3 with SMTP id lw3so2382090iec.2 for ; Wed, 11 Mar 2015 15:16:02 -0700 (PDT) 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=g+gABc2xR0IG2sOmHLhl9fDFeV4BBRlsOFgHZlXLLxQ=; b=d4PkDqk9WohciAywf/PjD+mui1y21b412yv64IbA/O0q+I+/7q5DYZHVe6nDSIchU9 kqMfB5wOYe4ElIrGKDgoRi78eG1bdhuUO3UfjKDsISrnPjb29NZmlPlZJslChS+ybpjJ lsruBQPwbi1AXkI/mlmKm7klSaHtIbCM8aIZM= 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=g+gABc2xR0IG2sOmHLhl9fDFeV4BBRlsOFgHZlXLLxQ=; b=Zm4qGy5qQEARtQeAG7zcpvU2LBQakks5V3aj3Ih817M0Tgm6aK8RqLrbKNyQW/Ahnu rs/zKU8mTis8Xic6tIlLHkGXNzPJx3FK1smO4sX4UpDiVSJUVZ3tiSmN+eGlHlHC38ML 0+wSDf+u6RZPb97miAHR+xbtCVQ8uhy1us8+9HcnvozhhZr4RNZcCiqqrxZKWTkcIBLh bkD2K4C4Ct1+RmayLcooTKj8cqzZPznpVr8hhnlKRH0aQcbcxyDqnAedkGRAUKfQCONp thin8X7O0uUniWOfGxlDTJgEYM+1TPr1uR5mGIPioxy0Ibs/yVg2+rP/gh0tWebC/JAe CBUw== X-Gm-Message-State: ALoCoQlVrF8nncdOSX0Xsec1TeksPK2I5SgUQoFU0oa7LxYP0DeKBheL0KCWTEAonCJSFhjpTklN X-Received: by 10.107.133.154 with SMTP id p26mr40515904ioi.63.1426112139304; Wed, 11 Mar 2015 15:15:39 -0700 (PDT) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by mx.google.com with ESMTPSA id 192sm3229684ioo.38.2015.03.11.15.15.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Mar 2015 15:15:38 -0700 (PDT) From: Doug Anderson To: Ulf Hansson , Heiko Stuebner , Jaehoon Chung , Seungwon Jeon Subject: [PATCH v4 3/4] mmc: dw_mmc: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch Date: Wed, 11 Mar 2015 15:15:16 -0700 Message-Id: <1426112117-18220-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1426112117-18220-1-git-send-email-dianders@chromium.org> References: <1426112117-18220-1-git-send-email-dianders@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150311_151624_152044_C13B1F3A X-CRM114-Status: GOOD ( 12.54 ) X-Spam-Score: -0.8 (/) Cc: Addy Ke , Alexandru Stan , Andrew Bresticker , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Doug Anderson , chris@printf.net, linux-rockchip@lists.infradead.org, Mark Brown , Alim Akhtar , Sonny Rao , javier.martinez@collabora.co.uk, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=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=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 v4: None 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 e2811cf..615d1d9 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1214,7 +1214,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; /* @@ -1223,22 +1222,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; } }