From patchwork Mon Oct 2 12:27:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9980771 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 EBA3B60365 for ; Mon, 2 Oct 2017 12:28:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DEBA428782 for ; Mon, 2 Oct 2017 12:28:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3A1D28892; Mon, 2 Oct 2017 12:28:02 +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=ham 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 8397428782 for ; Mon, 2 Oct 2017 12:28:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751373AbdJBM16 (ORCPT ); Mon, 2 Oct 2017 08:27:58 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:55001 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751281AbdJBM1x (ORCPT ); Mon, 2 Oct 2017 08:27:53 -0400 Received: by mail-wm0-f50.google.com with SMTP id i124so10216776wmf.3 for ; Mon, 02 Oct 2017 05:27:52 -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=B5aNHi8LR4Wf2/fXrjR5+cPr5lKC5mPx5dEboI9Wmvo=; b=lnBi7lU3WI+0GRXMWHYo074p53OPMfuMvoykDJba4U/EIP2fDOIaaM+Mq8s78vlwrN 90bD5mkEnF5T0pTlfPX4wot+Daui54D9hmtJZtphvSEejswFsHoa8dHILBbof974mATO o6LwrDj2UYUwBTWt7dSJs7+e0/Bhi80h0C5s7yPTh6GLch30lhe37keERTjLrNOXj6ZN BiK1PuLYklPkLUrAppMj/e5XbXSvVAHExC0UI+ObONxjlGwfPaVoICujF0DrTfA3eFR/ tktqll26HTFbcEsACzpHUaEutf2yOdGLotpAgXUo0vbGC0H/f26p3lrNakdPR1DIYdc/ uOvw== 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=B5aNHi8LR4Wf2/fXrjR5+cPr5lKC5mPx5dEboI9Wmvo=; b=Fe3ioO2rvJn0TZqTvZLtofZqOsoUieCv0nbRMwTNUw4ioX8Rbh7x3ayY7fvK5bZd6F 7QrF0vKzJvmuDTrVHT9o2YurPEhj9CUDpPHaL9RTxKV/By5g+hWK83sEqLofLgJ0rRoX 7kebvIY/6v1Bk0506j+3kl7OrTKb8ljchoNHwCg0XS5VzCfGTgpGeuDjoQIT1OXOLUmo zPWF7tGw8WDervnqcNigO8/5EP9JksrhdLB0ypTRZsoF7v5vdUKUslSMkdVQH/gUr1wt 46/uz1hy/VTDys4jgT7L/5NUzlAtHPmpgz+oOOpjp5RVXC8+KnOJvUiQrVat2uZhSFIP OKIQ== X-Gm-Message-State: AHPjjUilSwgrT9eU62SNieA8fT1LDmH9ZRU6+imriPhtJ2UFIi+ScriW m4SLTYjqYNCH8hL46djwSRHFEw== X-Google-Smtp-Source: AOwi7QCNp0fPjCLDY9b/z8ssOqetHUDVDxYTPrgF4hpJmXD2en0HxRpmZHDJb9WwMsgCavBY8nj2Rg== X-Received: by 10.28.103.195 with SMTP id b186mr11211301wmc.86.1506947272271; Mon, 02 Oct 2017 05:27:52 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id u96sm14354287wrc.68.2017.10.02.05.27.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2017 05:27:51 -0700 (PDT) From: Jerome Brunet To: Ulf Hansson , Carlo Caione , Kevin Hilman Cc: Jerome Brunet , Heiner Kallweit , linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] mmc: meson-gx: fix rx phase reset Date: Mon, 2 Oct 2017 14:27:42 +0200 Message-Id: <20171002122743.32334-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171002122743.32334-1-jbrunet@baylibre.com> References: <20171002122743.32334-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 Resetting the phase when POWER_ON is set the set_ios() call means that the phase is reset almost every time the set_ios() is called, while the expected behavior was to reset the phase on a power cycle. This had gone unnoticed until now because in all mode (except hs400) the tuning is done after the last to set_ios(). In such case, the tuning result is used anyway. In HS400, there are a few calls to set_ios() after the tuning is done, overwriting the tuning result. Resetting the phase on POWER_UP instead of POWER_ON solve the problem. Fixes: d341ca88eead ("mmc: meson-gx: rework tuning function") Signed-off-by: Jerome Brunet --- drivers/mmc/host/meson-gx-mmc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 421c8719c202..08a55c2e96e1 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -745,6 +745,10 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) case MMC_POWER_UP: if (!IS_ERR(mmc->supply.vmmc)) mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd); + + /* Reset rx phase */ + clk_set_phase(host->rx_clk, 0); + break; case MMC_POWER_ON: @@ -758,8 +762,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->vqmmc_enabled = true; } - /* Reset rx phase */ - clk_set_phase(host->rx_clk, 0); break; }