From patchwork Wed Jun 1 23:15:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 69106 Delivered-To: patch@linaro.org Received: by 10.140.23.41 with SMTP id 38csp54180qgo; Wed, 1 Jun 2016 16:21:06 -0700 (PDT) X-Received: by 10.66.166.78 with SMTP id ze14mr1046376pab.149.1464823266777; Wed, 01 Jun 2016 16:21:06 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g132si34365446pfc.38.2016.06.01.16.21.06; Wed, 01 Jun 2016 16:21:06 -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 S1752232AbcFAXVD (ORCPT + 30 others); Wed, 1 Jun 2016 19:21:03 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:35785 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752030AbcFAXP6 (ORCPT ); Wed, 1 Jun 2016 19:15:58 -0400 Received: by mail-pf0-f172.google.com with SMTP id g64so23333291pfb.2 for ; Wed, 01 Jun 2016 16:15:58 -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=7nPg68qzW3uSLEFAofT3ZjCkP/hArerhQO3lg5iebXU=; b=GYWfgP0dOAzp/giV6hs1ZpUDVSXw8J5lBmgvAA4SpHHDucE0VpCJEC8gZ7UST0LGYi q6MocOBE2vZcE6oMWWPs4WlKs0GtEyEBSicfJuSfp9XWisH0FantgvTJmlft3j7CBIjg wCxKoUMOeyIiBBmw22BR883giILyFYIbBYUs4= 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=7nPg68qzW3uSLEFAofT3ZjCkP/hArerhQO3lg5iebXU=; b=mzx5e3TShnB/NjGxzwjmfdDW0lvooJeSASb4OapOULrMrAu2c6aBak7wFibOBQqfjv rb7fPSXp0jT7Z7JR6cCoOgoY2/VQ4Uab5CVG2S+OgLcylhfTPnon+7PZTpQKPnhlzXta bbg5hJyPeyizrKXg9xmGpVIm/XpaIcV3NDel2BIMfcuZRvR5Q1r/jNfvq4UNYrC1eGTJ 1EAmS5t0+tx02l00PlgFjyP0eBjbDalxldQJPdxUU6tqpULG5/POFvraQFqds6+P5xEW z+FqWtGiWbRnLolJGb0j7vUbJwoVbk8RJh1QE6xE70DPgYWN89UuGaw0awc1QDyGYYGk vWDg== X-Gm-Message-State: ALyK8tJ4jq75qfABs0AwenhBIMhvzu3e34O12b6gw+41LQIz/q7cTpiSmmwtfVEGv+m21HHO X-Received: by 10.98.58.84 with SMTP id h81mr13656593pfa.93.1464822958002; 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.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Jun 2016 16:15:57 -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, Daniel Tang Subject: [PATCH 21/34] clk: nspire: Migrate to clk_hw based OF and registration APIs Date: Wed, 1 Jun 2016 16:15:20 -0700 Message-Id: <20160601231533.9354-22-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: Daniel Tang Signed-off-by: Stephen Boyd --- See commit 58657d189a2f and it's children for details on this new registration API. drivers/clk/clk-nspire.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/drivers/clk/clk-nspire.c b/drivers/clk/clk-nspire.c index 64f196a90816..f861011d5d21 100644 --- a/drivers/clk/clk-nspire.c +++ b/drivers/clk/clk-nspire.c @@ -69,7 +69,7 @@ static void __init nspire_ahbdiv_setup(struct device_node *node, { u32 val; void __iomem *io; - struct clk *clk; + struct clk_hw *hw; const char *clk_name = node->name; const char *parent_name; struct nspire_clk_info info; @@ -85,10 +85,10 @@ static void __init nspire_ahbdiv_setup(struct device_node *node, of_property_read_string(node, "clock-output-names", &clk_name); parent_name = of_clk_get_parent_name(node, 0); - clk = clk_register_fixed_factor(NULL, clk_name, parent_name, 0, - 1, info.base_ahb_ratio); - if (!IS_ERR(clk)) - of_clk_add_provider(node, of_clk_src_simple_get, clk); + hw = clk_hw_register_fixed_factor(NULL, clk_name, parent_name, 0, + 1, info.base_ahb_ratio); + if (!IS_ERR(hw)) + of_clk_add_hw_provider(node, of_clk_hw_simple_get, hw); } static void __init nspire_ahbdiv_setup_cx(struct device_node *node) @@ -111,7 +111,7 @@ static void __init nspire_clk_setup(struct device_node *node, { u32 val; void __iomem *io; - struct clk *clk; + struct clk_hw *hw; const char *clk_name = node->name; struct nspire_clk_info info; @@ -125,9 +125,10 @@ static void __init nspire_clk_setup(struct device_node *node, of_property_read_string(node, "clock-output-names", &clk_name); - clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, info.base_clock); - if (!IS_ERR(clk)) - of_clk_add_provider(node, of_clk_src_simple_get, clk); + hw = clk_hw_register_fixed_rate(NULL, clk_name, NULL, 0, + info.base_clock); + if (!IS_ERR(hw)) + of_clk_add_hw_provider(node, of_clk_hw_simple_get, hw); else return;