aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-n8x0.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-09-26 17:52:55 -0400
committerTony Lindgren <tony@atomide.com>2011-09-26 20:50:37 -0400
commite990a4060fcb78a1576d36e7327db11c0d278a6b (patch)
tree16760f9a9eaf8a6d4fa28085dad36fe2c5559280 /arch/arm/mach-omap2/board-n8x0.c
parent35549ec3c3e67188a8d3eac0167e950c46688c96 (diff)
ARM: OMAP2+: Use SoC specifc map_io
There's no longer any need for the board specific map_io. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-n8x0.c')
-rw-r--r--arch/arm/mach-omap2/board-n8x0.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 77a4e19222e2..d1f4a0292c42 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -616,12 +616,6 @@ static struct i2c_board_info n810_i2c_board_info_2[] __initdata = {
616 }, 616 },
617}; 617};
618 618
619static void __init n8x0_map_io(void)
620{
621 omap2_set_globals_242x();
622 omap242x_map_common_io();
623}
624
625#ifdef CONFIG_OMAP_MUX 619#ifdef CONFIG_OMAP_MUX
626static struct omap_board_mux board_mux[] __initdata = { 620static struct omap_board_mux board_mux[] __initdata = {
627 /* I2S codec port pins for McBSP block */ 621 /* I2S codec port pins for McBSP block */
@@ -692,7 +686,7 @@ static void __init n8x0_init_machine(void)
692MACHINE_START(NOKIA_N800, "Nokia N800") 686MACHINE_START(NOKIA_N800, "Nokia N800")
693 .boot_params = 0x80000100, 687 .boot_params = 0x80000100,
694 .reserve = omap_reserve, 688 .reserve = omap_reserve,
695 .map_io = n8x0_map_io, 689 .map_io = omap242x_map_io,
696 .init_early = omap2420_init_early, 690 .init_early = omap2420_init_early,
697 .init_irq = omap2_init_irq, 691 .init_irq = omap2_init_irq,
698 .init_machine = n8x0_init_machine, 692 .init_machine = n8x0_init_machine,
@@ -702,7 +696,7 @@ MACHINE_END
702MACHINE_START(NOKIA_N810, "Nokia N810") 696MACHINE_START(NOKIA_N810, "Nokia N810")
703 .boot_params = 0x80000100, 697 .boot_params = 0x80000100,
704 .reserve = omap_reserve, 698 .reserve = omap_reserve,
705 .map_io = n8x0_map_io, 699 .map_io = omap242x_map_io,
706 .init_early = omap2420_init_early, 700 .init_early = omap2420_init_early,
707 .init_irq = omap2_init_irq, 701 .init_irq = omap2_init_irq,
708 .init_machine = n8x0_init_machine, 702 .init_machine = n8x0_init_machine,
@@ -712,7 +706,7 @@ MACHINE_END
712MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX") 706MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")
713 .boot_params = 0x80000100, 707 .boot_params = 0x80000100,
714 .reserve = omap_reserve, 708 .reserve = omap_reserve,
715 .map_io = n8x0_map_io, 709 .map_io = omap242x_map_io,
716 .init_early = omap2420_init_early, 710 .init_early = omap2420_init_early,
717 .init_irq = omap2_init_irq, 711 .init_irq = omap2_init_irq,
718 .init_machine = n8x0_init_machine, 712 .init_machine = n8x0_init_machine,