From patchwork Mon Aug 28 14:29:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9925665 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 53ADD60329 for ; Mon, 28 Aug 2017 14:32:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45368286E2 for ; Mon, 28 Aug 2017 14:32:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A42A286E1; Mon, 28 Aug 2017 14:32:24 +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 8581520881 for ; Mon, 28 Aug 2017 14:32:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751170AbdH1OcJ (ORCPT ); Mon, 28 Aug 2017 10:32:09 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:36882 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751184AbdH1O3W (ORCPT ); Mon, 28 Aug 2017 10:29:22 -0400 Received: by mail-wm0-f50.google.com with SMTP id u26so4787157wma.0 for ; Mon, 28 Aug 2017 07:29:22 -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=DROVhI4wEKUjPn/upt3yg7EKO4xwfiSsCnakhqcU3DA=; b=R6Vo+OmJ7a1VwwWwAkMP8AVtHGXpsUf1/X1ISWLj6rt6T+4ZygJTRvoZqxIZp8c6R1 fzsBPhdU6/uEY5tECTotXWPyT67YMl3N6DYHs7WmqwboW3ibGXEU7/iLapZMMFGoF+jv gPuC/iNaSnhypLhHqgPfcBaWMQw3+WrGhPajheCnAGB0UFEmBgzYu1h1L3ORZh2mOk+/ zaZrQ0MbOrVc9aZgIM9R+Nno0AtW8ceex3Pnyr718QWhxb5LgRlA50AcUHYysUMr8rbK QA3hFLsTd5KU9nvuFBlLNxZV9Z9VgwJ41ivtb9xMJHMX3FqXyN/Ztsrs7hLRCZTxvfx7 aDWA== 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=DROVhI4wEKUjPn/upt3yg7EKO4xwfiSsCnakhqcU3DA=; b=prqIYop4kmIVJbHHs4khNQ3CtU6xE2cfLkuCzBzs4FJmDc4EfjO3n+tcJe04RWYTJJ iALGorbgx65IGwMjIqxiXdxl/oEv3PhUP+rgPNDLOhNdXek3/i/QLTneS6vSsYQIbn/y laOKS15GrGYyDWU88MCc4CMsvdAk+Tm/4QcRcPPl/PL0x9e9oqddk9vtQIQagq5ijrOQ Q2ZNfoMGNLDT6OqnxL4H3Dvi+TxtrbQc15EjS/hx4cHvi5rEks76ZJOwUsltFJn2bVoE ztq/XaqYpzzTxbhZpKAQYJIpRtFP1JkTAfhtdyFujfRg4oXa1L13mz0Ke9rhbgKRviA0 Tn0g== X-Gm-Message-State: AHYfb5gmoY+tU1EW05PGnnOSs3STH18aIIItM7GRUvHoZkB0YK9McXpa CAGjECu+xRTD804d X-Received: by 10.28.188.67 with SMTP id m64mr450998wmf.174.1503930561406; Mon, 28 Aug 2017 07:29:21 -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.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Aug 2017 07:29:20 -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 02/13] mmc: meson-gx: cfg init overwrite values Date: Mon, 28 Aug 2017 16:29:04 +0200 Message-Id: <20170828142915.27020-3-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 cfg init function overwrite values set in the clk init function Remove the cfg pokes from the clk init. Actually, trying to use the CLK_AUTO, like initially tried in clk_init, would break the card initialization Reviewed-by: Kevin Hilman Signed-off-by: Jerome Brunet --- drivers/mmc/host/meson-gx-mmc.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index d2de5c11cdce..7d14d382cb1c 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -337,7 +337,7 @@ static int meson_mmc_clk_init(struct meson_host *host) int i, ret = 0; const char *mux_parent_names[MUX_CLK_NUM_PARENTS]; const char *clk_div_parents[1]; - u32 clk_reg, cfg; + u32 clk_reg; /* init SD_EMMC_CLOCK to sane defaults w/min clock rate */ clk_reg = 0; @@ -402,12 +402,6 @@ static int meson_mmc_clk_init(struct meson_host *host) if (WARN_ON(PTR_ERR_OR_ZERO(host->cfg_div_clk))) return PTR_ERR(host->cfg_div_clk); - /* Ensure clock starts in "auto" mode, not "always on" */ - cfg = readl(host->regs + SD_EMMC_CFG); - cfg &= ~CFG_CLK_ALWAYS_ON; - cfg |= CFG_AUTO_CLK; - writel(cfg, host->regs + SD_EMMC_CFG); - ret = clk_prepare_enable(host->cfg_div_clk); if (ret) return ret; @@ -956,6 +950,9 @@ static int meson_mmc_probe(struct platform_device *pdev) if (ret) goto err_core_clk; + /* set config to sane default */ + meson_mmc_cfg_init(host); + /* Stop execution */ writel(0, host->regs + SD_EMMC_START); @@ -964,9 +961,6 @@ static int meson_mmc_probe(struct platform_device *pdev) writel(IRQ_EN_MASK, host->regs + SD_EMMC_STATUS); writel(IRQ_EN_MASK, host->regs + SD_EMMC_IRQ_EN); - /* set config to sane default */ - meson_mmc_cfg_init(host); - ret = devm_request_threaded_irq(&pdev->dev, irq, meson_mmc_irq, meson_mmc_irq_thread, IRQF_SHARED, NULL, host);