diff options
author | Tarun Kanti DebBarma <tarun.kanti@ti.com> | 2012-05-08 01:55:30 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-05-08 01:55:30 -0400 |
commit | f1bbbb1365fdb1abe29f31d4ac455f265f9bc2ff (patch) | |
tree | aa750ad4746dabc0920d16cc69ba65be9c55446a /arch/arm/mach-omap2 | |
parent | 96566043b19ae76d3828ce75cbf28dc6d0bcaaf1 (diff) |
ARM: OMAP2+: dmtimer: cleanup iclk usage
We do not use iclk anywhere in the dmtimer driver and so removing it.
Hence removing the timer iclk entries from OMAP4 clkdev table as well.
Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/clock44xx_data.c | 11 | ||||
-rw-r--r-- | arch/arm/mach-omap2/timer.c | 7 |
2 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index fa6ea65ad44b..2172f6603848 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c | |||
@@ -3355,17 +3355,6 @@ static struct omap_clk omap44xx_clks[] = { | |||
3355 | CLK(NULL, "auxclk5_ck", &auxclk5_ck, CK_443X), | 3355 | CLK(NULL, "auxclk5_ck", &auxclk5_ck, CK_443X), |
3356 | CLK(NULL, "auxclkreq5_ck", &auxclkreq5_ck, CK_443X), | 3356 | CLK(NULL, "auxclkreq5_ck", &auxclkreq5_ck, CK_443X), |
3357 | CLK(NULL, "gpmc_ck", &dummy_ck, CK_443X), | 3357 | CLK(NULL, "gpmc_ck", &dummy_ck, CK_443X), |
3358 | CLK(NULL, "gpt1_ick", &dummy_ck, CK_443X), | ||
3359 | CLK(NULL, "gpt2_ick", &dummy_ck, CK_443X), | ||
3360 | CLK(NULL, "gpt3_ick", &dummy_ck, CK_443X), | ||
3361 | CLK(NULL, "gpt4_ick", &dummy_ck, CK_443X), | ||
3362 | CLK(NULL, "gpt5_ick", &dummy_ck, CK_443X), | ||
3363 | CLK(NULL, "gpt6_ick", &dummy_ck, CK_443X), | ||
3364 | CLK(NULL, "gpt7_ick", &dummy_ck, CK_443X), | ||
3365 | CLK(NULL, "gpt8_ick", &dummy_ck, CK_443X), | ||
3366 | CLK(NULL, "gpt9_ick", &dummy_ck, CK_443X), | ||
3367 | CLK(NULL, "gpt10_ick", &dummy_ck, CK_443X), | ||
3368 | CLK(NULL, "gpt11_ick", &dummy_ck, CK_443X), | ||
3369 | CLK("omap_i2c.1", "ick", &dummy_ck, CK_443X), | 3358 | CLK("omap_i2c.1", "ick", &dummy_ck, CK_443X), |
3370 | CLK("omap_i2c.2", "ick", &dummy_ck, CK_443X), | 3359 | CLK("omap_i2c.2", "ick", &dummy_ck, CK_443X), |
3371 | CLK("omap_i2c.3", "ick", &dummy_ck, CK_443X), | 3360 | CLK("omap_i2c.3", "ick", &dummy_ck, CK_443X), |
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index ecec873e78cd..1b7835865c83 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
@@ -178,13 +178,6 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, | |||
178 | if (IS_ERR(timer->fclk)) | 178 | if (IS_ERR(timer->fclk)) |
179 | return -ENODEV; | 179 | return -ENODEV; |
180 | 180 | ||
181 | sprintf(name, "gpt%d_ick", gptimer_id); | ||
182 | timer->iclk = clk_get(NULL, name); | ||
183 | if (IS_ERR(timer->iclk)) { | ||
184 | clk_put(timer->fclk); | ||
185 | return -ENODEV; | ||
186 | } | ||
187 | |||
188 | omap_hwmod_enable(oh); | 181 | omap_hwmod_enable(oh); |
189 | 182 | ||
190 | sys_timer_reserved |= (1 << (gptimer_id - 1)); | 183 | sys_timer_reserved |= (1 << (gptimer_id - 1)); |