diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 6031e179926b..e096f776f996 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
@@ -22,31 +22,34 @@ | |||
22 | #include <linux/spi/spi.h> | 22 | #include <linux/spi/spi.h> |
23 | #include <linux/spi/ads7846.h> | 23 | #include <linux/spi/ads7846.h> |
24 | #include <linux/i2c/twl4030.h> | 24 | #include <linux/i2c/twl4030.h> |
25 | #include <linux/io.h> | ||
25 | 26 | ||
26 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
27 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
28 | #include <asm/mach/arch.h> | 29 | #include <asm/mach/arch.h> |
29 | #include <asm/mach/map.h> | 30 | #include <asm/mach/map.h> |
30 | 31 | ||
31 | #include <mach/board-ldp.h> | ||
32 | #include <mach/mcspi.h> | 32 | #include <mach/mcspi.h> |
33 | #include <mach/gpio.h> | 33 | #include <mach/gpio.h> |
34 | #include <mach/board.h> | 34 | #include <mach/board.h> |
35 | #include <mach/common.h> | 35 | #include <mach/common.h> |
36 | #include <mach/gpmc.h> | 36 | #include <mach/gpmc.h> |
37 | 37 | ||
38 | #include <asm/io.h> | ||
39 | #include <asm/delay.h> | 38 | #include <asm/delay.h> |
40 | #include <mach/control.h> | 39 | #include <mach/control.h> |
40 | #include <mach/usb.h> | ||
41 | 41 | ||
42 | #include "mmc-twl4030.h" | 42 | #include "mmc-twl4030.h" |
43 | 43 | ||
44 | #define SDP3430_SMC91X_CS 3 | 44 | #define LDP_SMC911X_CS 1 |
45 | #define LDP_SMC911X_GPIO 152 | ||
46 | #define DEBUG_BASE 0x08000000 | ||
47 | #define LDP_ETHR_START DEBUG_BASE | ||
45 | 48 | ||
46 | static struct resource ldp_smc911x_resources[] = { | 49 | static struct resource ldp_smc911x_resources[] = { |
47 | [0] = { | 50 | [0] = { |
48 | .start = OMAP34XX_ETHR_START, | 51 | .start = LDP_ETHR_START, |
49 | .end = OMAP34XX_ETHR_START + SZ_4K, | 52 | .end = LDP_ETHR_START + SZ_4K, |
50 | .flags = IORESOURCE_MEM, | 53 | .flags = IORESOURCE_MEM, |
51 | }, | 54 | }, |
52 | [1] = { | 55 | [1] = { |
@@ -98,7 +101,7 @@ static inline void __init ldp_init_smc911x(void) | |||
98 | 101 | ||
99 | static void __init omap_ldp_init_irq(void) | 102 | static void __init omap_ldp_init_irq(void) |
100 | { | 103 | { |
101 | omap2_init_common_hw(); | 104 | omap2_init_common_hw(NULL); |
102 | omap_init_irq(); | 105 | omap_init_irq(); |
103 | omap_gpio_init(); | 106 | omap_gpio_init(); |
104 | ldp_init_smc911x(); | 107 | ldp_init_smc911x(); |
@@ -162,6 +165,7 @@ static void __init omap_ldp_init(void) | |||
162 | omap_board_config_size = ARRAY_SIZE(ldp_config); | 165 | omap_board_config_size = ARRAY_SIZE(ldp_config); |
163 | omap_serial_init(); | 166 | omap_serial_init(); |
164 | twl4030_mmc_init(mmc); | 167 | twl4030_mmc_init(mmc); |
168 | usb_musb_init(); | ||
165 | } | 169 | } |
166 | 170 | ||
167 | static void __init omap_ldp_map_io(void) | 171 | static void __init omap_ldp_map_io(void) |