Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: 6296/1: clock U300 intcon and timer properly

Browse source 
This removes the quirks to clock the U300 VIC and timer by custom
hooks and moves the control out to the clock framework where it
belongs. This is possible now that clocks are available early.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Linus Walleij 2010-08-05 07:58:58 +01:00 committed by Russell King
parent 379aae5d6c
commit b7276b236d
4 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
arch/arm/mach-u300/clock.c
View file

@ -1315,25 +1315,6 @@ static void __init clk_register(void)
clkdev_add_table(lookups, ARRAY_SIZE(lookups));
}
/*
* The interrupt controller is enabled before the clock API is registered.
*/
void u300_enable_intcon_clock(void)
{
clk_enable(&intcon_clk);
}
EXPORT_SYMBOL(u300_enable_intcon_clock);
/*
* The timer is enabled before the clock API is registered.
*/
void u300_enable_timer_clock(void)
{
clk_enable(&app_timer_clk);
}
EXPORT_SYMBOL(u300_enable_timer_clock);
#if (defined(CONFIG_DEBUG_FS) && defined(CONFIG_U300_DEBUG))
/*
* The following makes it possible to view the status (especially

2
arch/arm/mach-u300/clock.h
View file

@ -45,8 +45,6 @@ struct clk {
void (*disable) (struct clk *);
};
void u300_enable_intcon_clock(void);
void u300_enable_timer_clock(void);
int u300_clock_init(void);
#endif

9
arch/arm/mach-u300/core.c
View file

@ -19,6 +19,8 @@
#include <linux/amba/bus.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/clk.h>
#include <linux/err.h>
#include <mach/coh901318.h>
#include <asm/types.h>
@ -1477,14 +1479,19 @@ static struct platform_device *platform_devs[] __initdata = {
void __init u300_init_irq(void)
{
u32 mask[2] = {0, 0};
struct clk *clk;
int i;
/* initialize clocking early, we want to clock the INTCON */
u300_clock_init();
/* Clock the interrupt controller */
clk = clk_get_sys("intcon", NULL);
BUG_ON(IS_ERR(clk));
clk_enable(clk);
for (i = 0; i < NR_IRQS; i++)
set_bit(i, (unsigned long *) &mask[0]);
u300_enable_intcon_clock();
vic_init((void __iomem *) U300_INTCON0_VBASE, 0, mask[0], mask[0]);
vic_init((void __iomem *) U300_INTCON1_VBASE, 32, mask[1], mask[1]);
}

11
arch/arm/mach-u300/timer.c
View file

@ -15,6 +15,8 @@
#include <linux/clocksource.h>
#include <linux/types.h>
#include <linux/io.h>
#include <linux/clk.h>
#include <linux/err.h>
#include <mach/hardware.h>
@ -23,7 +25,6 @@
#include <asm/mach/time.h>
#include <asm/mach/irq.h>
#include "clock.h"
/*
* APP side special timer registers
@ -367,7 +368,13 @@ unsigned long long notrace sched_clock(void)
*/
static void __init u300_timer_init(void)
{
u300_enable_timer_clock();
struct clk *clk;
/* Clock the interrupt controller */
clk = clk_get_sys("apptimer", NULL);
BUG_ON(IS_ERR(clk));
clk_enable(clk);
/*
* Disable the "OS" and "DD" timers - these are designed for Symbian!
* Example usage in cnh1601578 cpu subsystem pd_timer_app.c