diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index e39cd2c46cfa..744740ae1b9c 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <mach/gpmc.h> | 41 | #include <mach/gpmc.h> |
42 | #include <mach/nand.h> | 42 | #include <mach/nand.h> |
43 | #include <mach/mux.h> | 43 | #include <mach/mux.h> |
44 | #include <mach/usb.h> | ||
44 | 45 | ||
45 | #include "mmc-twl4030.h" | 46 | #include "mmc-twl4030.h" |
46 | 47 | ||
@@ -175,9 +176,6 @@ static int __init omap3_beagle_i2c_init(void) | |||
175 | { | 176 | { |
176 | omap_register_i2c_bus(1, 2600, beagle_i2c_boardinfo, | 177 | omap_register_i2c_bus(1, 2600, beagle_i2c_boardinfo, |
177 | ARRAY_SIZE(beagle_i2c_boardinfo)); | 178 | ARRAY_SIZE(beagle_i2c_boardinfo)); |
178 | #ifdef CONFIG_I2C2_OMAP_BEAGLE | ||
179 | omap_register_i2c_bus(2, 400, NULL, 0); | ||
180 | #endif | ||
181 | /* Bus 3 is attached to the DVI port where devices like the pico DLP | 179 | /* Bus 3 is attached to the DVI port where devices like the pico DLP |
182 | * projector don't work reliably with 400kHz */ | 180 | * projector don't work reliably with 400kHz */ |
183 | omap_register_i2c_bus(3, 100, NULL, 0); | 181 | omap_register_i2c_bus(3, 100, NULL, 0); |
@@ -186,7 +184,7 @@ static int __init omap3_beagle_i2c_init(void) | |||
186 | 184 | ||
187 | static void __init omap3_beagle_init_irq(void) | 185 | static void __init omap3_beagle_init_irq(void) |
188 | { | 186 | { |
189 | omap2_init_common_hw(); | 187 | omap2_init_common_hw(NULL); |
190 | omap_init_irq(); | 188 | omap_init_irq(); |
191 | omap_gpio_init(); | 189 | omap_gpio_init(); |
192 | } | 190 | } |
@@ -316,6 +314,7 @@ static void __init omap3_beagle_init(void) | |||
316 | /* REVISIT leave DVI powered down until it's needed ... */ | 314 | /* REVISIT leave DVI powered down until it's needed ... */ |
317 | gpio_direction_output(170, true); | 315 | gpio_direction_output(170, true); |
318 | 316 | ||
317 | usb_musb_init(); | ||
319 | omap3beagle_flash_init(); | 318 | omap3beagle_flash_init(); |
320 | } | 319 | } |
321 | 320 | ||