aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap2/board-omap3evm.c12
-rw-r--r--arch/arm/plat-omap/include/plat/board.h18
2 files changed, 12 insertions, 18 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index b49e83420114..851aec6ecb8a 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -74,6 +74,18 @@
74#define OMAP3EVM_GEN1_ETHR_GPIO_RST 64 74#define OMAP3EVM_GEN1_ETHR_GPIO_RST 64
75#define OMAP3EVM_GEN2_ETHR_GPIO_RST 7 75#define OMAP3EVM_GEN2_ETHR_GPIO_RST 7
76 76
77/*
78 * OMAP35x EVM revision
79 * Run time detection of EVM revision is done by reading Ethernet
80 * PHY ID -
81 * GEN_1 = 0x01150000
82 * GEN_2 = 0x92200000
83 */
84enum {
85 OMAP3EVM_BOARD_GEN_1 = 0, /* EVM Rev between A - D */
86 OMAP3EVM_BOARD_GEN_2, /* EVM Rev >= Rev E */
87};
88
77static u8 omap3_evm_version; 89static u8 omap3_evm_version;
78 90
79u8 get_omap3_evm_rev(void) 91u8 get_omap3_evm_rev(void)
diff --git a/arch/arm/plat-omap/include/plat/board.h b/arch/arm/plat-omap/include/plat/board.h
index e6a8d79f3fcf..db3bdc120a6e 100644
--- a/arch/arm/plat-omap/include/plat/board.h
+++ b/arch/arm/plat-omap/include/plat/board.h
@@ -14,18 +14,6 @@
14 14
15#include <plat/gpio-switch.h> 15#include <plat/gpio-switch.h>
16 16
17/*
18 * OMAP35x EVM revision
19 * Run time detection of EVM revision is done by reading Ethernet
20 * PHY ID -
21 * GEN_1 = 0x01150000
22 * GEN_2 = 0x92200000
23 */
24enum {
25 OMAP3EVM_BOARD_GEN_1 = 0, /* EVM Rev between A - D */
26 OMAP3EVM_BOARD_GEN_2, /* EVM Rev >= Rev E */
27};
28
29/* Different peripheral ids */ 17/* Different peripheral ids */
30#define OMAP_TAG_CLOCK 0x4f01 18#define OMAP_TAG_CLOCK 0x4f01
31#define OMAP_TAG_GPIO_SWITCH 0x4f06 19#define OMAP_TAG_GPIO_SWITCH 0x4f06
@@ -125,10 +113,4 @@ extern int omap_board_config_size;
125/* for TI reference platforms sharing the same debug card */ 113/* for TI reference platforms sharing the same debug card */
126extern int debug_card_init(u32 addr, unsigned gpio); 114extern int debug_card_init(u32 addr, unsigned gpio);
127 115
128/* OMAP3EVM revision */
129#if defined(CONFIG_MACH_OMAP3EVM)
130u8 get_omap3_evm_rev(void);
131#else
132#define get_omap3_evm_rev() (-EINVAL)
133#endif
134#endif 116#endif