aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/Kconfig5
-rw-r--r--arch/arm/mach-omap2/Makefile1
-rw-r--r--arch/arm/mach-omap2/board-ti8168evm.c22
3 files changed, 22 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index f475954c3b98..5ca19d717b3f 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -322,6 +322,11 @@ config MACH_TI8168EVM
322 depends on SOC_OMAPTI81XX 322 depends on SOC_OMAPTI81XX
323 default y 323 default y
324 324
325config MACH_TI8148EVM
326 bool "TI8148 Evaluation Module"
327 depends on SOC_OMAPTI81XX
328 default y
329
325config MACH_OMAP_4430SDP 330config MACH_OMAP_4430SDP
326 bool "OMAP 4430 SDP board" 331 bool "OMAP 4430 SDP board"
327 default y 332 default y
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index b009f17dee56..6d226a76d057 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -232,6 +232,7 @@ obj-$(CONFIG_MACH_CRANEBOARD) += board-am3517crane.o
232 232
233obj-$(CONFIG_MACH_SBC3530) += board-omap3stalker.o 233obj-$(CONFIG_MACH_SBC3530) += board-omap3stalker.o
234obj-$(CONFIG_MACH_TI8168EVM) += board-ti8168evm.o 234obj-$(CONFIG_MACH_TI8168EVM) += board-ti8168evm.o
235obj-$(CONFIG_MACH_TI8148EVM) += board-ti8168evm.o
235 236
236# Platform specific device init code 237# Platform specific device init code
237 238
diff --git a/arch/arm/mach-omap2/board-ti8168evm.c b/arch/arm/mach-omap2/board-ti8168evm.c
index b236fcc023ac..b3ca997a44fa 100644
--- a/arch/arm/mach-omap2/board-ti8168evm.c
+++ b/arch/arm/mach-omap2/board-ti8168evm.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Code for TI8168 EVM. 2 * Code for TI8168/TI8148 EVM.
3 * 3 *
4 * Copyright (C) 2010 Texas Instruments, Inc. - http://www.ti.com/ 4 * Copyright (C) 2010 Texas Instruments, Inc. - http://www.ti.com/
5 * 5 *
@@ -24,15 +24,15 @@
24#include <plat/board.h> 24#include <plat/board.h>
25#include "common.h" 25#include "common.h"
26 26
27static struct omap_board_config_kernel ti8168_evm_config[] __initdata = { 27static struct omap_board_config_kernel ti81xx_evm_config[] __initdata = {
28}; 28};
29 29
30static void __init ti8168_evm_init(void) 30static void __init ti81xx_evm_init(void)
31{ 31{
32 omap_serial_init(); 32 omap_serial_init();
33 omap_sdrc_init(NULL, NULL); 33 omap_sdrc_init(NULL, NULL);
34 omap_board_config = ti8168_evm_config; 34 omap_board_config = ti81xx_evm_config;
35 omap_board_config_size = ARRAY_SIZE(ti8168_evm_config); 35 omap_board_config_size = ARRAY_SIZE(ti81xx_evm_config);
36} 36}
37 37
38MACHINE_START(TI8168EVM, "ti8168evm") 38MACHINE_START(TI8168EVM, "ti8168evm")
@@ -42,5 +42,15 @@ MACHINE_START(TI8168EVM, "ti8168evm")
42 .init_early = ti81xx_init_early, 42 .init_early = ti81xx_init_early,
43 .init_irq = ti81xx_init_irq, 43 .init_irq = ti81xx_init_irq,
44 .timer = &omap3_timer, 44 .timer = &omap3_timer,
45 .init_machine = ti8168_evm_init, 45 .init_machine = ti81xx_evm_init,
46MACHINE_END
47
48MACHINE_START(TI8148EVM, "ti8148evm")
49 /* Maintainer: Texas Instruments */
50 .atag_offset = 0x100,
51 .map_io = ti81xx_map_io,
52 .init_early = ti81xx_init_early,
53 .init_irq = ti81xx_init_irq,
54 .timer = &omap3_timer,
55 .init_machine = ti81xx_evm_init,
46MACHINE_END 56MACHINE_END