From 67adaae725cd788c4a7fb7cb595594a3c35195da Mon Sep 17 00:00:00 2001 From: Andy Green Date: Mon, 30 May 2011 07:43:08 -0700 Subject: [PATCH] --- yaml --- r: 272428 b: refs/heads/master c: 029a1e73cd702e41ebfc07e11555592e0bb1693c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/i2c.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d6a2dc83517c..5cf1cc40c401 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c23600a688dc71f4312f83cb0f23a736e1578a5e +refs/heads/master: 029a1e73cd702e41ebfc07e11555592e0bb1693c diff --git a/trunk/arch/arm/plat-omap/i2c.c b/trunk/arch/arm/plat-omap/i2c.c index 0d3eda77e7ce..90986690aa9c 100644 --- a/trunk/arch/arm/plat-omap/i2c.c +++ b/trunk/arch/arm/plat-omap/i2c.c @@ -141,6 +141,7 @@ static inline int omap2_i2c_add_bus(int bus_id) struct omap_device *od; char oh_name[MAX_OMAP_I2C_HWMOD_NAME_LEN]; struct omap_i2c_bus_platform_data *pdata; + struct omap_i2c_dev_attr *dev_attr; omap2_i2c_mux_pins(bus_id); @@ -156,10 +157,14 @@ static inline int omap2_i2c_add_bus(int bus_id) pdata = &i2c_pdata[bus_id - 1]; /* * pass the hwmod class's CPU-specific knowledge of I2C IP revision in - * use up to the OMAP I2C driver via platform data + * use, and functionality implementation flags, up to the OMAP I2C + * driver via platform data */ pdata->rev = oh->class->rev; + dev_attr = (struct omap_i2c_dev_attr *)oh->dev_attr; + pdata->flags = dev_attr->flags; + /* * When waiting for completion of a i2c transfer, we need to * set a wake up latency constraint for the MPU. This is to