Skip to content

L
linux
Commit 92100c12 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Arnd Bergmann
Browse files
Options

at91: factorize at91 interrupts init to soc 

they are the same except the default priority
Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
parent 21d08b9d
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 322 deletions
arch/arm/mach-at91/at91cap9.c
View file @ 92100c12
......@@ -403,19 +403,8 @@ static unsigned int at91cap9_default_irq_priority[NR_AIC_IRQS] __initdata = {
0, /* Advanced Interrupt Controller (IRQ1) */
};
void __init at91cap9_init_interrupts(unsigned int priority[NR_AIC_IRQS])
{
if (!priority)
priority = at91cap9_default_irq_priority;
/* Initialize the AIC interrupt controller */
at91_aic_init(priority);
/* Enable GPIO interrupts */
at91_gpio_irq_setup();
}
struct at91_soc __initdata at91cap9_soc = {
.map_io = at91cap9_map_io,
.default_irq_priority = at91cap9_default_irq_priority,
.init = at91cap9_initialize,
};
arch/arm/mach-at91/at91rm9200.c
View file @ 92100c12
......@@ -379,19 +379,8 @@ static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
0 /* Advanced Interrupt Controller (IRQ6) */
};
void __init at91rm9200_init_interrupts(unsigned int priority[NR_AIC_IRQS])
{
if (!priority)
priority = at91rm9200_default_irq_priority;
/* Initialize the AIC interrupt controller */
at91_aic_init(priority);
/* Enable GPIO interrupts */
at91_gpio_irq_setup();
}
struct at91_soc __initdata at91rm9200_soc = {
.map_io = at91rm9200_map_io,
.default_irq_priority = at91rm9200_default_irq_priority,
.init = at91rm9200_initialize,
};
arch/arm/mach-at91/at91sam9260.c
View file @ 92100c12
......@@ -410,19 +410,8 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
0, /* Advanced Interrupt Controller */
};
void __init at91sam9260_init_interrupts(unsigned int priority[NR_AIC_IRQS])
{
if (!priority)
priority = at91sam9260_default_irq_priority;
/* Initialize the AIC interrupt controller */
at91_aic_init(priority);
/* Enable GPIO interrupts */
at91_gpio_irq_setup();
}
struct at91_soc __initdata at91sam9260_soc = {
.map_io = at91sam9260_map_io,
.default_irq_priority = at91sam9260_default_irq_priority,
.init = at91sam9260_initialize,
};
arch/arm/mach-at91/at91sam9261.c
View file @ 92100c12
......@@ -361,19 +361,8 @@ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
0, /* Advanced Interrupt Controller */
};
void __init at91sam9261_init_interrupts(unsigned int priority[NR_AIC_IRQS])
{
if (!priority)
priority = at91sam9261_default_irq_priority;
/* Initialize the AIC interrupt controller */
at91_aic_init(priority);
/* Enable GPIO interrupts */
at91_gpio_irq_setup();
}
struct at91_soc __initdata at91sam9261_soc = {
.map_io = at91sam9261_map_io,
.default_irq_priority = at91sam9261_default_irq_priority,
.init = at91sam9261_initialize,
};
arch/arm/mach-at91/at91sam9263.c
View file @ 92100c12
......@@ -372,19 +372,8 @@ static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
0, /* Advanced Interrupt Controller (IRQ1) */
};
void __init at91sam9263_init_interrupts(unsigned int priority[NR_AIC_IRQS])
{
if (!priority)
priority = at91sam9263_default_irq_priority;
/* Initialize the AIC interrupt controller */
at91_aic_init(priority);
/* Enable GPIO interrupts */
at91_gpio_irq_setup();
}
struct at91_soc __initdata at91sam9263_soc = {
.map_io = at91sam9263_map_io,
.default_irq_priority = at91sam9263_default_irq_priority,
.init = at91sam9263_initialize,
};
arch/arm/mach-at91/at91sam9g45.c
View file @ 92100c12
......@@ -388,19 +388,8 @@ static unsigned int at91sam9g45_default_irq_priority[NR_AIC_IRQS] __initdata = {
0, /* Advanced Interrupt Controller (IRQ0) */
};
void __init at91sam9g45_init_interrupts(unsigned int priority[NR_AIC_IRQS])
{
if (!priority)
priority = at91sam9g45_default_irq_priority;
/* Initialize the AIC interrupt controller */
at91_aic_init(priority);
/* Enable GPIO interrupts */
at91_gpio_irq_setup();
}
struct at91_soc __initdata at91sam9g45_soc = {
.map_io = at91sam9g45_map_io,
.default_irq_priority = at91sam9g45_default_irq_priority,
.init = at91sam9g45_initialize,
};
arch/arm/mach-at91/at91sam9rl.c
View file @ 92100c12
......@@ -359,19 +359,8 @@ static unsigned int at91sam9rl_default_irq_priority[NR_AIC_IRQS] __initdata = {
0, /* Advanced Interrupt Controller */
};
void __init at91sam9rl_init_interrupts(unsigned int priority[NR_AIC_IRQS])
{
if (!priority)
priority = at91sam9rl_default_irq_priority;
/* Initialize the AIC interrupt controller */
at91_aic_init(priority);
/* Enable GPIO interrupts */
at91_gpio_irq_setup();
}
struct at91_soc __initdata at91sam9rl_soc = {
.map_io = at91sam9rl_map_io,
.default_irq_priority = at91sam9rl_default_irq_priority,
.init = at91sam9rl_initialize,
};
arch/arm/mach-at91/board-1arm.c
View file @ 92100c12
......@@ -63,11 +63,6 @@ static void __init onearm_init_early(void)
at91_set_serial_console(0);
}
static void __init onearm_init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
static struct at91_eth_data __initdata onearm_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
......@@ -99,6 +94,6 @@ MACHINE_START(ONEARM, "Ajeco 1ARM single board computer")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = onearm_init_early,
.init_irq = onearm_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = onearm_board_init,
MACHINE_END
arch/arm/mach-at91/board-afeb-9260v1.c
View file @ 92100c12
......@@ -70,12 +70,6 @@ static void __init afeb9260_init_early(void)
at91_set_serial_console(0);
}
static void __init afeb9260_init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
/*
* USB Host port
*/
......@@ -221,7 +215,7 @@ MACHINE_START(AFEB9260, "Custom afeb9260 board")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = afeb9260_init_early,
.init_irq = afeb9260_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = afeb9260_board_init,
MACHINE_END
arch/arm/mach-at91/board-cam60.c
View file @ 92100c12
......@@ -57,12 +57,6 @@ static void __init cam60_init_early(void)
at91_set_serial_console(0);
}
static void __init cam60_init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
/*
* USB Host
*/
......@@ -201,6 +195,6 @@ MACHINE_START(CAM60, "KwikByte CAM60")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = cam60_init_early,
.init_irq = cam60_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = cam60_board_init,
MACHINE_END
arch/arm/mach-at91/board-cap9adk.c
View file @ 92100c12
......@@ -65,12 +65,6 @@ static void __init cap9adk_init_early(void)
at91_set_serial_console(0);
}
static void __init cap9adk_init_irq(void)
{
at91cap9_init_interrupts(NULL);
}
/*
* USB Host port
*/
......@@ -399,6 +393,6 @@ MACHINE_START(AT91CAP9ADK, "Atmel AT91CAP9A-DK")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = cap9adk_init_early,
.init_irq = cap9adk_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = cap9adk_board_init,
MACHINE_END
arch/arm/mach-at91/board-carmeva.c
View file @ 92100c12
......@@ -57,11 +57,6 @@ static void __init carmeva_init_early(void)
at91_set_serial_console(0);
}
static void __init carmeva_init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
static struct at91_eth_data __initdata carmeva_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
......@@ -165,6 +160,6 @@ MACHINE_START(CARMEVA, "Carmeva")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = carmeva_init_early,
.init_irq = carmeva_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = carmeva_board_init,
MACHINE_END
arch/arm/mach-at91/board-cpu9krea.c
View file @ 92100c12
......@@ -81,11 +81,6 @@ static void __init cpu9krea_init_early(void)
at91_set_serial_console(0);
}
static void __init cpu9krea_init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
/*
* USB Host port
*/
......@@ -378,6 +373,6 @@ MACHINE_START(CPUAT9G20, "Eukrea CPU9G20")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = cpu9krea_init_early,
.init_irq = cpu9krea_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = cpu9krea_board_init,
MACHINE_END
arch/arm/mach-at91/board-cpuat91.c
View file @ 92100c12
......@@ -82,11 +82,6 @@ static void __init cpuat91_init_early(void)
at91_set_serial_console(0);
}
static void __init cpuat91_init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
static struct at91_eth_data __initdata cpuat91_eth_data = {
.is_rmii = 1,
};
......@@ -182,6 +177,6 @@ MACHINE_START(CPUAT91, "Eukrea")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = cpuat91_init_early,
.init_irq = cpuat91_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = cpuat91_board_init,
MACHINE_END
arch/arm/mach-at91/board-csb337.c
View file @ 92100c12
......@@ -58,11 +58,6 @@ static void __init csb337_init_early(void)
at91_set_serial_console(0);
}
static void __init csb337_init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
static struct at91_eth_data __initdata csb337_eth_data = {
.phy_irq_pin = AT91_PIN_PC2,
.is_rmii = 0,
......@@ -260,6 +255,6 @@ MACHINE_START(CSB337, "Cogent CSB337")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = csb337_init_early,
.init_irq = csb337_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = csb337_board_init,
MACHINE_END
arch/arm/mach-at91/board-csb637.c
View file @ 92100c12
......@@ -52,11 +52,6 @@ static void __init csb637_init_early(void)
at91_set_serial_console(0);
}
static void __init csb637_init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
static struct at91_eth_data __initdata csb637_eth_data = {
.phy_irq_pin = AT91_PIN_PC0,
.is_rmii = 0,
......@@ -141,6 +136,6 @@ MACHINE_START(CSB637, "Cogent CSB637")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = csb637_init_early,
.init_irq = csb637_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = csb637_board_init,
MACHINE_END
arch/arm/mach-at91/board-eb9200.c
View file @ 92100c12
......@@ -60,11 +60,6 @@ static void __init eb9200_init_early(void)
at91_set_serial_console(0);
}
static void __init eb9200_init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
static struct at91_eth_data __initdata eb9200_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
......@@ -123,6 +118,6 @@ MACHINE_START(ATEB9200, "Embest ATEB9200")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = eb9200_init_early,
.init_irq = eb9200_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = eb9200_board_init,
MACHINE_END
arch/arm/mach-at91/board-ecbat91.c
View file @ 92100c12
......@@ -64,11 +64,6 @@ static void __init ecb_at91init_early(void)
at91_set_serial_console(0);
}
static void __init ecb_at91init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
static struct at91_eth_data __initdata ecb_at91eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 0,
......@@ -175,6 +170,6 @@ MACHINE_START(ECBAT91, "emQbit's ECB_AT91")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = ecb_at91init_early,
.init_irq = ecb_at91init_irq,
.init_irq = at91_init_irq_default,
.init_machine = ecb_at91board_init,
MACHINE_END
arch/arm/mach-at91/board-eco920.c
View file @ 92100c12
......@@ -47,11 +47,6 @@ static void __init eco920_init_early(void)
at91_set_serial_console(0);
}
static void __init eco920_init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
static struct at91_eth_data __initdata eco920_eth_data = {
.phy_irq_pin = AT91_PIN_PC2,
.is_rmii = 1,
......@@ -137,6 +132,6 @@ MACHINE_START(ECO920, "eco920")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = eco920_init_early,
.init_irq = eco920_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = eco920_board_init,
MACHINE_END
arch/arm/mach-at91/board-flexibity.c
View file @ 92100c12
......@@ -49,11 +49,6 @@ static void __init flexibity_init_early(void)
at91_set_serial_console(0);
}
static void __init flexibity_init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
/* USB Host port */
static struct at91_usbh_data __initdata flexibity_usbh_data = {
.ports = 2,
......@@ -157,6 +152,6 @@ MACHINE_START(FLEXIBITY, "Flexibity Connect")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = flexibity_init_early,
.init_irq = flexibity_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = flexibity_board_init,
MACHINE_END
arch/arm/mach-at91/board-foxg20.c
View file @ 92100c12
......@@ -101,12 +101,6 @@ static void __init foxg20_init_early(void)
}
static void __init foxg20_init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
/*
* USB Host port
*/
......@@ -269,6 +263,6 @@ MACHINE_START(ACMENETUSFOXG20, "Acme Systems srl FOX Board G20")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = foxg20_init_early,
.init_irq = foxg20_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = foxg20_board_init,
MACHINE_END
arch/arm/mach-at91/board-gsia18s.c
View file @ 92100c12
......@@ -75,11 +75,6 @@ static void __init gsia18s_init_early(void)
at91_register_uart(AT91SAM9260_ID_US4, 5, 0);
}
static void __init init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
/*
* Two USB Host ports
*/
......@@ -579,6 +574,6 @@ MACHINE_START(GSIA18S, "GS_IA18_S")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = gsia18s_init_early,
.init_irq = init_irq,
.init_irq = at91_init_irq_default,
.init_machine = gsia18s_board_init,
MACHINE_END
arch/arm/mach-at91/board-kafa.c
View file @ 92100c12
......@@ -61,11 +61,6 @@ static void __init kafa_init_early(void)
at91_set_serial_console(0);
}
static void __init kafa_init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
static struct at91_eth_data __initdata kafa_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 0,
......@@ -101,6 +96,6 @@ MACHINE_START(KAFA, "Sperry-Sun KAFA")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = kafa_init_early,
.init_irq = kafa_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = kafa_board_init,
MACHINE_END
arch/arm/mach-at91/board-kb9202.c
View file @ 92100c12
......@@ -69,11 +69,6 @@ static void __init kb9202_init_early(void)
at91_set_serial_console(0);
}
static void __init kb9202_init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
static struct at91_eth_data __initdata kb9202_eth_data = {
.phy_irq_pin = AT91_PIN_PB29,
.is_rmii = 0,
......@@ -142,6 +137,6 @@ MACHINE_START(KB9200, "KB920x")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = kb9202_init_early,
.init_irq = kb9202_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = kb9202_board_init,
MACHINE_END
arch/arm/mach-at91/board-neocore926.c
View file @ 92100c12
......@@ -66,12 +66,6 @@ static void __init neocore926_init_early(void)
at91_set_serial_console(0);
}
static void __init neocore926_init_irq(void)
{
at91sam9263_init_interrupts(NULL);
}
/*
* USB Host port
*/
......@@ -390,6 +384,6 @@ MACHINE_START(NEOCORE926, "ADENEO NEOCORE 926")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = neocore926_init_early,
.init_irq = neocore926_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = neocore926_board_init,
MACHINE_END
arch/arm/mach-at91/board-pcontrol-g20.c
View file @ 92100c12
......@@ -53,13 +53,6 @@ static void __init pcontrol_g20_init_early(void)
at91_register_uart(AT91SAM9260_ID_US4, 3, 0);
}
static void __init init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
static struct sam9_smc_config __initdata pcontrol_smc_config[2] = { {
.ncs_read_setup = 16,
.nrd_setup = 18,
......@@ -225,6 +218,6 @@ MACHINE_START(PCONTROL_G20, "PControl G20")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = pcontrol_g20_init_early,
.init_irq = init_irq,
.init_irq = at91_init_irq_default,
.init_machine = pcontrol_g20_board_init,
MACHINE_END
arch/arm/mach-at91/board-picotux200.c
View file @ 92100c12
......@@ -60,11 +60,6 @@ static void __init picotux200_init_early(void)
at91_set_serial_console(0);
}
static void __init picotux200_init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
static struct at91_eth_data __initdata picotux200_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
......@@ -126,6 +121,6 @@ MACHINE_START(PICOTUX2XX, "picotux 200")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = picotux200_init_early,
.init_irq = picotux200_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = picotux200_board_init,
MACHINE_END
arch/arm/mach-at91/board-qil-a9260.c
View file @ 92100c12
......@@ -72,12 +72,6 @@ static void __init ek_init_early(void)
}
static void __init ek_init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
/*
* USB Host port
*/
......@@ -271,6 +265,6 @@ MACHINE_START(QIL_A9260, "CALAO QIL_A9260")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = ek_init_early,
.init_irq = ek_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = ek_board_init,
MACHINE_END
arch/arm/mach-at91/board-rm9200dk.c
View file @ 92100c12
......@@ -65,11 +65,6 @@ static void __init dk_init_early(void)
at91_set_serial_console(0);
}
static void __init dk_init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
static struct at91_eth_data __initdata dk_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
......@@ -230,6 +225,6 @@ MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = dk_init_early,
.init_irq = dk_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = dk_board_init,
MACHINE_END
arch/arm/mach-at91/board-rm9200ek.c
View file @ 92100c12
......@@ -65,11 +65,6 @@ static void __init ek_init_early(void)
at91_set_serial_console(0);
}
static void __init ek_init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
static struct at91_eth_data __initdata ek_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
......@@ -196,6 +191,6 @@ MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = ek_init_early,
.init_irq = ek_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = ek_board_init,
MACHINE_END
arch/arm/mach-at91/board-sam9-l9260.c
View file @ 92100c12
......@@ -67,12 +67,6 @@ static void __init ek_init_early(void)
at91_set_serial_console(0);
}
static void __init ek_init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
/*
* USB Host port
*/
......@@ -215,6 +209,6 @@ MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = ek_init_early,
.init_irq = ek_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = ek_board_init,
MACHINE_END
arch/arm/mach-at91/board-sam9260ek.c
View file @ 92100c12
......@@ -70,12 +70,6 @@ static void __init ek_init_early(void)
at91_set_serial_console(0);
}
static void __init ek_init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
/*
* USB Host port
*/
......@@ -356,6 +350,6 @@ MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = ek_init_early,
.init_irq = ek_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = ek_board_init,
MACHINE_END
arch/arm/mach-at91/board-sam9261ek.c
View file @ 92100c12
......@@ -69,12 +69,6 @@ static void __init ek_init_early(void)
at91_set_serial_console(0);
}
static void __init ek_init_irq(void)
{
at91sam9261_init_interrupts(NULL);
}
/*
* DM9000 ethernet device
*/
......@@ -623,6 +617,6 @@ MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = ek_init_early,
.init_irq = ek_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = ek_board_init,
MACHINE_END
arch/arm/mach-at91/board-sam9263ek.c
View file @ 92100c12
......@@ -68,12 +68,6 @@ static void __init ek_init_early(void)
at91_set_serial_console(0);
}
static void __init ek_init_irq(void)
{
at91sam9263_init_interrupts(NULL);
}
/*
* USB Host port
*/
......@@ -454,6 +448,6 @@ MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = ek_init_early,
.init_irq = ek_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = ek_board_init,
MACHINE_END
arch/arm/mach-at91/board-sam9g20ek.c
View file @ 92100c12
......@@ -81,12 +81,6 @@ static void __init ek_init_early(void)
at91_set_serial_console(0);
}
static void __init ek_init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
/*
* USB Host port
*/
......@@ -406,7 +400,7 @@ MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = ek_init_early,
.init_irq = ek_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = ek_board_init,
MACHINE_END
......@@ -415,6 +409,6 @@ MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = ek_init_early,
.init_irq = ek_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = ek_board_init,
MACHINE_END
arch/arm/mach-at91/board-sam9m10g45ek.c
View file @ 92100c12
......@@ -63,12 +63,6 @@ static void __init ek_init_early(void)
at91_set_serial_console(0);
}
static void __init ek_init_irq(void)
{
at91sam9g45_init_interrupts(NULL);
}
/*
* USB HS Host port (common to OHCI & EHCI)
*/
......@@ -424,6 +418,6 @@ MACHINE_START(AT91SAM9M10G45EK, "Atmel AT91SAM9M10G45-EK")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = ek_init_early,
.init_irq = ek_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = ek_board_init,
MACHINE_END
arch/arm/mach-at91/board-sam9rlek.c
View file @ 92100c12
......@@ -53,12 +53,6 @@ static void __init ek_init_early(void)
at91_set_serial_console(0);
}
static void __init ek_init_irq(void)
{
at91sam9rl_init_interrupts(NULL);
}
/*
* USB HS Device port
*/
......@@ -332,6 +326,6 @@ MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = ek_init_early,
.init_irq = ek_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = ek_board_init,
MACHINE_END
arch/arm/mach-at91/board-snapper9260.c
View file @ 92100c12
......@@ -55,11 +55,6 @@ static void __init snapper9260_init_early(void)
at91_register_uart(AT91SAM9260_ID_US2, 3, 0);
}
static void __init snapper9260_init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
static struct at91_usbh_data __initdata snapper9260_usbh_data = {
.ports = 2,
};
......@@ -181,7 +176,7 @@ MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = snapper9260_init_early,
.init_irq = snapper9260_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = snapper9260_board_init,
MACHINE_END
......
arch/arm/mach-at91/board-stamp9g20.c
View file @ 92100c12
......@@ -76,12 +76,6 @@ static void __init portuxg20_init_early(void)
at91_register_uart(AT91SAM9260_ID_US5, 6, 0);
}
static void __init init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
/*
* NAND flash
*/
......@@ -301,7 +295,7 @@ MACHINE_START(PORTUXG20, "taskit PortuxG20")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = portuxg20_init_early,
.init_irq = init_irq,
.init_irq = at91_init_irq_default,
.init_machine = portuxg20_board_init,
MACHINE_END
......@@ -310,6 +304,6 @@ MACHINE_START(STAMP9G20, "taskit Stamp9G20")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = stamp9g20evb_init_early,
.init_irq = init_irq,
.init_irq = at91_init_irq_default,
.init_machine = stamp9g20evb_board_init,
MACHINE_END
arch/arm/mach-at91/board-usb-a9260.c
View file @ 92100c12
......@@ -60,12 +60,6 @@ static void __init ek_init_early(void)
at91_set_serial_console(0);
}
static void __init ek_init_irq(void)
{
at91sam9260_init_interrupts(NULL);
}
/*
* USB Host port
*/
......@@ -231,6 +225,6 @@ MACHINE_START(USB_A9260, "CALAO USB_A9260")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = ek_init_early,
.init_irq = ek_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = ek_board_init,
MACHINE_END
arch/arm/mach-at91/board-usb-a9263.c
View file @ 92100c12
......@@ -59,12 +59,6 @@ static void __init ek_init_early(void)
at91_set_serial_console(0);
}
static void __init ek_init_irq(void)
{
at91sam9263_init_interrupts(NULL);
}
/*
* USB Host port
*/
......@@ -247,6 +241,6 @@ MACHINE_START(USB_A9263, "CALAO USB_A9263")
.timer = &at91sam926x_timer,
.map_io = at91_map_io,
.init_early = ek_init_early,
.init_irq = ek_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = ek_board_init,
MACHINE_END
arch/arm/mach-at91/board-yl-9200.c
View file @ 92100c12
......@@ -79,12 +79,6 @@ static void __init yl9200_init_early(void)
at91_set_serial_console(0);
}
static void __init yl9200_init_irq(void)
{
at91rm9200_init_interrupts(NULL);
}
/*
* LEDs
*/
......@@ -601,6 +595,6 @@ MACHINE_START(YL9200, "uCdragon YL-9200")
.timer = &at91rm9200_timer,
.map_io = at91_map_io,
.init_early = yl9200_init_early,
.init_irq = yl9200_init_irq,
.init_irq = at91_init_irq_default,
.init_machine = yl9200_board_init,
MACHINE_END
arch/arm/mach-at91/generic.h
View file @ 92100c12
......@@ -19,14 +19,9 @@ extern void __init at91_initialize(unsigned long main_clock);
extern void __init at91x40_initialize(unsigned long main_clock);
/* Interrupts */
extern void __init at91rm9200_init_interrupts(unsigned int priority[]);
extern void __init at91sam9260_init_interrupts(unsigned int priority[]);
extern void __init at91sam9261_init_interrupts(unsigned int priority[]);
extern void __init at91sam9263_init_interrupts(unsigned int priority[]);
extern void __init at91sam9rl_init_interrupts(unsigned int priority[]);
extern void __init at91sam9g45_init_interrupts(unsigned int priority[]);
extern void __init at91_init_irq_default(void);
extern void __init at91_init_interrupts(unsigned int priority[]);
extern void __init at91x40_init_interrupts(unsigned int priority[]);
extern void __init at91cap9_init_interrupts(unsigned int priority[]);
extern void __init at91_aic_init(unsigned int priority[]);
/* Timer */
......
arch/arm/mach-at91/setup.c
View file @ 92100c12
......@@ -18,6 +18,20 @@
struct at91_soc __initdata at91_boot_soc;
void __init at91_init_irq_default(void)
{
at91_init_interrupts(at91_boot_soc.default_irq_priority);
}
void __init at91_init_interrupts(unsigned int *priority)
{
/* Initialize the AIC interrupt controller */
at91_aic_init(priority);
/* Enable GPIO interrupts */
at91_gpio_irq_setup();
}
static struct map_desc at91_io_desc __initdata = {
.virtual = AT91_VA_BASE_SYS,
.pfn = __phys_to_pfn(AT91_BASE_SYS),
......
arch/arm/mach-at91/soc.h
View file @ 92100c12
......@@ -5,6 +5,7 @@
*/
struct at91_soc {
unsigned int *default_irq_priority;
void (*map_io)(void);
void (*init)(unsigned long main_clock);
};
......
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