brain-hackers_pepepper-mirror
/
linux-brain
mirror of https://github.com/brain-hackers/linux-brain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: OMAP: hwmod: Cleanup !CONFIG_COMMON_CLK parts 

Clean all #ifdef's added as part of fixing the clkdm
accesses from hwmod.

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Mike Turquette <mturquette@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
This commit is contained in:
Rajendra Nayak 2012-04-27 16:32:53 +05:30 committed by Paul Walmsley
parent f7f73aab3d
commit c4a1ea2c62
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/mach-omap2/omap_hwmod.c
View File

@ -130,11 +130,7 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/io.h>
#ifdef CONFIG_COMMON_CLK
#include <linux/clk-provider.h>
#else
#include <linux/clk.h>
#endif
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/list.h>
@ -620,17 +616,13 @@ static int _disable_wakeup(struct omap_hwmod *oh, u32 *v)
static struct clockdomain *_get_clkdm(struct omap_hwmod *oh)
{
struct clk_hw_omap *clk;
if (oh->clkdm) {
return oh->clkdm;
} else if (oh->_clk) {
#ifdef CONFIG_COMMON_CLK
struct clk_hw_omap *clk;
clk = to_clk_hw_omap(__clk_get_hw(oh->_clk));
return clk->clkdm;
#else
return oh->_clk->clkdm;
#endif
}
return NULL;
}
@ -3588,9 +3580,7 @@ struct powerdomain *omap_hwmod_get_pwrdm(struct omap_hwmod *oh)
struct clk *c;
struct omap_hwmod_ocp_if *oi;
struct clockdomain *clkdm;
#ifdef CONFIG_COMMON_CLK
struct clk_hw_omap *clk;
#endif
if (!oh)
return NULL;
@ -3607,12 +3597,8 @@ struct powerdomain *omap_hwmod_get_pwrdm(struct omap_hwmod *oh)
c = oi->_clk;
}
#ifdef CONFIG_COMMON_CLK
clk = to_clk_hw_omap(__clk_get_hw(c));
clkdm = clk->clkdm;
#else
clkdm = c->clkdm;
#endif
if (!clkdm)
return NULL;