Commit 2e1a294c authored by Tero Kristo's avatar Tero Kristo
Browse files

clk: ti: move omap2_init_clk_clkdm under TI clock driver 



This is not needed outside the driver, so move it inside it and remove
the prototype from the public header also.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
parent b6f27b2d

arch/arm/mach-omap2/clock.c

+0 −32
Original line number Diff line number Diff line
@@ -79,38 +79,6 @@ int __init omap2_clk_setup_ll_ops(void) 
 * OMAP2+ specific clock functions

 */



/* Public functions */



/**

 * omap2_init_clk_clkdm - look up a clockdomain name, store pointer in clk

 * @clk: OMAP clock struct ptr to use

 *

 * Convert a clockdomain name stored in a struct clk 'clk' into a

 * clockdomain pointer, and save it into the struct clk.  Intended to be

 * called during clk_register().  No return value.

 */

void omap2_init_clk_clkdm(struct clk_hw *hw)

{

	struct clk_hw_omap *clk = to_clk_hw_omap(hw);

	struct clockdomain *clkdm;

	const char *clk_name;



	if (!clk->clkdm_name)

		return;



	clk_name = __clk_get_name(hw->clk);



	clkdm = clkdm_lookup(clk->clkdm_name);

	if (clkdm) {

		pr_debug("clock: associated clk %s to clkdm %s\n",

			 clk_name, clk->clkdm_name);

		clk->clkdm = clkdm;

	} else {

		pr_debug("clock: could not associate clk %s to clkdm %s\n",

			 clk_name, clk->clkdm_name);

	}

}



/**

 * ti_clk_init_features - init clock features struct for the SoC

 *

drivers/clk/ti/clock.h

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ extern const struct clk_hw_omap_ops clkhwops_am35xx_ipss_wait; 
extern const struct clk_ops ti_clk_divider_ops;

extern const struct clk_ops ti_clk_mux_ops;



void omap2_init_clk_clkdm(struct clk_hw *hw);

int omap2_clkops_enable_clkdm(struct clk_hw *hw);

void omap2_clkops_disable_clkdm(struct clk_hw *hw);

drivers/clk/ti/clockdomain.c

+30 −0
Original line number Diff line number Diff line
@@ -103,6 +103,36 @@ void omap2_clkops_disable_clkdm(struct clk_hw *hw) 
	ti_clk_ll_ops->clkdm_clk_disable(clk->clkdm, hw->clk);

}



/**

 * omap2_init_clk_clkdm - look up a clockdomain name, store pointer in clk

 * @clk: OMAP clock struct ptr to use

 *

 * Convert a clockdomain name stored in a struct clk 'clk' into a

 * clockdomain pointer, and save it into the struct clk.  Intended to be

 * called during clk_register().  No return value.

 */

void omap2_init_clk_clkdm(struct clk_hw *hw)

{

	struct clk_hw_omap *clk = to_clk_hw_omap(hw);

	struct clockdomain *clkdm;

	const char *clk_name;



	if (!clk->clkdm_name)

		return;



	clk_name = __clk_get_name(hw->clk);



	clkdm = ti_clk_ll_ops->clkdm_lookup(clk->clkdm_name);

	if (clkdm) {

		pr_debug("clock: associated clk %s to clkdm %s\n",

			 clk_name, clk->clkdm_name);

		clk->clkdm = clkdm;

	} else {

		pr_debug("clock: could not associate clk %s to clkdm %s\n",

			 clk_name, clk->clkdm_name);

	}

}



static void __init of_ti_clockdomain_setup(struct device_node *node)

{

	struct clk *clk;

include/linux/clk/ti.h

+0 −1
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ struct ti_clk_ll_ops { 


#define to_clk_hw_omap(_hw) container_of(_hw, struct clk_hw_omap, hw)



void omap2_init_clk_clkdm(struct clk_hw *clk);

int omap2_clk_disable_autoidle_all(void);

int omap2_clk_enable_autoidle_all(void);

int omap2_clk_allow_idle(struct clk *clk);