From patchwork Wed Oct 5 14:40:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ritesh Harjani X-Patchwork-Id: 9363017 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 AAE1B6075E for ; Wed, 5 Oct 2016 14:41:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9BF8028950 for ; Wed, 5 Oct 2016 14:41:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 900852899C; Wed, 5 Oct 2016 14:41:42 +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 E299828950 for ; Wed, 5 Oct 2016 14:41:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754427AbcJEOlj (ORCPT ); Wed, 5 Oct 2016 10:41:39 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:49728 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754416AbcJEOlj (ORCPT ); Wed, 5 Oct 2016 10:41:39 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 00DC461AC6; Wed, 5 Oct 2016 14:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1475678498; bh=mj+p0EClWG5vFsGVp8eLime+OD1D+Xr3UU6FNILT4O8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FsP1Llo46fwC9sB0b0pKQicmC8EJcBjaN/ZGoOBox6NhPySexY3HAmERm33sIyKNO dWxHD7KdfDSu13sYd3x1Hq010oOusN0RgPnLNvG7ZLdvxb95IqOrxLQmBwz8qSMrc7 lfafsyIA81rjX6e2eCZCYvG54zYpHHm3BspU+EHQ= Received: from rharjani-linux.qualcomm.com (unknown [202.46.23.54]) (using TLSv1.1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: riteshh@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id B45C261AC6; Wed, 5 Oct 2016 14:41:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1475678493; bh=mj+p0EClWG5vFsGVp8eLime+OD1D+Xr3UU6FNILT4O8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WWA9h4BubvicjnhqzQm4qfdNfQAqIgbT9rpksu2OrcCjW0uD2/rrKf3yLVbpbyLAv PL/H1HRuNKnRSxtyHFoU+2ayDTFSN51i+8zPNBtaoybpZ0tfACA0xGdAoBVNNVifSl stPPzN+vIEmsh77LNZ9iuZPfpFZzO8vwFj8Fnifg= DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org B45C261AC6 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=pass smtp.mailfrom=riteshh@codeaurora.org From: Ritesh Harjani To: ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, adrian.hunter@intel.com, shawn.lin@rock-chips.com Cc: david.brown@linaro.org, andy.gross@linaro.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org, alex.lemberg@sandisk.com, mateusz.nowak@intel.com, Yuliy.Izrailov@sandisk.com, asutoshd@codeaurora.org, david.griego@linaro.org, stummala@codeaurora.org, venkatg@codeaurora.org, sboyd@codeaurora.org, bjorn.andersson@linaro.org, pramod.gurav@linaro.org, Ritesh Harjani Subject: [PATCH v5 03/12] mmc: sdhci-msm: add pltfm_data support to get clk-rates from DT Date: Wed, 5 Oct 2016 20:10:31 +0530 Message-Id: <1475678440-3525-4-git-send-email-riteshh@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1475678440-3525-1-git-send-email-riteshh@codeaurora.org> References: <1475678440-3525-1-git-send-email-riteshh@codeaurora.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 This adds support for sdhc-msm controllers to get supported clk-rates from DT. sdhci-msm would need it's own set_clock ops to be implemented. For this, supported clk-rates needs to be populated in sdhci_msm_pltfm_data. Signed-off-by: Ritesh Harjani --- .../devicetree/bindings/mmc/sdhci-msm.txt | 1 + drivers/mmc/host/sdhci-msm.c | 48 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/Documentation/devicetree/bindings/mmc/sdhci-msm.txt b/Documentation/devicetree/bindings/mmc/sdhci-msm.txt index 485483a..6a83b38 100644 --- a/Documentation/devicetree/bindings/mmc/sdhci-msm.txt +++ b/Documentation/devicetree/bindings/mmc/sdhci-msm.txt @@ -17,6 +17,7 @@ Required properties: "iface" - Main peripheral bus clock (PCLK/HCLK - AHB Bus clock) (required) "core" - SDC MMC clock (MCLK) (required) "bus" - SDCC bus voter clock (optional) +- clk-rates: Array of supported GCC clock frequencies for sdhc, Units - Hz. Example: diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 85ddaae..042ecb2 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -81,6 +81,8 @@ struct sdhci_msm_host { struct clk *clk; /* main SD/MMC bus clock */ struct clk *pclk; /* SDHC peripheral bus clock */ struct clk *bus_clk; /* SDHC bus voter clock */ + u32 *clk_table; + int clk_table_sz; struct mmc_host *mmc; bool use_14lpp_dll_reset; }; @@ -582,6 +584,50 @@ static const struct sdhci_pltfm_data sdhci_msm_pdata = { .ops = &sdhci_msm_ops, }; +static int sdhci_msm_dt_get_array(struct device *dev, const char *prop_name, + u32 **table, int *size) +{ + struct device_node *np = dev->of_node; + int count, ret; + u32 *arr; + + count = of_property_count_elems_of_size(np, prop_name, sizeof(u32)); + if (count < 0) { + dev_warn(dev, "%s: Invalid dt property, err(%d)\n", + prop_name, count); + return count; + } + + arr = kcalloc(count, sizeof(*arr), GFP_KERNEL); + if (!arr) + return -ENOMEM; + + ret = of_property_read_u32_array(np, prop_name, arr, count); + if (ret) { + kfree(arr); + dev_warn(dev, "%s Invalid dt array property, err(%d)\n", + prop_name, ret); + return ret; + } + *table = arr; + *size = count; + return 0; +} + +void sdhci_msm_populate_dt(struct device *dev, + struct sdhci_msm_host *msm_host) +{ + int table_sz = 0; + u32 *table = NULL; + + if (sdhci_msm_dt_get_array(dev, "clk-rates", &table, &table_sz)) { + dev_warn(dev, "failed in DT parsing for supported clk-rates\n"); + return; + } + msm_host->clk_table = table; + msm_host->clk_table_sz = table_sz; +} + static int sdhci_msm_probe(struct platform_device *pdev) { struct sdhci_host *host; @@ -608,6 +654,8 @@ static int sdhci_msm_probe(struct platform_device *pdev) sdhci_get_of_property(pdev); + sdhci_msm_populate_dt(&pdev->dev, msm_host); + /* Setup SDCC bus voter clock. */ msm_host->bus_clk = devm_clk_get(&pdev->dev, "bus"); if (!IS_ERR(msm_host->bus_clk)) {