From patchwork Wed Jun 1 23:15:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 69104 Delivered-To: patch@linaro.org Received: by 10.140.23.41 with SMTP id 38csp54127qgo; Wed, 1 Jun 2016 16:20:54 -0700 (PDT) X-Received: by 10.98.103.220 with SMTP id t89mr13301177pfj.125.1464823254729; Wed, 01 Jun 2016 16:20:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id oz4si12443217pac.91.2016.06.01.16.20.54; Wed, 01 Jun 2016 16:20:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752502AbcFAXUo (ORCPT + 30 others); Wed, 1 Jun 2016 19:20:44 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:35681 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752084AbcFAXP7 (ORCPT ); Wed, 1 Jun 2016 19:15:59 -0400 Received: by mail-pa0-f49.google.com with SMTP id xk1so516984pac.2 for ; Wed, 01 Jun 2016 16:15:59 -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=pCoJzX4x4r+whMXz/c8cAKgsquxyKvw57CVbOnWFL8g=; b=jyygCiIqKkOiKMsUXG8tMh/0F6umQT81UxBwih9sd2o+iM6zYXyRAfAIXWBlV3HW8k /uP4xVhgnNkgtKRxXbNiThc4CxMcyBBKrBh7kOLeCTrKYTVVlqNfK11Ah2PAaChtwkXl HThTN+WEE++U6dtDHdGRTrHYacB8rF5X7inJE= 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=pCoJzX4x4r+whMXz/c8cAKgsquxyKvw57CVbOnWFL8g=; b=IDes0bYf6kxcO+2Xisl21vH+FraQcmHhks8im93Qw3vltQlY1jPYqThaic2eP3kUnJ dHAMDerRS9nZ7xb/gQZY0sVovbwGrXsc9H++WWO9et29t/eznRZD3YCXqAMAUJfS57j+ nzGl1S2RWHVTA1n4huoaXSLAq4jx8AuI9ud7rMTjA/eTb5WsT+T4m4gHYNbYbRxkInA6 DqdkOj70ScSr6vsFL271B0aVTm9qefO0K2o758I2xlXhNiqZlkGq27wubJzVfn74B3vJ vz8Fhp1u1aBLZilYYJ6EWJgcv168U3loY9aUEHt8tpD6E68ZRlTFBJcaRxVagRe6VeWw UXNQ== X-Gm-Message-State: ALyK8tKuKXI4JAH7hiaw/4Kkf4NuNtETH40PBCzjEZ0h41t3nwZ6bRJ+T0lLv5CiMu4s8UUn X-Received: by 10.67.5.134 with SMTP id cm6mr804007pad.93.1464822958964; Wed, 01 Jun 2016 16:15:58 -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.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Jun 2016 16:15:58 -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, Peter Ujfalusi , Nishanth Menon Subject: [PATCH 22/34] clk: palmas: Migrate to clk_hw based OF and registration APIs Date: Wed, 1 Jun 2016 16:15:21 -0700 Message-Id: <20160601231533.9354-23-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Peter Ujfalusi Cc: Nishanth Menon Signed-off-by: Stephen Boyd --- See commit 58657d189a2f and it's children for details on this new registration API. drivers/clk/clk-palmas.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) -- 2.7.4 diff --git a/drivers/clk/clk-palmas.c b/drivers/clk/clk-palmas.c index 8328863cb0e0..31f590cea493 100644 --- a/drivers/clk/clk-palmas.c +++ b/drivers/clk/clk-palmas.c @@ -41,7 +41,6 @@ struct palmas_clk32k_desc { struct palmas_clock_info { struct device *dev; - struct clk *clk; struct clk_hw hw; struct palmas *palmas; const struct palmas_clk32k_desc *clk_desc; @@ -218,7 +217,7 @@ static int palmas_clks_init_configure(struct palmas_clock_info *cinfo) } if (cinfo->ext_control_pin) { - ret = clk_prepare(cinfo->clk); + ret = clk_prepare(cinfo->hw.clk); if (ret < 0) { dev_err(cinfo->dev, "Clock prep failed, %d\n", ret); return ret; @@ -242,7 +241,6 @@ static int palmas_clks_probe(struct platform_device *pdev) struct device_node *node = pdev->dev.of_node; const struct palmas_clks_of_match_data *match_data; struct palmas_clock_info *cinfo; - struct clk *clk; int ret; match_data = of_device_get_match_data(&pdev->dev); @@ -261,22 +259,20 @@ static int palmas_clks_probe(struct platform_device *pdev) cinfo->clk_desc = &match_data->desc; cinfo->hw.init = &match_data->init; - clk = devm_clk_register(&pdev->dev, &cinfo->hw); - if (IS_ERR(clk)) { - ret = PTR_ERR(clk); + ret = devm_clk_hw_register(&pdev->dev, &cinfo->hw); + if (ret) { dev_err(&pdev->dev, "Fail to register clock %s, %d\n", match_data->desc.clk_name, ret); return ret; } - cinfo->clk = clk; ret = palmas_clks_init_configure(cinfo); if (ret < 0) { dev_err(&pdev->dev, "Clock config failed, %d\n", ret); return ret; } - ret = of_clk_add_provider(node, of_clk_src_simple_get, cinfo->clk); + ret = of_clk_add_hw_provider(node, of_clk_hw_simple_get, &cinfo->hw); if (ret < 0) dev_err(&pdev->dev, "Fail to add clock driver, %d\n", ret); return ret;