diff options
author | Andy Green <andy@warmcat.com> | 2011-05-30 10:43:08 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2011-10-29 04:37:08 -0400 |
commit | 029a1e73cd702e41ebfc07e11555592e0bb1693c (patch) | |
tree | 7aa558b972944657e0fadbbc20ff017a89fc52ad /arch/arm/plat-omap | |
parent | c23600a688dc71f4312f83cb0f23a736e1578a5e (diff) |
I2C: OMAP2+: Pass flags up to omap i2c platform_data as well
This is how the driver can find the flags for its implementation
functionality in its platform_data
Cc: patches@linaro.org
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andy Green <andy.green@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/i2c.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c index 0d3eda77e7ce..90986690aa9c 100644 --- a/arch/arm/plat-omap/i2c.c +++ b/arch/arm/plat-omap/i2c.c | |||
@@ -141,6 +141,7 @@ static inline int omap2_i2c_add_bus(int bus_id) | |||
141 | struct omap_device *od; | 141 | struct omap_device *od; |
142 | char oh_name[MAX_OMAP_I2C_HWMOD_NAME_LEN]; | 142 | char oh_name[MAX_OMAP_I2C_HWMOD_NAME_LEN]; |
143 | struct omap_i2c_bus_platform_data *pdata; | 143 | struct omap_i2c_bus_platform_data *pdata; |
144 | struct omap_i2c_dev_attr *dev_attr; | ||
144 | 145 | ||
145 | omap2_i2c_mux_pins(bus_id); | 146 | omap2_i2c_mux_pins(bus_id); |
146 | 147 | ||
@@ -156,10 +157,14 @@ static inline int omap2_i2c_add_bus(int bus_id) | |||
156 | pdata = &i2c_pdata[bus_id - 1]; | 157 | pdata = &i2c_pdata[bus_id - 1]; |
157 | /* | 158 | /* |
158 | * pass the hwmod class's CPU-specific knowledge of I2C IP revision in | 159 | * pass the hwmod class's CPU-specific knowledge of I2C IP revision in |
159 | * use up to the OMAP I2C driver via platform data | 160 | * use, and functionality implementation flags, up to the OMAP I2C |
161 | * driver via platform data | ||
160 | */ | 162 | */ |
161 | pdata->rev = oh->class->rev; | 163 | pdata->rev = oh->class->rev; |
162 | 164 | ||
165 | dev_attr = (struct omap_i2c_dev_attr *)oh->dev_attr; | ||
166 | pdata->flags = dev_attr->flags; | ||
167 | |||
163 | /* | 168 | /* |
164 | * When waiting for completion of a i2c transfer, we need to | 169 | * When waiting for completion of a i2c transfer, we need to |
165 | * set a wake up latency constraint for the MPU. This is to | 170 | * set a wake up latency constraint for the MPU. This is to |