Commit bf985401 authored by Abhijit Pagare's avatar Abhijit Pagare Committed by Paul Walmsley
Browse files

ARM: OMAP4 clock framework: Remove the checks preventing OMAP4 clockdomain validation 



The clockdomain related code being in place, it is not necessary to have
some part of the clock code commented out. This would help the validation of
the clockdomain functions using the clock level interfaces.

Signed-off-by: default avatarAbhijit Pagare <abhijitpagare@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 0dfc242f

arch/arm/mach-omap2/clock.c

+0 −8
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ static int _dpll_test_fint(struct clk *clk, u8 n) 
 * clockdomain pointer, and save it into the struct clk.  Intended to be

 * called during clk_register().  No return value.

 */

#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */

void omap2_init_clk_clkdm(struct clk *clk)

{

	struct clockdomain *clkdm;
@@ -199,7 +198,6 @@ void omap2_init_clk_clkdm(struct clk *clk) 
			 "clkdm %s\n", clk->name, clk->clkdm_name);

	}

}

#endif



/**

 * omap2_init_clksel_parent - set a clksel clk's parent field from the hardware
@@ -465,10 +463,8 @@ void omap2_clk_disable(struct clk *clk) 
		_omap2_clk_disable(clk);

		if (clk->parent)

			omap2_clk_disable(clk->parent);

#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */

		if (clk->clkdm)

			omap2_clkdm_clk_disable(clk->clkdm, clk);

#endif



	}

}
@@ -478,10 +474,8 @@ int omap2_clk_enable(struct clk *clk) 
	int ret = 0;



	if (clk->usecount++ == 0) {

#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */

		if (clk->clkdm)

			omap2_clkdm_clk_enable(clk->clkdm, clk);

#endif



		if (clk->parent) {

			ret = omap2_clk_enable(clk->parent);
@@ -500,10 +494,8 @@ int omap2_clk_enable(struct clk *clk) 
	return ret;



err:

#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */

	if (clk->clkdm)

		omap2_clkdm_clk_disable(clk->clkdm, clk);

#endif

	clk->usecount--;

	return ret;

}

arch/arm/mach-omap2/clock44xx_data.c

+0 −2
Original line number Diff line number Diff line
@@ -2749,9 +2749,7 @@ int __init omap2_clk_init(void) 
		if (c->cpu & cpu_clkflg) {

			clkdev_add(&c->lk);

			clk_register(c->lk.clk);

			/* TODO

			omap2_init_clk_clkdm(c->lk.clk);

			*/

		}



	recalculate_root_clocks();

CRA Git | Maintained and supported by SUSTech CRA and CCSE