1
From b800580dbe280c17fefe098c44cdca14d56ec28c Mon Sep 17 00:00:00 2001
2
From: Peter Maydell <peter.maydell@linaro.org>
3
Date: Mon, 18 Feb 2013 16:58:26 +0000
4
Subject: [PATCH 16/70] omap_i2c: clean up revision numbers
7
hw/i2c/omap_i2c.c | 9 ++++++---
8
1 file changed, 6 insertions(+), 3 deletions(-)
10
diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
11
index f528b2b..7d47dc7 100644
12
--- a/hw/i2c/omap_i2c.c
13
+++ b/hw/i2c/omap_i2c.c
14
@@ -51,8 +51,11 @@ typedef struct OMAPI2CState {
18
-#define OMAP2_INTR_REV 0x34
19
-#define OMAP2_GC_REV 0x34
20
+/* I2C controller revision register values */
21
+#define OMAP1_INTR_REV 0x11
22
+#define OMAP2_INTR_REV 0x34
23
+#define OMAP3_INTR_REV 0x3c
24
+#define OMAP3630_INTR_REV 0x40
26
static void omap_i2c_interrupts_update(OMAPI2CState *s)
28
@@ -266,7 +269,7 @@ static void omap_i2c_write(void *opaque, hwaddr addr,
31
case 0x04: /* I2C_IE */
32
- s->mask = value & (s->revision < OMAP2_GC_REV ? 0x1f : 0x3f);
33
+ s->mask = value & (s->revision < OMAP2_INTR_REV ? 0x1f : 0x3f);
36
case 0x08: /* I2C_STAT */