Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 416886ad authored by Stephen Boyd's avatar Stephen Boyd Committed by Stephen Boyd
Browse files

clk: nspire: Migrate to clk_hw based OF and registration APIs 



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 <dt.tangr@gmail.com>
Signed-off-by: default avatarStephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 5a962d2e

drivers/clk/clk-nspire.c

+10 −9
Original line number Diff line number Diff line
@@ -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,

	hw = clk_hw_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);

	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;