diff options
author | Tony Lindgren <tony@atomide.com> | 2010-08-04 01:46:24 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 01:46:24 -0400 |
commit | 331d919af416b9b92428947ef8c535a3e24c6b31 (patch) | |
tree | 1f58dfe4ea6ed130f7b970f07cd7589864e9cbad /arch/arm/plat-omap/i2c.c | |
parent | 047b51fb208c716294b4682c904df8a3ad8b6a69 (diff) | |
parent | fb8ce14c7e16bd218decb3e1655c5d4ff08042f2 (diff) |
Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/i2c.c')
-rw-r--r-- | arch/arm/plat-omap/i2c.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c index eec2b4993c69..a5ce4f0aad35 100644 --- a/arch/arm/plat-omap/i2c.c +++ b/arch/arm/plat-omap/i2c.c | |||
@@ -138,6 +138,16 @@ static inline int omap1_i2c_add_bus(struct platform_device *pdev, int bus_id) | |||
138 | return platform_device_register(pdev); | 138 | return platform_device_register(pdev); |
139 | } | 139 | } |
140 | 140 | ||
141 | /* | ||
142 | * XXX This function is a temporary compatibility wrapper - only | ||
143 | * needed until the I2C driver can be converted to call | ||
144 | * omap_pm_set_max_dev_wakeup_lat() and handle a return code. | ||
145 | */ | ||
146 | static void omap_pm_set_max_mpu_wakeup_lat_compat(struct device *dev, long t) | ||
147 | { | ||
148 | omap_pm_set_max_mpu_wakeup_lat(dev, t); | ||
149 | } | ||
150 | |||
141 | static inline int omap2_i2c_add_bus(struct platform_device *pdev, int bus_id) | 151 | static inline int omap2_i2c_add_bus(struct platform_device *pdev, int bus_id) |
142 | { | 152 | { |
143 | struct resource *res; | 153 | struct resource *res; |
@@ -168,7 +178,7 @@ static inline int omap2_i2c_add_bus(struct platform_device *pdev, int bus_id) | |||
168 | struct omap_i2c_bus_platform_data *pd; | 178 | struct omap_i2c_bus_platform_data *pd; |
169 | 179 | ||
170 | pd = pdev->dev.platform_data; | 180 | pd = pdev->dev.platform_data; |
171 | pd->set_mpu_wkup_lat = omap_pm_set_max_mpu_wakeup_lat; | 181 | pd->set_mpu_wkup_lat = omap_pm_set_max_mpu_wakeup_lat_compat; |
172 | } | 182 | } |
173 | 183 | ||
174 | return platform_device_register(pdev); | 184 | return platform_device_register(pdev); |