summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0070-I2C-OMAP2-Introduce-I2C-IP-versioning-constants.patch
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2013-09-28 16:37:39 -0400
committerDenys Dmytriyenko <denys@ti.com>2013-09-30 16:36:04 -0400
commitc168b9dca4ec2b10df5c67fc8d0db4b57eb822f7 (patch)
treec3f254bd317e699f56d8abda4e6bc852fc1fbb8a /recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0070-I2C-OMAP2-Introduce-I2C-IP-versioning-constants.patch
parent8c96f41ba6e3160d0826e112599285cf64541257 (diff)
downloadmeta-ti-c168b9dca4ec2b10df5c67fc8d0db4b57eb822f7.tar.gz
linux-3.0: remove old beagleboard-specific 3.0 and 3.1rc kernel recipes
Beagleboard is supported by newer 3.2 and 3.3.7 kernel recipes. Signed-off-by: Denys Dmytriyenko <denys@ti.com> Acked-by: Franklin Cooper Jr. <fcooper@ti.com>
Diffstat (limited to 'recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0070-I2C-OMAP2-Introduce-I2C-IP-versioning-constants.patch')
-rw-r--r--recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0070-I2C-OMAP2-Introduce-I2C-IP-versioning-constants.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0070-I2C-OMAP2-Introduce-I2C-IP-versioning-constants.patch b/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0070-I2C-OMAP2-Introduce-I2C-IP-versioning-constants.patch
deleted file mode 100644
index 9c4b51c9..00000000
--- a/recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0070-I2C-OMAP2-Introduce-I2C-IP-versioning-constants.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From 109f56f616221cb632ce98b5da05420f2099eff1 Mon Sep 17 00:00:00 2001
2From: Andy Green <andy@warmcat.com>
3Date: Sun, 10 Jul 2011 05:27:14 -0600
4Subject: [PATCH 070/149] I2C: OMAP2+: Introduce I2C IP versioning constants
5
6These represent the two kinds of (incompatible) OMAP I2C
7peripheral unit in use so far.
8
9The constants are in linux/i2c-omap.h so the omap i2c driver can have
10them too.
11
12Cc: patches@linaro.org
13Cc: Ben Dooks <ben-linux@fluff.org>
14Reported-by: Peter Maydell <peter.maydell@linaro.org>
15Signed-off-by: Andy Green <andy.green@linaro.org>
16Signed-off-by: Tony Lindgren <tony@atomide.com>
17Signed-off-by: Kevin Hilman <khilman@ti.com>
18Signed-off-by: Paul Walmsley <paul@pwsan.com>
19---
20 arch/arm/plat-omap/include/plat/i2c.h | 1 +
21 include/linux/i2c-omap.h | 12 ++++++++++++
22 2 files changed, 13 insertions(+), 0 deletions(-)
23
24diff --git a/arch/arm/plat-omap/include/plat/i2c.h b/arch/arm/plat-omap/include/plat/i2c.h
25index 4c108f5..fd75dad 100644
26--- a/arch/arm/plat-omap/include/plat/i2c.h
27+++ b/arch/arm/plat-omap/include/plat/i2c.h
28@@ -22,6 +22,7 @@
29 #define __ASM__ARCH_OMAP_I2C_H
30
31 #include <linux/i2c.h>
32+#include <linux/i2c-omap.h>
33
34 #if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
35 extern int omap_register_i2c_bus(int bus_id, u32 clkrate,
36diff --git a/include/linux/i2c-omap.h b/include/linux/i2c-omap.h
37index 7472449..701886d 100644
38--- a/include/linux/i2c-omap.h
39+++ b/include/linux/i2c-omap.h
40@@ -3,6 +3,18 @@
41
42 #include <linux/platform_device.h>
43
44+/*
45+ * Version 2 of the I2C peripheral unit has a different register
46+ * layout and extra registers. The ID register in the V2 peripheral
47+ * unit on the OMAP4430 reports the same ID as the V1 peripheral
48+ * unit on the OMAP3530, so we must inform the driver which IP
49+ * version we know it is running on from platform / cpu-specific
50+ * code using these constants in the hwmod class definition.
51+ */
52+
53+#define OMAP_I2C_IP_VERSION_1 1
54+#define OMAP_I2C_IP_VERSION_2 2
55+
56 struct omap_i2c_bus_platform_data {
57 u32 clkrate;
58 void (*set_mpu_wkup_lat)(struct device *dev, long set);
59--
601.7.2.5
61