Pull bugzilla-7880 into release branch

[mv-sheeva.git] / include / asm-arm / arch-s3c2410 / regs-udc.h

diff --git a/include/asm-arm/arch-s3c2410/regs-udc.h b/include/asm-arm/arch-s3c2410/regs-udc.h
index 487861d5b49a98745f27a9da429c91dad5f4b0fd..e1e9805d2d9a42454d14e2ac0f7bf3f729ed1b15 100644 (file)
--- a/include/asm-arm/arch-s3c2410/regs-udc.h
+++ b/include/asm-arm/arch-s3c2410/regs-udc.h
@@ -11,8 +11,7 @@
 #ifndef __ASM_ARCH_REGS_UDC_H
 #define __ASM_ARCH_REGS_UDC_H
 
-
-#define S3C2410_USBDREG(x) ((x) + S3C24XX_VA_USBDEV)
+#define S3C2410_USBDREG(x) (x)
 
 #define S3C2410_UDC_FUNC_ADDR_REG      S3C2410_USBDREG(0x0140)
 #define S3C2410_UDC_PWR_REG            S3C2410_USBDREG(0x0144)
@@ -76,7 +75,7 @@
 #define S3C2410_UDC_OUT_FIFO_CNT1_REG  S3C2410_USBDREG(0x0198)
 #define S3C2410_UDC_OUT_FIFO_CNT2_REG  S3C2410_USBDREG(0x019c)
 
-
+#define S3C2410_UDC_FUNCADDR_UPDATE    (1<<7)
 
 #define S3C2410_UDC_PWR_ISOUP          (1<<7) // R/W
 #define S3C2410_UDC_PWR_RESET          (1<<3) // R
@@ -136,10 +135,6 @@
 #define S3C2410_UDC_OCSR2_ISO          (1<<6) // R/W
 #define S3C2410_UDC_OCSR2_DMAIEN       (1<<5) // R/W
 
-#define S3C2410_UDC_SETIX(x)       \
-       __raw_writel(S3C2410_UDC_INDEX_ ## x, S3C2410_UDC_INDEX_REG);
-
-
 #define S3C2410_UDC_EP0_CSR_OPKRDY     (1<<0)
 #define S3C2410_UDC_EP0_CSR_IPKRDY     (1<<1)
 #define S3C2410_UDC_EP0_CSR_SENTSTL    (1<<2)