diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index b7ccba2..558caff 100644
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -42,6 +42,7 @@
 #include <plat/pxa27x_keypad.h>
 #include <mach/pm.h>
 #include <mach/pxa27x-udc.h>
+#include <mach/udc.h>
 #include <mach/ohci.h>
 
 #include "generic.h"
@@ -699,6 +700,43 @@ static void z2_power_off(void)
 #endif
 
 /******************************************************************************
+ * USB Gadget
+ ******************************************************************************/
+#if defined(CONFIG_USB_GADGET_PXA27X)||defined(CONFIG_USB_GADGET_PXA27X_MODULE)
+static void z2_udc_command(int cmd)
+{
+	if (cmd == PXA2XX_UDC_CMD_CONNECT) {
+		printk("Connecting udc...\n");
+		UP2OCR = UP2OCR_HXOE | UP2OCR_DPPUE;
+	}
+	else if (cmd == PXA2XX_UDC_CMD_DISCONNECT) {
+		printk("Disconnecting udc...\n");
+		UP2OCR = UP2OCR_HXOE;
+	}
+}
+
+static int z2_udc_is_connected(void)
+{
+	return 1;
+}
+
+static struct pxa2xx_udc_mach_info z2_udc_info __initdata = {
+	.udc_is_connected	= z2_udc_is_connected,
+	.udc_command		= z2_udc_command,
+	.gpio_pullup		= -1,
+	.gpio_vbus		= -1,
+};
+
+static void __init z2_udc_init(void)
+{
+	pxa_set_udc_info(&z2_udc_info);
+}
+#else
+static inline void z2_udc_init(void) {}
+#endif
+
+#if 0
+/******************************************************************************
  * USB Host (OHCI)
  ******************************************************************************/
 static int z2_ohci_init(struct device *dev)
@@ -718,6 +756,7 @@ static struct pxaohci_platform_data z2_ohci_platform_data = {
 	.power_on_delay	= 10,
 	.power_budget	= 500,
 };
+#endif
 
 /******************************************************************************
  * Machine init
@@ -729,11 +768,12 @@ static void __init z2_init(void)
 	pxa_set_ffuart_info(NULL);
 	pxa_set_btuart_info(NULL);
 	pxa_set_stuart_info(NULL);
-	pxa_set_ohci_info(&z2_ohci_platform_data);
+	//pxa_set_ohci_info(&z2_ohci_platform_data);
 
 	z2_lcd_init();
 	z2_mmc_init();
 	z2_mkp_init();
+	z2_udc_init();
 	z2_i2c_init();
 	z2_spi_init();
 	z2_nor_init();