aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-02-18 16:58:26 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-05-03 21:22:00 +0100
commitc0dcf09185e537f04cf4d583635c590acad24aba (patch)
tree6728f9f86b2048d09a8ba03f83e749e6f8db1740
parent5f56d9a39f530583aa64cec057703cda20eac4ac (diff)
omap_i2c: clean up revision numbers
-rw-r--r--hw/i2c/omap_i2c.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
index b6f544a22..86f8a1073 100644
--- a/hw/i2c/omap_i2c.c
+++ b/hw/i2c/omap_i2c.c
@@ -51,8 +51,11 @@ typedef struct OMAPI2CState {
uint16_t test;
} OMAPI2CState;
-#define OMAP2_INTR_REV 0x34
-#define OMAP2_GC_REV 0x34
+/* I2C controller revision register values */
+#define OMAP1_INTR_REV 0x11
+#define OMAP2_INTR_REV 0x34
+#define OMAP3_INTR_REV 0x3c
+#define OMAP3630_INTR_REV 0x40
static void omap_i2c_interrupts_update(OMAPI2CState *s)
{
@@ -270,7 +273,7 @@ static void omap_i2c_write(void *opaque, hwaddr addr,
return;
case 0x04: /* I2C_IE */
- s->mask = value & (s->revision < OMAP2_GC_REV ? 0x1f : 0x3f);
+ s->mask = value & (s->revision < OMAP2_INTR_REV ? 0x1f : 0x3f);
break;
case 0x08: /* I2C_STAT */