diff options
| author | Rajendra Nayak <rnayak@ti.com> | 2012-04-27 13:02:53 +0200 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-11-13 03:18:50 +0100 |
| commit | c4a1ea2c6229b18c10c5a49a0f8f4ad2c3e2355d (patch) | |
| tree | 659ce13bb600d8b7feb7fd42176537cfdbd63b7a /arch/arm | |
| parent | ARM: OMAP: clock: Switch to COMMON clk (diff) | |
| download | linux-c4a1ea2c6229b18c10c5a49a0f8f4ad2c3e2355d.tar.xz linux-c4a1ea2c6229b18c10c5a49a0f8f4ad2c3e2355d.zip | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index c3d3e62a5ac2..68616b2b5b96 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -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; |