USB: musb: get rid of omap_readl/writel

[net-next-2.6.git] / drivers / usb / musb / omap2430.h

diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h
index fbede7798aedbab2a32db1e45780a0aea0b30483..40b3c02ae9f0812f0d6cba75dab78a39b41f6c40 100644 (file)
--- a/drivers/usb/musb/omap2430.h
+++ b/drivers/usb/musb/omap2430.h
@@ -10,47 +10,43 @@
 #ifndef __MUSB_OMAP243X_H__
 #define __MUSB_OMAP243X_H__
 
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
-#include <mach/hardware.h>
 #include <plat/usb.h>
 
 /*
  * OMAP2430-specific definitions
  */
 
-#define MENTOR_BASE_OFFSET     0
-#if    defined(CONFIG_ARCH_OMAP2430)
-#define        OMAP_HSOTG_BASE         (OMAP243X_HS_BASE)
-#elif  defined(CONFIG_ARCH_OMAP3430)
-#define        OMAP_HSOTG_BASE         (OMAP34XX_HSUSB_OTG_BASE)
-#endif
-#define OMAP_HSOTG(offset)     (OMAP_HSOTG_BASE + 0x400 + (offset))
-#define OTG_REVISION           OMAP_HSOTG(0x0)
-#define OTG_SYSCONFIG          OMAP_HSOTG(0x4)
+#define OTG_REVISION           0x400
+
+#define OTG_SYSCONFIG          0x404
 #      define  MIDLEMODE       12      /* bit position */
 #      define  FORCESTDBY              (0 << MIDLEMODE)
 #      define  NOSTDBY                 (1 << MIDLEMODE)
 #      define  SMARTSTDBY              (2 << MIDLEMODE)
+
 #      define  SIDLEMODE               3       /* bit position */
 #      define  FORCEIDLE               (0 << SIDLEMODE)
 #      define  NOIDLE                  (1 << SIDLEMODE)
 #      define  SMARTIDLE               (2 << SIDLEMODE)
+
 #      define  ENABLEWAKEUP            (1 << 2)
 #      define  SOFTRST                 (1 << 1)
 #      define  AUTOIDLE                (1 << 0)
-#define OTG_SYSSTATUS          OMAP_HSOTG(0x8)
+
+#define OTG_SYSSTATUS          0x408
 #      define  RESETDONE               (1 << 0)
-#define OTG_INTERFSEL          OMAP_HSOTG(0xc)
+
+#define OTG_INTERFSEL          0x40c
 #      define  EXTCP                   (1 << 2)
-#      define  PHYSEL          0       /* bit position */
+#      define  PHYSEL                  0       /* bit position */
 #      define  UTMI_8BIT               (0 << PHYSEL)
 #      define  ULPI_12PIN              (1 << PHYSEL)
 #      define  ULPI_8PIN               (2 << PHYSEL)
-#define OTG_SIMENABLE          OMAP_HSOTG(0x10)
+
+#define OTG_SIMENABLE          0x410
 #      define  TM1                     (1 << 0)
-#define OTG_FORCESTDBY         OMAP_HSOTG(0x14)
-#      define  ENABLEFORCE             (1 << 0)
 
-#endif /* CONFIG_ARCH_OMAP2430 */
+#define OTG_FORCESTDBY         0x414
+#      define  ENABLEFORCE             (1 << 0)
 
 #endif /* __MUSB_OMAP243X_H__ */