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

Commit 91c5b6d2 authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Paul Walmsley
Browse files

ARM: OMAP4: clock: Cleanup !CONFIG_COMMON_CLK parts 



Clean all #ifdef's added to OMAP4 clock code to make it COMMON clk
ready, now that CONFIG_COMMON_CLK is enabled.

Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
Signed-off-by: default avatarMike Turquette <mturquette@ti.com>
[paul@pwsan.com: remove some ifdefs in mach-omap2/io.c]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent c4a1ea2c

arch/arm/mach-omap2/dpll44xx.c

+0 −33
Original line number Original line Diff line number Diff line
@@ -21,11 +21,7 @@ 
#include "cm-regbits-44xx.h"

#include "cm-regbits-44xx.h"





/* Supported only on OMAP4 */

/* Supported only on OMAP4 */

#ifdef CONFIG_COMMON_CLK

int omap4_dpllmx_gatectrl_read(struct clk_hw_omap *clk)

int omap4_dpllmx_gatectrl_read(struct clk_hw_omap *clk)

#else

int omap4_dpllmx_gatectrl_read(struct clk *clk)

#endif

{

{

	u32 v;

	u32 v;

	u32 mask;

	u32 mask;
@@ -44,11 +40,7 @@ int omap4_dpllmx_gatectrl_read(struct clk *clk) 
	return v;

	return v;

}

}





#ifdef CONFIG_COMMON_CLK

void omap4_dpllmx_allow_gatectrl(struct clk_hw_omap *clk)

void omap4_dpllmx_allow_gatectrl(struct clk_hw_omap *clk)

#else

void omap4_dpllmx_allow_gatectrl(struct clk *clk)

#endif

{

{

	u32 v;

	u32 v;

	u32 mask;

	u32 mask;
@@ -66,11 +58,7 @@ void omap4_dpllmx_allow_gatectrl(struct clk *clk) 
	__raw_writel(v, clk->clksel_reg);

	__raw_writel(v, clk->clksel_reg);

}

}





#ifdef CONFIG_COMMON_CLK

void omap4_dpllmx_deny_gatectrl(struct clk_hw_omap *clk)

void omap4_dpllmx_deny_gatectrl(struct clk_hw_omap *clk)

#else

void omap4_dpllmx_deny_gatectrl(struct clk *clk)

#endif

{

{

	u32 v;

	u32 v;

	u32 mask;

	u32 mask;
@@ -88,17 +76,10 @@ void omap4_dpllmx_deny_gatectrl(struct clk *clk) 
	__raw_writel(v, clk->clksel_reg);

	__raw_writel(v, clk->clksel_reg);

}

}





#ifdef CONFIG_COMMON_CLK

const struct clk_hw_omap_ops clkhwops_omap4_dpllmx = {

const struct clk_hw_omap_ops clkhwops_omap4_dpllmx = {

	.allow_idle	= omap4_dpllmx_allow_gatectrl,

	.allow_idle	= omap4_dpllmx_allow_gatectrl,

	.deny_idle      = omap4_dpllmx_deny_gatectrl,

	.deny_idle      = omap4_dpllmx_deny_gatectrl,

};

};

#else

const struct clkops clkops_omap4_dpllmx_ops = {

	.allow_idle	= omap4_dpllmx_allow_gatectrl,

	.deny_idle	= omap4_dpllmx_deny_gatectrl,

};

#endif





/**

/**

 * omap4_dpll_regm4xen_recalc - compute DPLL rate, considering REGM4XEN bit

 * omap4_dpll_regm4xen_recalc - compute DPLL rate, considering REGM4XEN bit
@@ -109,15 +90,10 @@ const struct clkops clkops_omap4_dpllmx_ops = { 
 * OMAP4 ABE DPLL.  Returns the DPLL's output rate (before M-dividers)

 * OMAP4 ABE DPLL.  Returns the DPLL's output rate (before M-dividers)

 * upon success, or 0 upon error.

 * upon success, or 0 upon error.

 */

 */

