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

Commit 5a962d2e authored by Stephen Boyd's avatar Stephen Boyd Committed by Stephen Boyd
Browse files

clk: moxart: 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: Jonas Jensen <jonas.jensen@gmail.com>
Signed-off-by: default avatarStephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 6b212f5a

drivers/clk/clk-moxart.c

+12 −10
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
static void __init moxart_of_pll_clk_init(struct device_node *node)

{

	static void __iomem *base;

	struct clk *clk, *ref_clk;

	struct clk_hw *hw;

	struct clk *ref_clk;

	unsigned int mul;

	const char *name = node->name;

	const char *parent_name;
@@ -42,14 +43,14 @@ static void __init moxart_of_pll_clk_init(struct device_node *node) 
		return;

	}



	clk = clk_register_fixed_factor(NULL, name, parent_name, 0, mul, 1);

	if (IS_ERR(clk)) {

	hw = clk_hw_register_fixed_factor(NULL, name, parent_name, 0, mul, 1);

	if (IS_ERR(hw)) {

		pr_err("%s: failed to register clock\n", node->full_name);

		return;

	}



	clk_register_clkdev(clk, NULL, name);

	of_clk_add_provider(node, of_clk_src_simple_get, clk);

	clk_hw_register_clkdev(hw, NULL, name);

	of_clk_add_hw_provider(node, of_clk_hw_simple_get, hw);

}

CLK_OF_DECLARE(moxart_pll_clock, "moxa,moxart-pll-clock",

	       moxart_of_pll_clk_init);
@@ -57,7 +58,8 @@ CLK_OF_DECLARE(moxart_pll_clock, "moxa,moxart-pll-clock", 
static void __init moxart_of_apb_clk_init(struct device_node *node)

{

	static void __iomem *base;

	struct clk *clk, *pll_clk;

	struct clk_hw *hw;

	struct clk *pll_clk;

	unsigned int div, val;

	unsigned int div_idx[] = { 2, 3, 4, 6, 8};

	const char *name = node->name;
@@ -85,14 +87,14 @@ static void __init moxart_of_apb_clk_init(struct device_node *node) 
		return;

	}



	clk = clk_register_fixed_factor(NULL, name, parent_name, 0, 1, div);

	if (IS_ERR(clk)) {

	hw = clk_hw_register_fixed_factor(NULL, name, parent_name, 0, 1, div);

	if (IS_ERR(hw)) {

		pr_err("%s: failed to register clock\n", node->full_name);

		return;

	}



	clk_register_clkdev(clk, NULL, name);

	of_clk_add_provider(node, of_clk_src_simple_get, clk);

	clk_hw_register_clkdev(hw, NULL, name);

	of_clk_add_hw_provider(node, of_clk_hw_simple_get, hw);

}

CLK_OF_DECLARE(moxart_apb_clock, "moxa,moxart-apb-clock",

	       moxart_of_apb_clk_init);