From patchwork Fri Aug 18 17:55:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 9909683 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 82D27600CC for ; Fri, 18 Aug 2017 17:55:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B08F28CEF for ; Fri, 18 Aug 2017 17:55:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FAB928D0C; Fri, 18 Aug 2017 17:55:48 +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 E587528CEF for ; Fri, 18 Aug 2017 17:55:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752286AbdHRRzU (ORCPT ); Fri, 18 Aug 2017 13:55:20 -0400 Received: from mail-pg0-f50.google.com ([74.125.83.50]:33176 "EHLO mail-pg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752204AbdHRRzM (ORCPT ); Fri, 18 Aug 2017 13:55:12 -0400 Received: by mail-pg0-f50.google.com with SMTP id t3so40695003pgt.0 for ; Fri, 18 Aug 2017 10:55:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AXipTNJdF/sP3CyabVuHSGpYT8xgZRvSUiaV9cFIwPw=; b=dZd0Ecn4vEGkeKjeE0h7o0cr8nuatgCs9YVt2l2qBMklY7Ln2MSNcCVs72oXH7ZL/X mr7q9plGGcI3efVNHupYBQw9EL0KON9AUgO1EeLcrNGA/xabpnc29yClQObcxEymiriS vrg/g9PKbTUJWBxiF70hWaqNCnS9RBd4DCH1o= 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=AXipTNJdF/sP3CyabVuHSGpYT8xgZRvSUiaV9cFIwPw=; b=NtZaZTUez/NGeC+lDYZ4D4Fk8XRJramN4cwvA1aSElU55TJt6IFo4E4Hhu89zYSZBA 75xSfnhLwwdGaEPYa+YwRfQ8pF6i1iR9Exr/7SM3wFx/lErCxgWoNdoFoAxDoEhZlQIl CRRJColujzOnJObhn/DCiSibjUtZoulFjX3AkDcVLg4/kEvNE/T75hc3jTmPAXNmeDvH /vp2P3siMr4PqMh2+yihUkpSfVnj2yd33iHWjPwPkayjXUKDdKD6leuY8P+kmk/t5piy jiUhkWhCRrIDhDffiwovCpgUcYx5OCp6CQJy/WSFyW5HTfisChbXS4OjhQIZgAMFSsS1 4cBg== X-Gm-Message-State: AHYfb5gysVqc+CKB4nCWCaGNrFtOGjWOUex6Ii3tIdvthHivRcXwwYRH i5GbRVxvxF25/x9l X-Received: by 10.99.42.151 with SMTP id q145mr9500665pgq.454.1503078912207; Fri, 18 Aug 2017 10:55:12 -0700 (PDT) Received: from localhost.localdomain (ip68-111-217-79.sd.sd.cox.net. [68.111.217.79]) by smtp.gmail.com with ESMTPSA id 204sm11132553pga.85.2017.08.18.10.55.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Aug 2017 10:55:11 -0700 (PDT) From: Bjorn Andersson To: Adrian Hunter , Ulf Hansson Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Venkat Gopalakrishnan , Ritesh Harjani Subject: [PATCH 2/2] mmc: sdhci-msm: Enable delay circuit calibration clocks Date: Fri, 18 Aug 2017 10:55:06 -0700 Message-Id: <20170818175506.5035-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170818175506.5035-1-bjorn.andersson@linaro.org> References: <20170818175506.5035-1-bjorn.andersson@linaro.org> 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 The delay circuit used to support HS400 is calibrated based on two additional clocks. When these clocks are not available and FF_CLK_SW_RST_DIS is not set in CORE_HC_MODE, reset might fail. But on some platforms this doesn't work properly and below dump can be seen in the kernel log. mmc0: Reset 0x1 never completed. mmc0: sdhci: ============ SDHCI REGISTER DUMP =========== mmc0: sdhci: Sys addr: 0x00000000 | Version: 0x00001102 mmc0: sdhci: Blk size: 0x00004000 | Blk cnt: 0x00000000 mmc0: sdhci: Argument: 0x00000000 | Trn mode: 0x00000000 mmc0: sdhci: Present: 0x01f80000 | Host ctl: 0x00000000 mmc0: sdhci: Power: 0x00000000 | Blk gap: 0x00000000 mmc0: sdhci: Wake-up: 0x00000000 | Clock: 0x00000002 mmc0: sdhci: Timeout: 0x00000000 | Int stat: 0x00000000 mmc0: sdhci: Int enab: 0x00000000 | Sig enab: 0x00000000 mmc0: sdhci: AC12 err: 0x00000000 | Slot int: 0x00000000 mmc0: sdhci: Caps: 0x742dc8b2 | Caps_1: 0x00008007 mmc0: sdhci: Cmd: 0x00000000 | Max curr: 0x00000000 mmc0: sdhci: Resp[0]: 0x00000000 | Resp[1]: 0x00000000 mmc0: sdhci: Resp[2]: 0x00000000 | Resp[3]: 0x00000000 mmc0: sdhci: Host ctl2: 0x00000000 mmc0: sdhci: ============================================ Add support for the additional calibration clocks to allow these platforms to be configured appropriately. Cc: Venkat Gopalakrishnan Cc: Ritesh Harjani Signed-off-by: Bjorn Andersson --- drivers/mmc/host/sdhci-msm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 71e01cbc38b6..7b47906ba447 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -131,7 +131,7 @@ struct sdhci_msm_host { struct clk *pclk; /* SDHC peripheral bus clock */ struct clk *bus_clk; /* SDHC bus voter clock */ struct clk *xo_clk; /* TCXO clk needed for FLL feature of cm_dll*/ - struct clk_bulk_data bulk_clks[2]; + struct clk_bulk_data bulk_clks[4]; unsigned long clk_rate; struct mmc_host *mmc; bool use_14lpp_dll_reset; @@ -1125,6 +1125,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) struct sdhci_pltfm_host *pltfm_host; struct sdhci_msm_host *msm_host; struct resource *core_memres; + struct clk *clk; int ret; u16 host_version, core_minor; u32 core_version, config; @@ -1194,6 +1195,14 @@ static int sdhci_msm_probe(struct platform_device *pdev) msm_host->bulk_clks[0].clk = msm_host->clk; msm_host->bulk_clks[1].clk = msm_host->pclk; + clk = devm_clk_get(&pdev->dev, "cal"); + if (!IS_ERR(clk)) + msm_host->bulk_clks[2].clk = clk; + + clk = devm_clk_get(&pdev->dev, "sleep"); + if (!IS_ERR(clk)) + msm_host->bulk_clks[3].clk = clk; + ret = clk_bulk_prepare_enable(ARRAY_SIZE(msm_host->bulk_clks), msm_host->bulk_clks); if (ret)