diff options
author | Tero Kristo <t-kristo@ti.com> | 2014-07-02 04:47:37 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2014-07-15 16:08:42 -0400 |
commit | 74b9b62b6046265437dd20562c067ba167bd94a4 (patch) | |
tree | 7f20312e276eaa75a43df226784066b65026c220 /arch/arm/mach-omap2/dpll44xx.c | |
parent | 0b6fbd68b2c45cfa64fa8478643f0345f9a2c99d (diff) |
ARM: OMAP4+: dpll: remove cpu_is_omap44xx checks
These are unnecessary, as the clock code is only used on OMAP4+ platforms
through clock registrations. This also allows to eventually migrate the
clock type implementation under clock driver.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Reviewed-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/dpll44xx.c')
-rw-r--r-- | arch/arm/mach-omap2/dpll44xx.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/dpll44xx.c b/arch/arm/mach-omap2/dpll44xx.c index 52f9438b92f2..b0718911f380 100644 --- a/arch/arm/mach-omap2/dpll44xx.c +++ b/arch/arm/mach-omap2/dpll44xx.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
16 | #include <linux/bitops.h> | 16 | #include <linux/bitops.h> |
17 | 17 | ||
18 | #include "soc.h" | ||
19 | #include "clock.h" | 18 | #include "clock.h" |
20 | #include "clock44xx.h" | 19 | #include "clock44xx.h" |
21 | #include "cm-regbits-44xx.h" | 20 | #include "cm-regbits-44xx.h" |
@@ -35,7 +34,7 @@ int omap4_dpllmx_gatectrl_read(struct clk_hw_omap *clk) | |||
35 | u32 v; | 34 | u32 v; |
36 | u32 mask; | 35 | u32 mask; |
37 | 36 | ||
38 | if (!clk || !clk->clksel_reg || !cpu_is_omap44xx()) | 37 | if (!clk || !clk->clksel_reg) |
39 | return -EINVAL; | 38 | return -EINVAL; |
40 | 39 | ||
41 | mask = clk->flags & CLOCK_CLKOUTX2 ? | 40 | mask = clk->flags & CLOCK_CLKOUTX2 ? |
@@ -54,7 +53,7 @@ void omap4_dpllmx_allow_gatectrl(struct clk_hw_omap *clk) | |||
54 | u32 v; | 53 | u32 v; |
55 | u32 mask; | 54 | u32 mask; |
56 | 55 | ||
57 | if (!clk || !clk->clksel_reg || !cpu_is_omap44xx()) | 56 | if (!clk || !clk->clksel_reg) |
58 | return; | 57 | return; |
59 | 58 | ||
60 | mask = clk->flags & CLOCK_CLKOUTX2 ? | 59 | mask = clk->flags & CLOCK_CLKOUTX2 ? |
@@ -72,7 +71,7 @@ void omap4_dpllmx_deny_gatectrl(struct clk_hw_omap *clk) | |||
72 | u32 v; | 71 | u32 v; |
73 | u32 mask; | 72 | u32 mask; |
74 | 73 | ||
75 | if (!clk || !clk->clksel_reg || !cpu_is_omap44xx()) | 74 | if (!clk || !clk->clksel_reg) |
76 | return; | 75 | return; |
77 | 76 | ||
78 | mask = clk->flags & CLOCK_CLKOUTX2 ? | 77 | mask = clk->flags & CLOCK_CLKOUTX2 ? |