Skip to content

L
linux
Commit 882c0518 authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

omap: Fix dmtimer.c for multi-omap boot 

Fix dmtimer.c for multi-omap boot. Also remove legacy
clk_enable/disable wrappers that are no longer needed.

Note that the clock handling should be further improved
to make use of the clock aliases.
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 56213ca4
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 51 deletions
arch/arm/plat-omap/dmtimer.c
View file @ 882c0518
...@@ -163,20 +163,9 @@ struct omap_dm_timer { ...@@ -163,20 +163,9 @@ struct omap_dm_timer {
unsigned posted:1; unsigned posted:1;
}; };
#ifdef CONFIG_ARCH_OMAP1 static int dm_timer_count;
#define omap_dm_clk_enable(x)
#define omap_dm_clk_disable(x)
#define omap2_dm_timers NULL
#define omap2_dm_source_names NULL
#define omap2_dm_source_clocks NULL
#define omap3_dm_timers NULL
#define omap3_dm_source_names NULL
#define omap3_dm_source_clocks NULL
#define omap4_dm_timers NULL
#define omap4_dm_source_names NULL
#define omap4_dm_source_clocks NULL
#ifdef CONFIG_ARCH_OMAP1
static struct omap_dm_timer omap1_dm_timers[] = { static struct omap_dm_timer omap1_dm_timers[] = {
{ .phys_base = 0xfffb1400, .irq = INT_1610_GPTIMER1 }, { .phys_base = 0xfffb1400, .irq = INT_1610_GPTIMER1 },
{ .phys_base = 0xfffb1c00, .irq = INT_1610_GPTIMER2 }, { .phys_base = 0xfffb1c00, .irq = INT_1610_GPTIMER2 },
...@@ -188,20 +177,14 @@ static struct omap_dm_timer omap1_dm_timers[] = { ...@@ -188,20 +177,14 @@ static struct omap_dm_timer omap1_dm_timers[] = {
{ .phys_base = 0xfffbd400, .irq = INT_1610_GPTIMER8 }, { .phys_base = 0xfffbd400, .irq = INT_1610_GPTIMER8 },
}; };
static const int dm_timer_count = ARRAY_SIZE(omap1_dm_timers); static const int omap1_dm_timer_count = ARRAY_SIZE(omap1_dm_timers);
#elif defined(CONFIG_ARCH_OMAP2) #else
#define omap_dm_clk_enable(x) clk_enable(x)
#define omap_dm_clk_disable(x) clk_disable(x)
#define omap1_dm_timers NULL #define omap1_dm_timers NULL
#define omap3_dm_timers NULL #define omap1_dm_timer_count 0
#define omap3_dm_source_names NULL #endif /* CONFIG_ARCH_OMAP1 */
#define omap3_dm_source_clocks NULL
#define omap4_dm_timers NULL
#define omap4_dm_source_names NULL
#define omap4_dm_source_clocks NULL
#ifdef CONFIG_ARCH_OMAP2
static struct omap_dm_timer omap2_dm_timers[] = { static struct omap_dm_timer omap2_dm_timers[] = {
{ .phys_base = 0x48028000, .irq = INT_24XX_GPTIMER1 }, { .phys_base = 0x48028000, .irq = INT_24XX_GPTIMER1 },
{ .phys_base = 0x4802a000, .irq = INT_24XX_GPTIMER2 }, { .phys_base = 0x4802a000, .irq = INT_24XX_GPTIMER2 },
...@@ -225,20 +208,16 @@ static const char *omap2_dm_source_names[] __initdata = { ...@@ -225,20 +208,16 @@ static const char *omap2_dm_source_names[] __initdata = {
}; };
static struct clk *omap2_dm_source_clocks[3]; static struct clk *omap2_dm_source_clocks[3];
static const int dm_timer_count = ARRAY_SIZE(omap2_dm_timers); static const int omap2_dm_timer_count = ARRAY_SIZE(omap2_dm_timers);
#elif defined(CONFIG_ARCH_OMAP3)
#define omap_dm_clk_enable(x) clk_enable(x) #else
#define omap_dm_clk_disable(x) clk_disable(x)
#define omap1_dm_timers NULL
#define omap2_dm_timers NULL #define omap2_dm_timers NULL
#define omap2_dm_timer_count 0
#define omap2_dm_source_names NULL #define omap2_dm_source_names NULL
#define omap2_dm_source_clocks NULL #define omap2_dm_source_clocks NULL
#define omap4_dm_timers NULL #endif /* CONFIG_ARCH_OMAP2 */
#define omap4_dm_source_names NULL
#define omap4_dm_source_clocks NULL
#ifdef CONFIG_ARCH_OMAP3
static struct omap_dm_timer omap3_dm_timers[] = { static struct omap_dm_timer omap3_dm_timers[] = {
{ .phys_base = 0x48318000, .irq = INT_24XX_GPTIMER1 }, { .phys_base = 0x48318000, .irq = INT_24XX_GPTIMER1 },
{ .phys_base = 0x49032000, .irq = INT_24XX_GPTIMER2 }, { .phys_base = 0x49032000, .irq = INT_24XX_GPTIMER2 },
...@@ -261,20 +240,16 @@ static const char *omap3_dm_source_names[] __initdata = { ...@@ -261,20 +240,16 @@ static const char *omap3_dm_source_names[] __initdata = {
}; };
static struct clk *omap3_dm_source_clocks[2]; static struct clk *omap3_dm_source_clocks[2];
static const int dm_timer_count = ARRAY_SIZE(omap3_dm_timers); static const int omap3_dm_timer_count = ARRAY_SIZE(omap3_dm_timers);
#elif defined(CONFIG_ARCH_OMAP4) #else
#define omap_dm_clk_enable(x) clk_enable(x)
#define omap_dm_clk_disable(x) clk_disable(x)
#define omap1_dm_timers NULL
#define omap2_dm_timers NULL
#define omap2_dm_source_names NULL
#define omap2_dm_source_clocks NULL
#define omap3_dm_timers NULL #define omap3_dm_timers NULL
#define omap3_dm_timer_count 0
#define omap3_dm_source_names NULL #define omap3_dm_source_names NULL
#define omap3_dm_source_clocks NULL #define omap3_dm_source_clocks NULL
#endif /* CONFIG_ARCH_OMAP3 */
#ifdef CONFIG_ARCH_OMAP4
static struct omap_dm_timer omap4_dm_timers[] = { static struct omap_dm_timer omap4_dm_timers[] = {
{ .phys_base = 0x4a318000, .irq = INT_44XX_GPTIMER1 }, { .phys_base = 0x4a318000, .irq = INT_44XX_GPTIMER1 },
{ .phys_base = 0x48032000, .irq = INT_44XX_GPTIMER2 }, { .phys_base = 0x48032000, .irq = INT_44XX_GPTIMER2 },
...@@ -295,13 +270,14 @@ static const char *omap4_dm_source_names[] __initdata = { ...@@ -295,13 +270,14 @@ static const char *omap4_dm_source_names[] __initdata = {
NULL NULL
}; };
static struct clk *omap4_dm_source_clocks[2]; static struct clk *omap4_dm_source_clocks[2];
static const int dm_timer_count = ARRAY_SIZE(omap4_dm_timers); static const int omap4_dm_timer_count = ARRAY_SIZE(omap4_dm_timers);
#else #else
#define omap4_dm_timers NULL
#error OMAP architecture not supported! #define omap4_dm_timer_count 0
#define omap4_dm_source_names NULL
#endif #define omap4_dm_source_clocks NULL
#endif /* CONFIG_ARCH_OMAP4 */
static struct omap_dm_timer *dm_timers; static struct omap_dm_timer *dm_timers;
static const char **dm_source_names; static const char **dm_source_names;
...@@ -450,8 +426,12 @@ void omap_dm_timer_enable(struct omap_dm_timer *timer) ...@@ -450,8 +426,12 @@ void omap_dm_timer_enable(struct omap_dm_timer *timer)
if (timer->enabled) if (timer->enabled)
return; return;
omap_dm_clk_enable(timer->fclk); #ifdef CONFIG_ARCH_OMAP2PLUS
omap_dm_clk_enable(timer->iclk); if (cpu_class_is_omap2()) {
clk_enable(timer->fclk);
clk_enable(timer->iclk);
}
#endif
timer->enabled = 1; timer->enabled = 1;
} }
...@@ -462,8 +442,12 @@ void omap_dm_timer_disable(struct omap_dm_timer *timer) ...@@ -462,8 +442,12 @@ void omap_dm_timer_disable(struct omap_dm_timer *timer)
if (!timer->enabled) if (!timer->enabled)
return; return;
omap_dm_clk_disable(timer->iclk); #ifdef CONFIG_ARCH_OMAP2PLUS
omap_dm_clk_disable(timer->fclk); if (cpu_class_is_omap2()) {
clk_disable(timer->iclk);
clk_disable(timer->fclk);
}
#endif
timer->enabled = 0; timer->enabled = 0;
} }
...@@ -764,17 +748,21 @@ int __init omap_dm_timer_init(void) ...@@ -764,17 +748,21 @@ int __init omap_dm_timer_init(void)
if (cpu_class_is_omap1()) { if (cpu_class_is_omap1()) {
dm_timers = omap1_dm_timers; dm_timers = omap1_dm_timers;
dm_timer_count = omap1_dm_timer_count;
map_size = SZ_2K; map_size = SZ_2K;
} else if (cpu_is_omap24xx()) { } else if (cpu_is_omap24xx()) {
dm_timers = omap2_dm_timers; dm_timers = omap2_dm_timers;
dm_timer_count = omap2_dm_timer_count;
dm_source_names = omap2_dm_source_names; dm_source_names = omap2_dm_source_names;
dm_source_clocks = omap2_dm_source_clocks; dm_source_clocks = omap2_dm_source_clocks;
} else if (cpu_is_omap34xx()) { } else if (cpu_is_omap34xx()) {
dm_timers = omap3_dm_timers; dm_timers = omap3_dm_timers;
dm_timer_count = omap3_dm_timer_count;
dm_source_names = omap3_dm_source_names; dm_source_names = omap3_dm_source_names;
dm_source_clocks = omap3_dm_source_clocks; dm_source_clocks = omap3_dm_source_clocks;
} else if (cpu_is_omap44xx()) { } else if (cpu_is_omap44xx()) {
dm_timers = omap4_dm_timers; dm_timers = omap4_dm_timers;
dm_timer_count = omap4_dm_timer_count;
dm_source_names = omap4_dm_source_names; dm_source_names = omap4_dm_source_names;
dm_source_clocks = omap4_dm_source_clocks; dm_source_clocks = omap4_dm_source_clocks;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7