diff options
| author | Mike Turquette <mturquette@ti.com> | 2012-11-07 21:14:47 (GMT) |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-11-13 02:18:51 (GMT) |
| commit | f9ae32a74f0242cbef76d9baa10993d707be1714 (patch) | |
| tree | 4c9e616bd4a72879405b94b039ee26ca812bed14 /arch/arm/mach-omap2/clock_common_data.c | |
| parent | f51e0f9862ccf8be71219763d51e7617b95faa10 (diff) | |
| download | linux-fsl-qoriq-f9ae32a74f0242cbef76d9baa10993d707be1714.tar.xz | |
ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts
Clean all #ifdef's added to common clock code. This code is no longer
needed due to migration to the common clock framework.
Signed-off-by: Mike Turquette <mturquette@ti.com>
[paul@pwsan.com: clean up new ifdefs added in clockdomain.c]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock_common_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock_common_data.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/arch/arm/mach-omap2/clock_common_data.c b/arch/arm/mach-omap2/clock_common_data.c index c0d02a9..ef4d21b 100644 --- a/arch/arm/mach-omap2/clock_common_data.c +++ b/arch/arm/mach-omap2/clock_common_data.c @@ -16,6 +16,7 @@ * OMAP3xxx clock definition files. */ +#include <linux/clk-private.h> #include "clock.h" /* clksel_rate data common to 24xx/343x */ @@ -115,9 +116,6 @@ const struct clksel_rate div31_1to31_rates[] = { }; /* Clocks shared between various OMAP SoCs */ -#ifdef CONFIG_COMMON_CLK - -#include <linux/clk-private.h> static struct clk_ops dummy_ck_ops = {}; @@ -126,19 +124,3 @@ struct clk dummy_ck = { .ops = &dummy_ck_ops, .flags = CLK_IS_BASIC, }; - -#else - -struct clk virt_19200000_ck = { - .name = "virt_19200000_ck", - .ops = &clkops_null, - .rate = 19200000, -}; - -struct clk virt_26000000_ck = { - .name = "virt_26000000_ck", - .ops = &clkops_null, - .rate = 26000000, -}; - -#endif |