#ifdef CONFIG_COMMON_CLK

unsigned long omap4_dpll_regm4xen_recalc(struct clk_hw *hw,

unsigned long omap4_dpll_regm4xen_recalc(struct clk_hw *hw,

			unsigned long parent_rate)

			unsigned long parent_rate)

{

{

	struct clk_hw_omap *clk = to_clk_hw_omap(hw);

	struct clk_hw_omap *clk = to_clk_hw_omap(hw);

#else

unsigned long omap4_dpll_regm4xen_recalc(struct clk *clk)

{

#endif

	u32 v;

	u32 v;

	unsigned long rate;

	unsigned long rate;

	struct dpll_data *dd;

	struct dpll_data *dd;
@@ -149,16 +125,11 @@ unsigned long omap4_dpll_regm4xen_recalc(struct clk *clk) 
 * M-dividers) upon success, -EINVAL if @clk is null or not a DPLL, or

 * M-dividers) upon success, -EINVAL if @clk is null or not a DPLL, or

 * ~0 if an error occurred in omap2_dpll_round_rate().

 * ~0 if an error occurred in omap2_dpll_round_rate().

 */

 */

#ifdef CONFIG_COMMON_CLK

long omap4_dpll_regm4xen_round_rate(struct clk_hw *hw,

long omap4_dpll_regm4xen_round_rate(struct clk_hw *hw,

				    unsigned long target_rate,

				    unsigned long target_rate,

				    unsigned long *parent_rate)

				    unsigned long *parent_rate)

{

{

	struct clk_hw_omap *clk = to_clk_hw_omap(hw);

	struct clk_hw_omap *clk = to_clk_hw_omap(hw);

#else

long omap4_dpll_regm4xen_round_rate(struct clk *clk, unsigned long target_rate)

{

#endif

	u32 v;

	u32 v;

	struct dpll_data *dd;

	struct dpll_data *dd;

	long r;

	long r;
@@ -174,11 +145,7 @@ long omap4_dpll_regm4xen_round_rate(struct clk *clk, unsigned long target_rate) 
	if (v)

	if (v)

		target_rate = target_rate / OMAP4430_REGM4XEN_MULT;

		target_rate = target_rate / OMAP4430_REGM4XEN_MULT;





#ifdef CONFIG_COMMON_CLK

	r = omap2_dpll_round_rate(hw, target_rate, NULL);

	r = omap2_dpll_round_rate(hw, target_rate, NULL);

#else

	r = omap2_dpll_round_rate(clk, target_rate);

#endif

	if (r == ~0)

	if (r == ~0)

		return r;

		return r;

arch/arm/mach-omap2/io.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -407,9 +407,7 @@ void __init omap2420_init_late(void) 
	omap_mux_late_init();

	omap_mux_late_init();

	omap2_common_pm_late_init();

	omap2_common_pm_late_init();

	omap2_pm_init();

	omap2_pm_init();

#ifdef CONFIG_COMMON_CLK

	omap2_clk_enable_autoidle_all();

	omap2_clk_enable_autoidle_all();

#endif

}

}

#endif

#endif
@@ -565,9 +563,7 @@ void __init ti81xx_init_late(void) 
	omap_mux_late_init();

	omap_mux_late_init();

	omap2_common_pm_late_init();

	omap2_common_pm_late_init();

	omap3_pm_init();

	omap3_pm_init();

#ifdef CONFIG_COMMON_CLK

	omap2_clk_enable_autoidle_all();

	omap2_clk_enable_autoidle_all();

#endif

}

}

#endif

#endif
@@ -621,9 +617,7 @@ void __init omap4430_init_late(void) 
	omap_mux_late_init();

	omap_mux_late_init();

	omap2_common_pm_late_init();

	omap2_common_pm_late_init();

	omap4_pm_init();

	omap4_pm_init();

#ifdef CONFIG_COMMON_CLK

	omap2_clk_enable_autoidle_all();

	omap2_clk_enable_autoidle_all();

#endif

}

}

#endif

#endif