Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (75 commits)
  omap3: Fix OMAP35XX_REV macros
  omap: serial: fix non-empty uart fifo read abort
  omap3: Zoom2/3: Update hsmmc board config params
  omap3 : Enable TWL4030 Keypad for Zoom2 and Zoom3 boards
  omap3: id code detection 3525 vs 3515
  omap3: rx51: Use wl1251 in SPI mode 3
  omap3: zoom2/3: make MMC slot work again
  omap1: htcherald: Update defconfig to include mux support
  omap1: LCD_DMA: Use some define rather than a hexadecimal
  omap: header: remove unused data-type
  omap: arch/arm/plat-omap/devices.c - sort alphabetically
  omap: Correcting GPMC_CONFIG1_DEVICETYPE_NAND
  OMAP3: serial - allow platforms specify which UARTs to initialize
  omap3: cm-t35: add mux initialization
  OMAP4: Sync up omap4430 defconfig
  OMAP4: Remove the secondary wait loop
  OMAP4: AuxCoreBoot registers only accessible in secure mode
  OMAP4: Fix SRAM base and size
  OMAP4: Fix cpu detection
  omap3: pandora: board file updates for .33
  ...

1 files changed, 64 insertions, 0 deletions

diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c
index 5f28a5ceacac..e36639f66150 100644
--- a/arch/arm/mach-omap1/board-htcherald.c
+++ b/arch/arm/mach-omap1/board-htcherald.c
@@ -39,6 +39,7 @@
 #include <plat/common.h>
 #include <plat/board.h>
 #include <plat/keypad.h>
+#include <plat/usb.h>
 
 #include <mach/irqs.h>
 
@@ -140,6 +141,15 @@ static struct platform_device kp_device = {
         .resource       = kp_resources,
 };
 
+/* USB Device */
+static struct omap_usb_config htcherald_usb_config __initdata = {
+        .otg = 0,
+        .register_host = 0,
+        .register_dev  = 1,
+        .hmc_mode = 4,
+        .pins[0] = 2,
+};
+
 /* LCD Device resources */
 static struct platform_device lcd_device = {
         .name           = "lcd_htcherald",
@@ -214,6 +224,57 @@ static void __init htcherald_disable_watchdog(void)
         }
 }
 
+#define HTCHERALD_GPIO_USB_EN1 33
+#define HTCHERALD_GPIO_USB_EN2 73
+#define HTCHERALD_GPIO_USB_DM  35
+#define HTCHERALD_GPIO_USB_DP  36
+
+static void __init htcherald_usb_enable(void)
+{
+        unsigned int tries = 20;
+        unsigned int value = 0;
+
+        /* Request the GPIOs we need to control here */
+        if (gpio_request(HTCHERALD_GPIO_USB_EN1, "herald_usb") < 0)
+                goto err1;
+
+        if (gpio_request(HTCHERALD_GPIO_USB_EN2, "herald_usb") < 0)
+                goto err2;
+
+        if (gpio_request(HTCHERALD_GPIO_USB_DM, "herald_usb") < 0)
+                goto err3;
+
+        if (gpio_request(HTCHERALD_GPIO_USB_DP, "herald_usb") < 0)
+                goto err4;
+
+        /* force USB_EN GPIO to 0 */
+        do {
+                /* output low */
+                gpio_direction_output(HTCHERALD_GPIO_USB_EN1, 0);
+        } while ((value = gpio_get_value(HTCHERALD_GPIO_USB_EN1)) == 1 &&
+                        --tries);
+
+        if (value == 1)
+                printk(KERN_WARNING "Unable to reset USB, trying to continue\n");
+
+        gpio_direction_output(HTCHERALD_GPIO_USB_EN2, 0); /* output low */
+        gpio_direction_input(HTCHERALD_GPIO_USB_DM); /* input */
+        gpio_direction_input(HTCHERALD_GPIO_USB_DP); /* input */
+
+        goto done;
+
+err4:
+        gpio_free(HTCHERALD_GPIO_USB_DM);
+err3:
+        gpio_free(HTCHERALD_GPIO_USB_EN2);
+err2:
+        gpio_free(HTCHERALD_GPIO_USB_EN1);
+err1:
+        printk(KERN_ERR "Unabled to request GPIO for USB\n");
+done:
+        printk(KERN_INFO "USB setup complete.\n");
+}
+
 static void __init htcherald_init(void)
 {
         printk(KERN_INFO "HTC Herald init.\n");
@@ -225,6 +286,9 @@ static void __init htcherald_init(void)
         platform_add_devices(devices, ARRAY_SIZE(devices));
 
         htcherald_disable_watchdog();
+
+        htcherald_usb_enable();
+        omap_usb_init(&htcherald_usb_config);
 }
 
 static void __init htcherald_init_irq(void)