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

Commit 38e4aa00 authored by Emilio López's avatar Emilio López Committed by Mike Turquette
Browse files

clk: sunxi: Unify oscillator clock 



This commit uses the new fixed-rate support on the composite clock to
unify osc24M_fixed and osc24M clocks, so it matches the actual hardware.

Signed-off-by: default avatarEmilio López <emilio@elopez.com.ar>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
[mturquette@linaro.org: replace clk_register_gatable_osc with a call to
clk_register_composite]
parent f363e215

drivers/clk/sunxi/clk-sunxi.c

+26 −7
Original line number Original line Diff line number Diff line
@@ -33,16 +33,36 @@ static DEFINE_SPINLOCK(clk_lock); 
static void __init sunxi_osc_clk_setup(struct device_node *node)

static void __init sunxi_osc_clk_setup(struct device_node *node)

{

{

	struct clk *clk;

	struct clk *clk;

	struct clk_fixed_rate *fixed;

	struct clk_gate *gate;

	const char *clk_name = node->name;

	const char *clk_name = node->name;

	const char *parent;

	u32 rate;

	void *reg;





	reg = of_iomap(node, 0);

	/* allocate fixed-rate and gate clock structs */

	fixed = kzalloc(sizeof(struct clk_fixed_rate), GFP_KERNEL);

	if (!fixed)

		return;

	gate = kzalloc(sizeof(struct clk_gate), GFP_KERNEL);

	if (!gate) {

		kfree(fixed);

		return;

	}





	parent = of_clk_get_parent_name(node, 0);

	if (of_property_read_u32(node, "clock-frequency", &rate))

		return;



	/* set up gate and fixed rate properties */

	gate->reg = of_iomap(node, 0);

	gate->bit_idx = SUNXI_OSC24M_GATE;

	gate->lock = &clk_lock;

	fixed->fixed_rate = rate;





	clk = clk_register_gate(NULL, clk_name, parent, 0, reg,

	clk = clk_register_composite(NULL, clk_name,

				SUNXI_OSC24M_GATE, 0, &clk_lock);

			NULL, 0,

			NULL, NULL,

			&fixed->hw, &clk_fixed_rate_ops,

			&gate->hw, &clk_gate_ops,

			CLK_IS_ROOT);





	if (clk) {

	if (clk) {

		of_clk_add_provider(node, of_clk_src_simple_get, clk);

		of_clk_add_provider(node, of_clk_src_simple_get, clk);
@@ -380,7 +400,6 @@ static void __init sunxi_gates_clk_setup(struct device_node *node, 




/* Matches for of_clk_init */

/* Matches for of_clk_init */

static const __initconst struct of_device_id clk_match[] = {

static const __initconst struct of_device_id clk_match[] = {

	{.compatible = "fixed-clock", .data = of_fixed_clk_setup,},

	{.compatible = "allwinner,sun4i-osc-clk", .data = sunxi_osc_clk_setup,},

	{.compatible = "allwinner,sun4i-osc-clk", .data = sunxi_osc_clk_setup,},

	{}

	{}

};

};