From d4c9cacded297ab04a8f62907efc790469c752bc Mon Sep 17 00:00:00 2001 From: Andy Green Date: Sun, 10 Jul 2011 05:27:14 -0600 Subject: [PATCH] --- yaml --- r: 260491 b: refs/heads/master c: d72fe7883f9f835011cb581aea13e91c6fa2e31d h: refs/heads/master i: 260489: b91d078c880fa29139322c919055e5f1457fc5ff 260487: 52340626cd1ec7fcba61d4feb2a1d712ff322acb v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/include/plat/i2c.h | 1 + trunk/include/linux/i2c-omap.h | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 84b1b17c1c40..49a28f8bf328 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 730027216079ef4ab9850a4367ef665554a6ef73 +refs/heads/master: d72fe7883f9f835011cb581aea13e91c6fa2e31d diff --git a/trunk/arch/arm/plat-omap/include/plat/i2c.h b/trunk/arch/arm/plat-omap/include/plat/i2c.h index 4c108f54c556..fd75dadfa89c 100644 --- a/trunk/arch/arm/plat-omap/include/plat/i2c.h +++ b/trunk/arch/arm/plat-omap/include/plat/i2c.h @@ -22,6 +22,7 @@ #define __ASM__ARCH_OMAP_I2C_H #include +#include #if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE) extern int omap_register_i2c_bus(int bus_id, u32 clkrate, diff --git a/trunk/include/linux/i2c-omap.h b/trunk/include/linux/i2c-omap.h index 7472449cbb74..701886da76c7 100644 --- a/trunk/include/linux/i2c-omap.h +++ b/trunk/include/linux/i2c-omap.h @@ -3,6 +3,18 @@ #include +/* + * Version 2 of the I2C peripheral unit has a different register + * layout and extra registers. The ID register in the V2 peripheral + * unit on the OMAP4430 reports the same ID as the V1 peripheral + * unit on the OMAP3530, so we must inform the driver which IP + * version we know it is running on from platform / cpu-specific + * code using these constants in the hwmod class definition. + */ + +#define OMAP_I2C_IP_VERSION_1 1 +#define OMAP_I2C_IP_VERSION_2 2 + struct omap_i2c_bus_platform_data { u32 clkrate; void (*set_mpu_wkup_lat)(struct device *dev, long set);