Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d72fe788 authored by Andy Green's avatar Andy Green Committed by Paul Walmsley
Browse files

I2C: OMAP2+: Introduce I2C IP versioning constants 



These represent the two kinds of (incompatible) OMAP I2C
peripheral unit in use so far.

The constants are in linux/i2c-omap.h so the omap i2c driver can have
them too.

Cc: patches@linaro.org
Cc: Ben Dooks <ben-linux@fluff.org>
Reported-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarAndy Green <andy.green@linaro.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 73002721

arch/arm/plat-omap/include/plat/i2c.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#define __ASM__ARCH_OMAP_I2C_H

#define __ASM__ARCH_OMAP_I2C_H





#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/i2c-omap.h>





#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)

#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)

extern int omap_register_i2c_bus(int bus_id, u32 clkrate,

extern int omap_register_i2c_bus(int bus_id, u32 clkrate,

include/linux/i2c-omap.h

+12 −0
Original line number Original line Diff line number Diff line
@@ -3,6 +3,18 @@ 




#include <linux/platform_device.h>

#include <linux/platform_device.h>





/*

 * 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 {

struct omap_i2c_bus_platform_data {

	u32		clkrate;

	u32		clkrate;

	void		(*set_mpu_wkup_lat)(struct device *dev, long set);

	void		(*set_mpu_wkup_lat)(struct device *dev, long set);