From patchwork Wed Jun 1 23:15:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9148763 X-Patchwork-Delegate: sboyd@codeaurora.org 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 CFB14600BC for ; Wed, 1 Jun 2016 23:24:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C281626FA0 for ; Wed, 1 Jun 2016 23:24:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B76FA271F1; Wed, 1 Jun 2016 23:24:01 +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 2694B26FA0 for ; Wed, 1 Jun 2016 23:24:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752075AbcFAXWx (ORCPT ); Wed, 1 Jun 2016 19:22:53 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:35958 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751939AbcFAXPy (ORCPT ); Wed, 1 Jun 2016 19:15:54 -0400 Received: by mail-pa0-f50.google.com with SMTP id eu11so513967pad.3 for ; Wed, 01 Jun 2016 16:15:54 -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=J+9xOh4hqQE19Nb3xOsV/t8HQBzGoDBBpDw7LIXe8Vw=; b=gV8MIvz5SxJA3rrIKYV+W78FK/HKu1/CO63ggMgzyBFQ2tNYGqFR8jwJC0bYbUbMbB NRvAPhZyCBzrA7YwkRzlLRPDbU41Ho2CwtH5a0PLEpaG07HjuNLDPh6p4zgMU5UuS1qP U7j4DPdAZL1bh7Z3P/IL/b6DHM/OnBs6EgQy4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=J+9xOh4hqQE19Nb3xOsV/t8HQBzGoDBBpDw7LIXe8Vw=; b=fO1SRd2Isx5mVE+aoN+W0yDr+UQI0hax9ZCRKVBcNebFkZipttsP80Uxrf203HdHSA ZT8EOqkksvqxk9URgnGchMkQ7Vq69cwAZJFosjHwxuKuTA0R/S6wFj4tZ1pknb8H6vns BeyMn4cFwpaoQhQOeaHnak/XQVWj1h2Al5ntPfte1hmcy8xSZdTmxjDISaeHt9sQOsQw xFhzJgeczxIMzFT+kCuRh5aBFGScrWxHnNYBEQA1g9oGsFYIfY0aJUn5va1onQQNyULX xadBvRzEPcinUd2xsijq3SNdwKCCOxQblrw52uTXgq7FoJEjH/L6i8m1Dfnr9kGkxueW lIIw== X-Gm-Message-State: ALyK8tLBhJfr+dQ/gW/PHm7XhUb0JqFlBvgS9FaGhIbVhel758Y6GtljavRJpT0IJ9s/6qSm X-Received: by 10.66.118.106 with SMTP id kl10mr1148934pab.78.1464822954179; Wed, 01 Jun 2016 16:15:54 -0700 (PDT) Received: from localhost.localdomain (pat_11.qualcomm.com. [192.35.156.11]) by smtp.gmail.com with ESMTPSA id r64sm20967395pfi.54.2016.06.01.16.15.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Jun 2016 16:15:53 -0700 (PDT) From: Stephen Boyd To: Michael Turquette , Stephen Boyd Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Javier Martinez Canillas Subject: [PATCH 17/34] clk: maxgen: Migrate to clk_hw based OF and registration APIs Date: Wed, 1 Jun 2016 16:15:16 -0700 Message-Id: <20160601231533.9354-18-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0-rc1 In-Reply-To: <20160601231533.9354-1-stephen.boyd@linaro.org> References: <20160601231533.9354-1-stephen.boyd@linaro.org> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that we have clk_hw based provider APIs to register clks, we can get rid of struct clk pointers while registering clks in these drivers, allowing us to move closer to a clear split of consumer and provider clk APIs. Cc: Javier Martinez Canillas Signed-off-by: Stephen Boyd --- See commit 58657d189a2f and it's children for details on this new registration API. drivers/clk/clk-max-gen.c | 64 +++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/drivers/clk/clk-max-gen.c b/drivers/clk/clk-max-gen.c index 35af9cb6da4f..4bb53fcf8639 100644 --- a/drivers/clk/clk-max-gen.c +++ b/drivers/clk/clk-max-gen.c @@ -40,6 +40,11 @@ struct max_gen_clk { struct clk_hw hw; }; +struct max_gen_data { + size_t num; + struct max_gen_clk clks[]; +}; + static struct max_gen_clk *to_max_gen_clk(struct clk_hw *hw) { return container_of(hw, struct max_gen_clk, hw); @@ -89,43 +94,48 @@ struct clk_ops max_gen_clk_ops = { }; EXPORT_SYMBOL_GPL(max_gen_clk_ops); -static struct clk *max_gen_clk_register(struct device *dev, - struct max_gen_clk *max_gen) +static int max_gen_clk_register(struct device *dev, struct max_gen_clk *max_gen) { - struct clk *clk; struct clk_hw *hw = &max_gen->hw; int ret; - clk = devm_clk_register(dev, hw); - if (IS_ERR(clk)) - return clk; + ret = devm_clk_hw_register(dev, hw); + if (ret) + return ret; + + return clk_hw_register_clkdev(hw, hw->init->name, NULL); +} - ret = clk_register_clkdev(clk, hw->init->name, NULL); +static struct clk_hw * +of_clk_max_gen_get(struct of_phandle_args *clkspec, void *data) +{ + struct max_gen_data *max_gen_data = data; + unsigned int idx = clkspec->args[0]; - if (ret) - return ERR_PTR(ret); + if (idx >= max_gen_data->num) { + pr_err("%s: invalid index %u\n", __func__, idx); + return ERR_PTR(-EINVAL); + } - return clk; + return &max_gen_data->clks[idx].hw; } int max_gen_clk_probe(struct platform_device *pdev, struct regmap *regmap, u32 reg, struct clk_init_data *clks_init, int num_init) { int i, ret; + struct max_gen_data *max_gen_data; struct max_gen_clk *max_gen_clks; - struct clk **clocks; struct device *dev = pdev->dev.parent; const char *clk_name; struct clk_init_data *init; - clocks = devm_kzalloc(dev, sizeof(struct clk *) * num_init, GFP_KERNEL); - if (!clocks) + max_gen_data = devm_kzalloc(dev, sizeof(*max_gen_data) + + sizeof(*max_gen_data->clks) * num_init, GFP_KERNEL); + if (!max_gen_data) return -ENOMEM; - max_gen_clks = devm_kzalloc(dev, sizeof(struct max_gen_clk) - * num_init, GFP_KERNEL); - if (!max_gen_clks) - return -ENOMEM; + max_gen_clks = max_gen_data->clks; for (i = 0; i < num_init; i++) { max_gen_clks[i].regmap = regmap; @@ -149,29 +159,17 @@ int max_gen_clk_probe(struct platform_device *pdev, struct regmap *regmap, max_gen_clks[i].hw.init = init; - clocks[i] = max_gen_clk_register(dev, &max_gen_clks[i]); - if (IS_ERR(clocks[i])) { - ret = PTR_ERR(clocks[i]); + ret = max_gen_clk_register(dev, &max_gen_clks[i]); + if (ret) { dev_err(dev, "failed to register %s\n", max_gen_clks[i].hw.init->name); return ret; } } - platform_set_drvdata(pdev, clocks); - if (dev->of_node) { - struct clk_onecell_data *of_data; - - of_data = devm_kzalloc(dev, sizeof(*of_data), GFP_KERNEL); - if (!of_data) - return -ENOMEM; - - of_data->clks = clocks; - of_data->clk_num = num_init; - ret = of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, - of_data); - + ret = of_clk_add_hw_provider(dev->of_node, of_clk_max_gen_get, + max_gen_clks); if (ret) { dev_err(dev, "failed to register OF clock provider\n"); return ret;