1 files changed, 6 insertions, 3 deletions

diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 017bb2f4f7d2..81bba194b030 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -600,6 +600,7 @@ struct ads7846_platform_data ads7846_config = {
         .get_pendown_state      = ads7846_get_pendown_state,
         .keep_vref_on           = 1,
         .settle_delay_usecs     = 150,
+        .wakeup                         = true,
 };
 
 static struct omap2_mcspi_device_config ads7846_mcspi_config = {
@@ -651,11 +652,10 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = {
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
         OMAP3_MUX(SYS_NIRQ, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP |
-                                OMAP_PIN_OFF_INPUT_PULLUP |
+                                OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW |
                                 OMAP_PIN_OFF_WAKEUPENABLE),
         OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |
-                                OMAP_PIN_OFF_INPUT_PULLUP |
-                                OMAP_PIN_OFF_WAKEUPENABLE),
+                                OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
         { .reg_offset = OMAP_MUX_TERMINATOR },
 };
 #else
@@ -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);