renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 04:03:58 +08:00
Code

ARM: at91: Give the PIT irq as an argument of at91sam926x_pit_init

Browse Source 
This allows to remove the dependency of the timer driver on mach/hardware.h and
having an hardcoded interrupt number in the driver itself.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Maxime Ripard 2014-09-15 16:02:24 +02:00 committed by Nicolas Ferre
parent 0f391f189e
commit 7d80335e29
7 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-at91/at91sam9260.c
View File

@ -442,7 +442,7 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
static void __init at91sam9260_init_time(void)
{
at91sam926x_pit_init();
at91sam926x_pit_init(NR_IRQS_LEGACY + AT91_ID_SYS);
}
AT91_SOC_START(at91sam9260)

2
arch/arm/mach-at91/at91sam9261.c
View File

@ -401,7 +401,7 @@ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
static void __init at91sam9261_init_time(void)
{
at91sam926x_pit_init();
at91sam926x_pit_init(NR_IRQS_LEGACY + AT91_ID_SYS);
}
AT91_SOC_START(at91sam9261)

2
arch/arm/mach-at91/at91sam9263.c
View File

@ -424,7 +424,7 @@ static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
static void __init at91sam9263_init_time(void)
{
at91sam926x_pit_init();
at91sam926x_pit_init(NR_IRQS_LEGACY + AT91_ID_SYS);
}
AT91_SOC_START(at91sam9263)

6
arch/arm/mach-at91/at91sam926x_time.c
View File

@ -22,8 +22,6 @@
#include <linux/of_irq.h>
#include <linux/slab.h>
#include <mach/hardware.h>
#define AT91_PIT_MR 0x00 /* Mode Register */
#define AT91_PIT_PITIEN BIT(25) /* Timer Interrupt Enable */
#define AT91_PIT_PITEN BIT(24) /* Timer Enabled */
@ -267,7 +265,7 @@ CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit",
static void __iomem *pit_base_addr;
void __init at91sam926x_pit_init(void)
void __init at91sam926x_pit_init(int irq)
{
struct pit_data *data;
@ -281,7 +279,7 @@ void __init at91sam926x_pit_init(void)
if (IS_ERR(data->mck))
panic(pr_fmt("Unable to get mck clk\n"));
data->irq = NR_IRQS_LEGACY + AT91_ID_SYS;
data->irq = irq;
at91sam926x_pit_common_init(data);
}

2
arch/arm/mach-at91/at91sam9g45.c
View File

@ -479,7 +479,7 @@ static unsigned int at91sam9g45_default_irq_priority[NR_AIC_IRQS] __initdata = {
static void __init at91sam9g45_init_time(void)
{
at91sam926x_pit_init();
at91sam926x_pit_init(NR_IRQS_LEGACY + AT91_ID_SYS);
}
AT91_SOC_START(at91sam9g45)

2
arch/arm/mach-at91/at91sam9rl.c
View File

@ -412,7 +412,7 @@ static unsigned int at91sam9rl_default_irq_priority[NR_AIC_IRQS] __initdata = {
static void __init at91sam9rl_init_time(void)
{
at91sam926x_pit_init();
at91sam926x_pit_init(NR_IRQS_LEGACY + AT91_ID_SYS);
}
AT91_SOC_START(at91sam9rl)

2
arch/arm/mach-at91/generic.h
View File

@ -48,7 +48,7 @@ extern void __init at91_init_time(void);
extern void at91rm9200_ioremap_st(u32 addr);
extern void at91rm9200_timer_init(void);
extern void at91sam926x_ioremap_pit(u32 addr);
extern void at91sam926x_pit_init(void);
extern void at91sam926x_pit_init(int irq);
extern void at91x40_timer_init(void);
/* Clocks */