From patchwork Mon Aug 28 14:29:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9925659 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 1343360329 for ; Mon, 28 Aug 2017 14:32:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06BE120881 for ; Mon, 28 Aug 2017 14:32:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EFC10286E2; Mon, 28 Aug 2017 14:32:09 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 8055A20881 for ; Mon, 28 Aug 2017 14:32:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751564AbdH1OcG (ORCPT ); Mon, 28 Aug 2017 10:32:06 -0400 Received: from mail-wr0-f170.google.com ([209.85.128.170]:38230 "EHLO mail-wr0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751302AbdH1O3X (ORCPT ); Mon, 28 Aug 2017 10:29:23 -0400 Received: by mail-wr0-f170.google.com with SMTP id 40so1691258wrv.5 for ; Mon, 28 Aug 2017 07:29:23 -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=nY5vKq86mNqda4qj8Dd1b9Eoxv8nkED9wOV2EJqvD+Q=; b=ADrsH5hzRP/gPsqY1dUfBwQDT7VInkxe0j3Pr00C1KakaeKlKM5+fPf7LCq6nVHBiz g+H8uMahQqOhZkVw806zrEGFAQ9c+qbFO7zjHuWOaemMsIXFSmIU8N9us5NZg8Fpp8Ml pzAFlQmrlBEeeh7kNFnon5qjP921ENA99kTl2w8bQ62/jPqF5NqcbU0IhPVHOc0OBLGt A6UklAuwAPS014rjPYtaNoyQ34ZmqhptkqZnIHAbunx9RdfpHEogAni3pDt9rgnho4ok 2zJ7gBKMHw7N7fUCWetXOUn/wHijjvw8qqgTiFcs5hl755JmRbPEeJEh7xzPdfmF8ZAV symQ== 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=nY5vKq86mNqda4qj8Dd1b9Eoxv8nkED9wOV2EJqvD+Q=; b=PakecnOe1mVYYzH3mXB/Xb1FgjeEs8gUWzefryFof9/RwSoRetXBIO3Rc+7YAZ6Xsc 4ApbzrdzCw5MF4R3owF07fLpjEhP+/7G/v3UVZuvLy3Sj6cOYGXKGrJ3MPQglThb4foN RB3gUQgIAR7KbHj4MaArEZWXEWsIuTPpX/xR/jQOLwov1z+zUmkCJDL5lPFji47t1uMV 76QpAz2hErPjuq6zk4NOdhZI3a3PN3VffCgYHe62gJ7ahoBVsuktUP3fPs+OvxhHLGN7 NGxmL95Ng7r0rCGClJLXGKXc9omLBmhmzkYZBkfuRK3sqXBpiEtrVzT3dYm9LYnSoo0d FJUA== X-Gm-Message-State: AHYfb5jmwMaD43ZRPsLxxLf22pm11SqaZFedKI+LnsqR4VmwKo5mKluh 2iHX6pJ7VkwqJesRDic= X-Received: by 10.223.138.239 with SMTP id z44mr509845wrz.85.1503930562305; Mon, 28 Aug 2017 07:29:22 -0700 (PDT) Received: from localhost.localdomain (uluru.liltaz.com. [163.172.81.188]) by smtp.googlemail.com with ESMTPSA id z39sm604792wrz.61.2017.08.28.07.29.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Aug 2017 07:29:21 -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 v3 03/13] mmc: meson-gx: rework set_ios function Date: Mon, 28 Aug 2017 16:29:05 +0200 Message-Id: <20170828142915.27020-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170828142915.27020-1-jbrunet@baylibre.com> References: <20170828142915.27020-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 7d14d382cb1c..0d29f1f347eb 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -444,8 +444,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 @@ -473,7 +473,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; @@ -482,9 +482,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: @@ -503,8 +500,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); @@ -518,11 +513,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,