arch/arm/include/asm/sizes.h: cleanups

[karo-tx-uboot.git] / include / configs / omap1510.h

diff --git a/include/configs/omap1510.h b/include/configs/omap1510.h
index dfcb3672f20b1e69c3d10b09961b712c04e18a07..e6d9c7aa79cf608cac88f16bd5461ea95b33933d 100644 (file)
--- a/include/configs/omap1510.h
+++ b/include/configs/omap1510.h
@@ -28,7 +28,7 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <asm/arch/sizes.h>
+#include <asm/sizes.h>
 
 /*
   There are 2 sets of general I/O -->
@@ -179,7 +179,7 @@
 
 #define USB_OTG_CTRL                   0xFFFB040C
 #define USB_TRANSCEIVER_CTRL   0xFFFE1064
-#define PULL_DWN_CTRL_4        0xFFFE10AC
+#define PULL_DWN_CTRL_4 0xFFFE10AC
 #define PU_PD_SEL_0            0xFFFE10B4
 #define PU_PD_SEL_1            0xFFFE10B8
 #define PU_PD_SEL_2            0xFFFE10BC
@@ -221,6 +221,89 @@
 
 #define OMAP_LCD_CONTROL       TI925_LCD_CONTROL
 
+/* I2C Registers */
+
+#define I2C_BASE               0xfffb3800
+
+#define I2C_REV                        (I2C_BASE + 0x00)
+#define I2C_IE                 (I2C_BASE + 0x04)
+#define I2C_STAT               (I2C_BASE + 0x08)
+#define I2C_IV                 (I2C_BASE + 0x0c)
+#define I2C_BUF                        (I2C_BASE + 0x14)
+#define I2C_CNT                        (I2C_BASE + 0x18)
+#define I2C_DATA               (I2C_BASE + 0x1c)
+#define I2C_CON                        (I2C_BASE + 0x24)
+#define I2C_OA                 (I2C_BASE + 0x28)
+#define I2C_SA                 (I2C_BASE + 0x2c)
+#define I2C_PSC                        (I2C_BASE + 0x30)
+#define I2C_SCLL               (I2C_BASE + 0x34)
+#define I2C_SCLH               (I2C_BASE + 0x38)
+#define I2C_SYSTEST            (I2C_BASE + 0x3c)
+
+/* I2C masks */
+
+/* I2C Interrupt Enable Register (I2C_IE): */
+
+#define I2C_IE_XRDY_IE (1 << 4)        /* Transmit data ready interrupt enable */
+#define I2C_IE_RRDY_IE (1 << 3)        /* Receive data ready interrupt enable */
+#define I2C_IE_ARDY_IE (1 << 2)        /* Register access ready interrupt enable */
+#define I2C_IE_NACK_IE (1 << 1)        /* No acknowledgment interrupt enable */
+#define I2C_IE_AL_IE   (1 << 0)        /* Arbitration lost interrupt enable */
+
+/* I2C Status Register (I2C_STAT): */
+
+#define I2C_STAT_SBD   (1 << 15)       /* Single byte data */
+#define I2C_STAT_BB    (1 << 12)       /* Bus busy */
+#define I2C_STAT_ROVR  (1 << 11)       /* Receive overrun */
+#define I2C_STAT_XUDF  (1 << 10)       /* Transmit underflow */
+#define I2C_STAT_AAS   (1 << 9)        /* Address as slave */
+#define I2C_STAT_AD0   (1 << 8)        /* Address zero */
+#define I2C_STAT_XRDY  (1 << 4)        /* Transmit data ready */
+#define I2C_STAT_RRDY  (1 << 3)        /* Receive data ready */
+#define I2C_STAT_ARDY  (1 << 2)        /* Register access ready */
+#define I2C_STAT_NACK  (1 << 1)        /* No acknowledgment interrupt enable */
+#define I2C_STAT_AL    (1 << 0)        /* Arbitration lost interrupt enable */
+
+/* I2C Interrupt Vector Register (I2C_IV): */
+
+/* I2C Interrupt Code Register (I2C_INTCODE): */
+
+#define I2C_INTCODE_MASK       7
+#define I2C_INTCODE_NONE       0
+#define I2C_INTCODE_AL         1       /* Arbitration lost */
+#define I2C_INTCODE_NAK                2       /* No acknowledgement/general call */
+#define I2C_INTCODE_ARDY       3       /* Register access ready */
+#define I2C_INTCODE_RRDY       4       /* Rcv data ready */
+#define I2C_INTCODE_XRDY       5       /* Xmit data ready */
+
+/* I2C Buffer Configuration Register (I2C_BUF): */
+
+#define I2C_BUF_RDMA_EN                (1 << 15)       /* Receive DMA channel enable */
+#define I2C_BUF_XDMA_EN                (1 << 7)        /* Transmit DMA channel enable */
+
+/* I2C Configuration Register (I2C_CON): */
+
+#define I2C_CON_EN     (1 << 15)       /* I2C module enable */
+#define I2C_CON_BE     (1 << 14)       /* Big endian mode */
+#define I2C_CON_STB    (1 << 11)       /* Start byte mode (master mode only) */
+#define I2C_CON_MST    (1 << 10)       /* Master/slave mode */
+#define I2C_CON_TRX    (1 << 9)        /* Transmitter/receiver mode (master mode only) */
+#define I2C_CON_XA     (1 << 8)        /* Expand address */
+#define I2C_CON_RM     (1 << 2)        /* Repeat mode (master mode only) */
+#define I2C_CON_STP    (1 << 1)        /* Stop condition (master mode only) */
+#define I2C_CON_STT    (1 << 0)        /* Start condition (master mode only) */
+
+/* I2C System Test Register (I2C_SYSTEST): */
+
+#define I2C_SYSTEST_ST_EN      (1 << 15)       /* System test enable */
+#define I2C_SYSTEST_FREE       (1 << 14)       /* Free running mode (on breakpoint) */
+#define I2C_SYSTEST_TMODE_MASK (3 << 12)       /* Test mode select */
+#define I2C_SYSTEST_TMODE_SHIFT (12)           /* Test mode select */
+#define I2C_SYSTEST_SCL_I      (1 << 3)        /* SCL line sense input value */
+#define I2C_SYSTEST_SCL_O      (1 << 2)        /* SCL line drive output value */
+#define I2C_SYSTEST_SDA_I      (1 << 1)        /* SDA line sense input value */
+#define I2C_SYSTEST_SDA_O      (1 << 0)        /* SDA line drive output value */
+
 /*
  * MMC/SD Host Controller Registers
  */
