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

Commit b138b028 authored by Tero Kristo's avatar Tero Kristo
Browse files

clk: ti: move generic OMAP DPLL implementation under drivers/clk 



With the legacy clock data now gone, we can start moving OMAP clock
type implementations under clock driver. Start this with moving the
generic OMAP DPLL clock type under TI clock driver.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
parent f3b19aa5

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o timer.o pm.o \ 
hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \

					  omap_hwmod_common_data.o

clock-common				= clock.o clock_common_data.o \

					  clkt_dpll.o clkt_clksel.o

					  clkt_clksel.o

secure-common				= omap-smc.o omap-secure.o



obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)

drivers/clk/ti/Makefile

+2 −1
Original line number Diff line number Diff line 
obj-y					+= clk.o autoidle.o clockdomain.o

clk-common				= dpll.o composite.o divider.o gate.o \

					  fixed-factor.o mux.o apll.o

					  fixed-factor.o mux.o apll.o \

					  clkt_dpll.o

obj-$(CONFIG_SOC_AM33XX)		+= $(clk-common) clk-33xx.o

obj-$(CONFIG_SOC_TI81XX)		+= $(clk-common) fapll.o clk-816x.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(clk-common) interface.o clk-2xxx.o

arch/arm/mach-omap2/clkt_dpll.c→drivers/clk/ti/clkt_dpll.c

+6 −7
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/errno.h>

#include <linux/clk-provider.h>

#include <linux/io.h>

#include <linux/clk/ti.h>



#include <asm/div64.h>
@@ -211,7 +212,7 @@ u8 omap2_init_dpll_parent(struct clk_hw *hw) 
	if (!dd)

		return -EINVAL;



	v = omap2_clk_readl(clk, dd->control_reg);

	v = ti_clk_ll_ops->clk_readl(dd->control_reg);

	v &= dd->enable_mask;

	v >>= __ffs(dd->enable_mask);
@@ -247,14 +248,14 @@ unsigned long omap2_get_dpll_rate(struct clk_hw_omap *clk) 
		return 0;



	/* Return bypass rate if DPLL is bypassed */

	v = omap2_clk_readl(clk, dd->control_reg);

	v = ti_clk_ll_ops->clk_readl(dd->control_reg);

	v &= dd->enable_mask;

	v >>= __ffs(dd->enable_mask);



	if (_omap2_dpll_is_in_bypass(v))

		return __clk_get_rate(dd->clk_bypass);



	v = omap2_clk_readl(clk, dd->mult_div1_reg);

	v = ti_clk_ll_ops->clk_readl(dd->mult_div1_reg);

	dpll_mult = v & dd->mult_mask;

	dpll_mult >>= __ffs(dd->mult_mask);

	dpll_div = v & dd->div1_mask;
@@ -310,7 +311,6 @@ long omap2_dpll_round_rate(struct clk_hw *hw, unsigned long target_rate, 
	dd->last_rounded_rate = 0;



	for (n = dd->min_divider; n <= dd->max_divider; n++) {



		/* Is the (input clk, divider) pair valid for the DPLL? */

		r = _dpll_test_fint(clk, n);

		if (r == DPLL_FINT_UNDERFLOW)
@@ -367,4 +367,3 @@ long omap2_dpll_round_rate(struct clk_hw *hw, unsigned long target_rate, 


	return dd->last_rounded_rate;

}

drivers/clk/ti/clock.h

+2 −0
Original line number Diff line number Diff line
@@ -169,4 +169,6 @@ void ti_clk_patch_legacy_clks(struct ti_clk **patch); 
struct clk *ti_clk_register_clk(struct ti_clk *setup);

int ti_clk_register_legacy_clks(struct ti_clk_alias *clks);



u8 omap2_init_dpll_parent(struct clk_hw *hw);



#endif

include/linux/clk/ti.h

+0 −1
Original line number Diff line number Diff line
@@ -286,7 +286,6 @@ long omap4_dpll_regm4xen_determine_rate(struct clk_hw *hw, 
					unsigned long max_rate,

					unsigned long *best_parent_rate,

					struct clk_hw **best_parent_clk);

u8 omap2_init_dpll_parent(struct clk_hw *hw);

unsigned long omap3_dpll_recalc(struct clk_hw *hw, unsigned long parent_rate);

long omap2_dpll_round_rate(struct clk_hw *hw, unsigned long target_rate,

			   unsigned long *parent_rate);