From patchwork Mon Aug 21 16:02:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9913231 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D139D602A0 for ; Mon, 21 Aug 2017 16:10:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C69BC285E0 for ; Mon, 21 Aug 2017 16:10:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB8F9287BD; Mon, 21 Aug 2017 16:10:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E523285E0 for ; Mon, 21 Aug 2017 16:10:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754422AbdHUQJy (ORCPT ); Mon, 21 Aug 2017 12:09:54 -0400 Received: from mail-wr0-f171.google.com ([209.85.128.171]:37439 "EHLO mail-wr0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754453AbdHUQDN (ORCPT ); Mon, 21 Aug 2017 12:03:13 -0400 Received: by mail-wr0-f171.google.com with SMTP id z91so101573842wrc.4 for ; Mon, 21 Aug 2017 09:03:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rXd6q7OYpdZBu63ve9On+4T4IM8h14fRvuBmXWIXVUI=; b=AFE7Nvx/7WiFpRD571CiqUnZsKCmYwBa84kVYnnozV9cuHhOi2K5dRGV3fN/2jbAG9 ZtIqTLgbGAKUNeExd4kPk4jScsFAjNht1LusfHEcmBkSt2o3zeFR9MwcZmyiXL4HBl0y unYecosYPYRFfhTn/2ZemSspaUfuFzjuGveus2xWFcJ4p+kvD1umexsbCWnmti81UGVh 1cjqK/XyPEVEsuuJgSu/0/Mq/YVEY588HZkTCWCUNlS8+dMnbKC9JLHNHTVxoW+aoOeS 7V1QDMEw5oPgpFWPEZFrcxnhX0U0P9NjvmiW9Z8vgPSy3LJq96HkBrhHW1WNl31bB3YE Tdzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rXd6q7OYpdZBu63ve9On+4T4IM8h14fRvuBmXWIXVUI=; b=hGbYWOMtoajIgLtNhmn/5iG2v3GIuXQ7ISG1Qn+LLJboGn9sOipXbto2gUhESA727V 2GnknqPxQqiGuDW5ZJX2YwEHmBLXiUaFnzIdMxs/xieGw+p2Slp3vfWfooG89ug5GUw8 jpmaXCqkizYh1xx+yLSPinj2Gf82MqBXodX5oSgZIrvNWkNUAs9f9W4gQ1uoKHYReHvK U8F3MSHVQ1+21aK/o4Kdgnu6xBID9br+wTVPaetqjEouRw7N2dsUzW1LeQWfHZHCC52w doWj8ti4vHH/K3CvwB3gJqML31QRwMZM2nJ3ei8cyuTofig0BMvbBe0R/sLZhpGSB63D C/3Q== X-Gm-Message-State: AHYfb5ictAHzK1GtTuomVrl91zHsczF+6lET+Wq58pIS/7RjlubM9jal 2L8bQ5NmohBdwqNoAMw= X-Received: by 10.223.134.189 with SMTP id 58mr2660414wrx.157.1503331392222; Mon, 21 Aug 2017 09:03:12 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id 63sm8120063wra.30.2017.08.21.09.03.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Aug 2017 09:03:11 -0700 (PDT) From: Jerome Brunet To: Ulf Hansson , Kevin Hilman , Carlo Caione Cc: Jerome Brunet , linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 06/16] mmc: meson-gx: rework set_ios function Date: Mon, 21 Aug 2017 18:02:51 +0200 Message-Id: <20170821160301.21899-7-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170821160301.21899-1-jbrunet@baylibre.com> References: <20170821160301.21899-1-jbrunet@baylibre.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove conditional write of cfg register. Warn if set_clk fails for some reason. Consistently use host->dev instead of mixing with mmc_dev(mmc) Reviewed-by: Kevin Hilman Signed-off-by: Jerome Brunet --- drivers/mmc/host/meson-gx-mmc.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 61668891b4fc..18fff28025d8 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -445,8 +445,8 @@ static void meson_mmc_set_tuning_params(struct mmc_host *mmc) static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) { struct meson_host *host = mmc_priv(mmc); - u32 bus_width; - u32 val, orig; + u32 bus_width, val; + int err; /* * GPIO regulator, only controls switching between 1v8 and @@ -474,7 +474,7 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) int ret = regulator_enable(mmc->supply.vqmmc); if (ret < 0) - dev_err(mmc_dev(mmc), + dev_err(host->dev, "failed to enable vqmmc regulator\n"); else host->vqmmc_enabled = true; @@ -483,9 +483,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) break; } - - meson_mmc_clk_set(host, ios->clock); - /* Bus width */ switch (ios->bus_width) { case MMC_BUS_WIDTH_1: @@ -504,8 +501,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) } val = readl(host->regs + SD_EMMC_CFG); - orig = val; - val &= ~CFG_BUS_WIDTH_MASK; val |= FIELD_PREP(CFG_BUS_WIDTH_MASK, bus_width); @@ -519,11 +514,12 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) if (ios->timing == MMC_TIMING_MMC_HS400) val |= CFG_CHK_DS; - if (val != orig) { - writel(val, host->regs + SD_EMMC_CFG); - dev_dbg(host->dev, "%s: SD_EMMC_CFG: 0x%08x -> 0x%08x\n", - __func__, orig, val); - } + err = meson_mmc_clk_set(host, ios->clock); + if (err) + dev_err(host->dev, "Failed to set clock: %d\n,", err); + + writel(val, host->regs + SD_EMMC_CFG); + dev_dbg(host->dev, "SD_EMMC_CFG: 0x%08x\n", val); } static void meson_mmc_request_done(struct mmc_host *mmc,