Commit 87bd63f6 authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King
Browse files

[ARM] 3280/1: OMAP: 2/3 Fix low-level io init for omap1 boards 



Patch from Tony Lindgren

This patch fixes the low-level IO init for omap1 boards.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 53d9cc73

arch/arm/mach-omap1/board-generic.c

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


static void __init omap_generic_init_irq(void)

{

	omap1_init_common_hw();

	omap_init_irq();

}
@@ -104,7 +105,7 @@ static void __init omap_generic_init(void) 


static void __init omap_generic_map_io(void)

{

	omap_map_common_io();

	omap1_map_common_io();

}



MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")

arch/arm/mach-omap1/board-h2.c

+2 −1
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ static void __init h2_init_smc91x(void) 


static void __init h2_init_irq(void)

{

	omap1_init_common_hw();

	omap_init_irq();

	omap_gpio_init();

	h2_init_smc91x();
@@ -194,7 +195,7 @@ static void __init h2_init(void) 


static void __init h2_map_io(void)

{

	omap_map_common_io();

	omap1_map_common_io();

}



MACHINE_START(OMAP_H2, "TI-H2")

arch/arm/mach-omap1/board-h3.c

+2 −1
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ static void __init h3_init_smc91x(void) 


void h3_init_irq(void)

{

	omap1_init_common_hw();

	omap_init_irq();

	omap_gpio_init();

	h3_init_smc91x();
@@ -210,7 +211,7 @@ void h3_init_irq(void) 


static void __init h3_map_io(void)

{

	omap_map_common_io();

	omap1_map_common_io();

}



MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")

arch/arm/mach-omap1/board-innovator.c

+2 −1
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ static void __init innovator_init_smc91x(void) 


void innovator_init_irq(void)

{

	omap1_init_common_hw();

	omap_init_irq();

	omap_gpio_init();

#ifdef CONFIG_ARCH_OMAP15XX
@@ -285,7 +286,7 @@ static void __init innovator_init(void) 


static void __init innovator_map_io(void)

{

	omap_map_common_io();

	omap1_map_common_io();



#ifdef CONFIG_ARCH_OMAP15XX

	if (cpu_is_omap1510()) {

arch/arm/mach-omap1/board-netstar.c

+2 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ static struct omap_board_config_kernel netstar_config[] = { 


static void __init netstar_init_irq(void)

{

	omap1_init_common_hw();

	omap_init_irq();

	omap_gpio_init();

}
@@ -108,7 +109,7 @@ static void __init netstar_init(void) 


static void __init netstar_map_io(void)

{

	omap_map_common_io();

	omap1_map_common_io();

}



#define MACHINE_PANICED		1

CRA Git | Maintained and supported by SUSTech CRA and CCSE