[PATCH 1/1] ARM: OMAP4: PM: Remove the checks preventing OMAP4 clockdomain validation

[Tony Lindgren]

* Abhijit Pagare <abhijitpagare at ti.com> [091221 02:34]:
> The clockdomain related code beng in place it is now not necessary to have
> some of the clock code commented out. This would help the validation of the
> clockdomain functions using the clock level interfaces.

Why are tagging clock related  patches as "PM" in the subject?

All the clock related patches should be done directly against
the mainline kernel.

If there is some dependency to the pm branch, that should be
fixed and removed ASAP.

Regards,

Tony



 
> Signed-off-by: Abhijit Pagare <abhijitpagare at ti.com>
> Cc: Paul Walmsley <paul at pwsan.com>
> Cc: Benoit Cousson <b-cousson at ti.com>
> Cc: Rajendra Nayak <rnayak at ti.com>
> ---
>  arch/arm/mach-omap2/clock.c |    8 --------
>  1 files changed, 0 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
> index 759c72a..a6d570a 100644
> --- a/arch/arm/mach-omap2/clock.c
> +++ b/arch/arm/mach-omap2/clock.c
> @@ -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
> @@ -476,10 +474,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
>  
>  	}
>  }
> @@ -489,10 +485,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);
> @@ -511,10 +505,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;
>  }
> -- 
> 1.5.4.7
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html