diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index 0d362e9f9cb9..b94873d0c6b6 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -40,12 +40,10 @@ | |||
40 | #include <linux/mmc/host.h> | 40 | #include <linux/mmc/host.h> |
41 | #include <linux/export.h> | 41 | #include <linux/export.h> |
42 | 42 | ||
43 | #include <mach/hardware.h> | ||
44 | #include <asm/mach-types.h> | 43 | #include <asm/mach-types.h> |
45 | #include <asm/mach/arch.h> | 44 | #include <asm/mach/arch.h> |
46 | #include <asm/mach/map.h> | 45 | #include <asm/mach/map.h> |
47 | 46 | ||
48 | #include <plat/board.h> | ||
49 | #include <plat/usb.h> | 47 | #include <plat/usb.h> |
50 | #include <plat/nand.h> | 48 | #include <plat/nand.h> |
51 | #include "common.h" | 49 | #include "common.h" |
@@ -75,6 +73,18 @@ | |||
75 | #define OMAP3EVM_GEN1_ETHR_GPIO_RST 64 | 73 | #define OMAP3EVM_GEN1_ETHR_GPIO_RST 64 |
76 | #define OMAP3EVM_GEN2_ETHR_GPIO_RST 7 | 74 | #define OMAP3EVM_GEN2_ETHR_GPIO_RST 7 |
77 | 75 | ||
76 | /* | ||
77 | * OMAP35x EVM revision | ||
78 | * Run time detection of EVM revision is done by reading Ethernet | ||
79 | * PHY ID - | ||
80 | * GEN_1 = 0x01150000 | ||
81 | * GEN_2 = 0x92200000 | ||
82 | */ | ||
83 | enum { | ||
84 | OMAP3EVM_BOARD_GEN_1 = 0, /* EVM Rev between A - D */ | ||
85 | OMAP3EVM_BOARD_GEN_2, /* EVM Rev >= Rev E */ | ||
86 | }; | ||
87 | |||
78 | static u8 omap3_evm_version; | 88 | static u8 omap3_evm_version; |
79 | 89 | ||
80 | u8 get_omap3_evm_rev(void) | 90 | u8 get_omap3_evm_rev(void) |
@@ -377,9 +387,6 @@ static int omap3evm_twl_gpio_setup(struct device *dev, | |||
377 | } | 387 | } |
378 | 388 | ||
379 | static struct twl4030_gpio_platform_data omap3evm_gpio_data = { | 389 | static struct twl4030_gpio_platform_data omap3evm_gpio_data = { |
380 | .gpio_base = OMAP_MAX_GPIO_LINES, | ||
381 | .irq_base = TWL4030_GPIO_IRQ_BASE, | ||
382 | .irq_end = TWL4030_GPIO_IRQ_END, | ||
383 | .use_leds = true, | 390 | .use_leds = true, |
384 | .setup = omap3evm_twl_gpio_setup, | 391 | .setup = omap3evm_twl_gpio_setup, |
385 | }; | 392 | }; |
@@ -526,9 +533,6 @@ static int __init omap3_evm_i2c_init(void) | |||
526 | return 0; | 533 | return 0; |
527 | } | 534 | } |
528 | 535 | ||
529 | static struct omap_board_config_kernel omap3_evm_config[] __initdata = { | ||
530 | }; | ||
531 | |||
532 | static struct usbhs_omap_board_data usbhs_bdata __initdata = { | 536 | static struct usbhs_omap_board_data usbhs_bdata __initdata = { |
533 | 537 | ||
534 | .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, | 538 | .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, |
@@ -688,9 +692,6 @@ static void __init omap3_evm_init(void) | |||
688 | obm = (cpu_is_omap3630()) ? omap36x_board_mux : omap35x_board_mux; | 692 | obm = (cpu_is_omap3630()) ? omap36x_board_mux : omap35x_board_mux; |
689 | omap3_mux_init(obm, OMAP_PACKAGE_CBB); | 693 | omap3_mux_init(obm, OMAP_PACKAGE_CBB); |
690 | 694 | ||
691 | omap_board_config = omap3_evm_config; | ||
692 | omap_board_config_size = ARRAY_SIZE(omap3_evm_config); | ||
693 | |||
694 | omap_mux_init_gpio(63, OMAP_PIN_INPUT); | 695 | omap_mux_init_gpio(63, OMAP_PIN_INPUT); |
695 | omap_hsmmc_init(mmc); | 696 | omap_hsmmc_init(mmc); |
696 | 697 | ||