From be58d79d82c6dd8d2930c13e03a4337952352023 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut@gmail.com>
Date: Wed, 10 Mar 2010 05:24:27 +0100
Subject: [PATCH 1/2] Voipac PXA270: UDC and UHC support

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
 arch/arm/mach-pxa/include/mach/vpac270.h |   15 +++++----
 arch/arm/mach-pxa/vpac270.c              |   47 ++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-pxa/include/mach/vpac270.h b/arch/arm/mach-pxa/include/mach/vpac270.h
index 1c9bee2..9f7b460 100644
--- a/arch/arm/mach-pxa/include/mach/vpac270.h
+++ b/arch/arm/mach-pxa/include/mach/vpac270.h
@@ -23,12 +23,13 @@
 #define	GPIO52_VPAC270_SD_READONLY	52
 #define	GPIO53_VPAC270_SD_DETECT_N	53
 
-#define	GPIO84_VPAC270_PCMCIA_CD		84
-#define	GPIO35_VPAC270_PCMCIA_RDY		35
-#define	GPIO107_VPAC270_PCMCIA_PPEN		107
-#define	GPIO11_VPAC270_PCMCIA_RESET		11
-#define	GPIO17_VPAC270_CF_CD			17
-#define	GPIO12_VPAC270_CF_RDY			12
-#define	GPIO16_VPAC270_CF_RESET			16
+#define	GPIO84_VPAC270_PCMCIA_CD	84
+#define	GPIO35_VPAC270_PCMCIA_RDY	35
+#define	GPIO107_VPAC270_PCMCIA_PPEN	107
+#define	GPIO11_VPAC270_PCMCIA_RESET	11
+#define	GPIO17_VPAC270_CF_CD		17
+#define	GPIO12_VPAC270_CF_RDY		12
+#define	GPIO16_VPAC270_CF_RESET		16
 
+#define	GPIO41_VPAC270_UDC_DETECT	41
 #endif
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c
index 0dacc70..2f7baa4 100644
--- a/arch/arm/mach-pxa/vpac270.c
+++ b/arch/arm/mach-pxa/vpac270.c
@@ -28,6 +28,9 @@
 #include <mach/vpac270.h>
 #include <mach/mmc.h>
 #include <mach/pxafb.h>
+#include <mach/ohci.h>
+#include <mach/pxa27x-udc.h>
+#include <mach/udc.h>
 
 #include "generic.h"
 #include "devices.h"
@@ -105,6 +108,14 @@ static unsigned long vpac270_pin_config[] __initdata = {
 	GPIO12_GPIO,	/* CF RDY */
 	GPIO16_GPIO,	/* CF RESET */
 
+	/* UHC */
+	GPIO88_USBH1_PWR,
+	GPIO89_USBH1_PEN,
+	GPIO119_USBH2_PWR,
+	GPIO120_USBH2_PEN,
+
+	/* UDC */
+	GPIO41_GPIO,
 };
 
 /******************************************************************************
@@ -234,6 +245,40 @@ static inline void vpac270_leds_init(void) {}
 #endif
 
 /******************************************************************************
+ * USB Host
+ ******************************************************************************/
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+static struct pxaohci_platform_data vpac270_ohci_info = {
+	.port_mode	= PMM_PERPORT_MODE,
+	.flags		= ENABLE_PORT1 | ENABLE_PORT2 |
+			POWER_CONTROL_LOW | POWER_SENSE_LOW,
+};
+
+static void __init vpac270_uhc_init(void)
+{
+	pxa_set_ohci_info(&vpac270_ohci_info);
+}
+#else
+static inline void vpac270_uhc_init(void) {}
+#endif
+
+/******************************************************************************
+ * USB Gadget
+ ******************************************************************************/
+#if defined(CONFIG_USB_GADGET_PXA27X)||defined(CONFIG_USB_GADGET_PXA27X_MODULE)
+static struct pxa2xx_udc_mach_info vpac270_udc_info __initdata = {
+	.gpio_vbus		= GPIO41_VPAC270_UDC_DETECT,
+};
+
+static void __init vpac270_udc_init(void)
+{
+	pxa_set_udc_info(&vpac270_udc_info);
+}
+#else
+static inline void vpac270_udc_init(void) {}
+#endif
+
+/******************************************************************************
  * Framebuffer
  ******************************************************************************/
 #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)
@@ -313,6 +358,8 @@ static void __init vpac270_init(void)
 	vpac270_nor_init();
 	vpac270_leds_init();
 	vpac270_keys_init();
+	vpac270_uhc_init();
+	vpac270_udc_init();
 }
 
 MACHINE_START(VPAC270, "Voipac PXA270")
-- 
1.7.0