Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / board-omap3evm.c

diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 017bb2f4f7d292a65acda7aafb29e20e5d7bbfc7..7d7b5bc8dc31a4ea7e1c858943fe6046ae58de0a 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -702,6 +702,9 @@ static void __init omap3_evm_init(void)
                omap_mux_init_gpio(21, OMAP_PIN_INPUT_PULLUP);
                ehci_pdata.reset_gpio_port[1] = 21;
 
+               /* EVM REV >= E can supply 500mA with EXTVBUS programming */
+               musb_board_data.power = 500;
+               musb_board_data.extvbus = 1;
        } else {
                /* setup EHCI phy reset on MDC */
                omap_mux_init_gpio(135, OMAP_PIN_OUTPUT);