Commit d680c76e authored by Francesco VIRLINZI's avatar Francesco VIRLINZI Committed by Paul Mundt
Browse files

sh: clkfwk: add clk_set_parent/clk_get_parent 



This patch adds the clk_set_parent/clk_get_parent routines to the sh
clock framework.

Signed-off-by: default avatarFrancesco Virlinzi <francesco.virlinzi@st.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 47a72688

arch/sh/include/asm/clock.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ struct clk_ops { 
	void (*disable)(struct clk *clk);

	void (*recalc)(struct clk *clk);

	int (*set_rate)(struct clk *clk, unsigned long rate, int algo_id);

	int (*set_parent)(struct clk *clk, struct clk *parent);

	long (*round_rate)(struct clk *clk, unsigned long rate);

};

arch/sh/kernel/cpu/clock.c

+29 −0
Original line number Diff line number Diff line
@@ -239,6 +239,35 @@ void clk_recalc_rate(struct clk *clk) 
}

EXPORT_SYMBOL_GPL(clk_recalc_rate);



int clk_set_parent(struct clk *clk, struct clk *parent)

{

	int ret = -EINVAL;

	struct clk *old;



	if (!parent || !clk)

		return ret;



	old = clk->parent;

	if (likely(clk->ops && clk->ops->set_parent)) {

		unsigned long flags;

		spin_lock_irqsave(&clock_lock, flags);

		ret = clk->ops->set_parent(clk, parent);

		spin_unlock_irqrestore(&clock_lock, flags);

		clk->parent = (ret ? old : parent);

	}



	if (unlikely(clk->flags & CLK_RATE_PROPAGATES))

		propagate_rate(clk);

	return ret;

}

EXPORT_SYMBOL_GPL(clk_set_parent);



struct clk *clk_get_parent(struct clk *clk)

{

	return clk->parent;

}

EXPORT_SYMBOL_GPL(clk_get_parent);



long clk_round_rate(struct clk *clk, unsigned long rate)

{

	if (likely(clk->ops && clk->ops->round_rate)) {