From patchwork Mon Aug 21 16:02:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9913225 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 39E5C602A0 for ; Mon, 21 Aug 2017 16:09:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EA911FEBA for ; Mon, 21 Aug 2017 16:09:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2251928686; Mon, 21 Aug 2017 16:09:54 +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 9B73D1FEBA for ; Mon, 21 Aug 2017 16:09:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754170AbdHUQDO (ORCPT ); Mon, 21 Aug 2017 12:03:14 -0400 Received: from mail-wr0-f172.google.com ([209.85.128.172]:37427 "EHLO mail-wr0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754450AbdHUQDM (ORCPT ); Mon, 21 Aug 2017 12:03:12 -0400 Received: by mail-wr0-f172.google.com with SMTP id z91so101573358wrc.4 for ; Mon, 21 Aug 2017 09:03:11 -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=NQHDIP/kjjw/xPSDqnPE1P980K9m+9M7XcbxiKQH12U=; b=gWqAYPf6hfEZTt9CjgWaxtNgJ2hgeAO5xY+80BS/bZO43ibWzTnw2smm0emXMTDUps nEtFmnXEU+aKvNTh/2HgCF141VJaWa7V0xCxe4ch4liHTUHkWFY7TG1OsiTU1YBsBvBo aInRDL0R6wbk3WddoUIGnEeDbFjgIBSNG/Ic1HJHa0kgNmGDDvguXah5fqthsSFH+bcm 9fX/QFr1OTGx2yCxIEnPUzK4jk6+XwEGBzICITn8XLK/qPFgk3XvaT6P8zePQdVAcyfI +/3B7a4R80iVEh9mXWe4MDrOUi9wQqvtvPv7wQzRPQ7c9miJbJg79ZjLb+xATb3T65/A 3hBg== 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=NQHDIP/kjjw/xPSDqnPE1P980K9m+9M7XcbxiKQH12U=; b=b1/EaK2V+u+G6KhdtbIdTdun+3jmMg1jJBmu9UyxCYdbHMn8BWpf2AjdOVrok8shRi gKQtDVXbIhZDqW5errhkKi5wevxcwEjtYbb5XrhZlDEvusGgGmURIX0NZq7yBtz4GNAi 8gDng2oYZ/vKWEzjyPihV3Q/LBtLtHtLPruKdqgk2huLTVo0OC+7c6O5drkHc9369+1T cvf2XiB3U1TeHxBiV5nZK8Nk3pJWjTD54tlZugOEE3Z3TK8isx1X+w4LsYKbAIYW2MW+ 2R3DVJKohVa3QjFJ2JLsJslBWec5BCVgr4/mQ9WA7SX7RKBE/IIlSSi89vpdUE5myprK TIdw== X-Gm-Message-State: AHYfb5jbDvGM+Wpp5VhusATQ8od72uUH3azXnW6RwE8p9wBflSzTdNUg EpMs934sJey+S+cwPrI= X-Received: by 10.223.179.11 with SMTP id j11mr1039813wrd.235.1503331391056; Mon, 21 Aug 2017 09:03:11 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id 63sm8120063wra.30.2017.08.21.09.03.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Aug 2017 09:03:10 -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 05/16] mmc: meson-gx: cfg init overwrite values Date: Mon, 21 Aug 2017 18:02:50 +0200 Message-Id: <20170821160301.21899-6-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 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 BEWARE not to poke the cfg register while the divider value in clk register is 0. It crashes the SoC. 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 a399fbd415f4..61668891b4fc 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; /* get the mux parents */ for (i = 0; i < MUX_CLK_NUM_PARENTS; i++) { @@ -403,12 +403,6 @@ static int meson_mmc_clk_init(struct meson_host *host) clk_reg &= ~CLK_ALWAYS_ON; writel(clk_reg, host->regs + SD_EMMC_CLOCK); - /* 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; @@ -958,6 +952,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); @@ -966,9 +963,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);