diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-28 17:03:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-28 17:03:14 -0400 |
commit | 0fe41b8982001cd14ee2c77cd776735a5024e98b (patch) | |
tree | 83e65d595c413d55259ea14fb97748ce5efe5707 /arch/arm/mach-omap2/board-omap3beagle.c | |
parent | eedf2c5296a8dfaaf9aec1a938c1d3bd73159a30 (diff) | |
parent | 9759d22c8348343b0da4e25d6150c41712686c14 (diff) |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
[ARM] 5435/1: fix compile warning in sanity_check_meminfo()
[ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
[ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
[ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
imxfb: Fix TFT mode
i.MX21/27: remove ifdef CONFIG_FB_IMX
imxfb: add clock support
mxc: add arch_reset() function
clkdev: add possibility to get a clock based on the device name
i.MX1: remove fb support from mach-imx
[ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
Gemini: Add support for Teltonika RUT100
Gemini: gpiolib based GPIO support v2
MAINTAINERS: add myself as Gemini architecture maintainer
ARM: Add Gemini architecture v3
[ARM] OMAP: Fix compile for omap2_init_common_hw()
MAINTAINERS: Add myself as Faraday ARM core variant maintainer
ARM: Add support for FA526 v2
[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
[ARM] collie: fix two minor formatting nits
...
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 | ||