@@ -399,7 +482,7 @@
 /*  CNTL_TIMER register bits */
 #define MPUTIM_FREE            (1<<6)
 #define MPUTIM_CLOCK_ENABLE    (1<<5)
-#define MPUTIM_PTV_MASK                (0x7<<PTV_BIT)
+#define MPUTIM_PTV_MASK                (0x7<<MPUTIM_PTV_BIT)
 #define MPUTIM_PTV_BIT         2
 #define MPUTIM_AR              (1<<1)
 #define MPUTIM_ST              (1<<0)
@@ -533,7 +616,6 @@ typedef struct {
 #define WDTIM_CONTROL_ST       BIT7
 
 
-
 /* ---------------------------------------------------------------------------
  *  Differentiating processor versions for those who care.
  * ---------------------------------------------------------------------------
@@ -697,3 +779,12 @@ int cpu_type(void);
 
 #define IRQ_LEVEL_INT          1
 #define IRQ_EDGE_INT           0
+
+/* Macros to access registers */
+#define outb(v,p) *(volatile u8 *) (p) = v
+#define outw(v,p) *(volatile u16 *) (p) = v
+#define outl(v,p) *(volatile u32 *) (p) = v
+
+#define inb(p) *(volatile u8 *) (p)
+#define inw(p) *(volatile u16 *) (p)
+#define inl(p) *(volatile u32 *) (p)