diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-10-04 13:54:30 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-10-04 13:54:30 -0700 |
| commit | 3ae3e253db7385238dd9d6c67c085afa3e770a56 (patch) | |
| tree | c3f93d9742c4654c9d10af829db1122bac0b6f6f /arch/arm/mach-omap2/sr_device.c | |
| parent | c541c15fb5ab48c47bc9b90121538fd30d152f23 (diff) | |
| parent | 476b679a5d785d1244f6b43ad26877acf278cd18 (diff) | |
| download | blackbird-op-linux-3ae3e253db7385238dd9d6c67c085afa3e770a56.tar.gz blackbird-op-linux-3ae3e253db7385238dd9d6c67c085afa3e770a56.zip | |
Merge branch 'for_3.2/3_omap_devicetree' of git://gitorious.org/omap-pm/linux into dt
Diffstat (limited to 'arch/arm/mach-omap2/sr_device.c')
| -rw-r--r-- | arch/arm/mach-omap2/sr_device.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c index eba9f9a8ab65..9f43fcc05d3e 100644 --- a/arch/arm/mach-omap2/sr_device.c +++ b/arch/arm/mach-omap2/sr_device.c @@ -31,14 +31,6 @@ static bool sr_enable_on_init; -static struct omap_device_pm_latency omap_sr_latency[] = { - { - .deactivate_func = omap_device_idle_hwmods, - .activate_func = omap_device_enable_hwmods, - .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST - }, -}; - /* Read EFUSE values from control registers for OMAP3430 */ static void __init sr_set_nvalues(struct omap_volt_data *volt_data, struct omap_sr_data *sr_data) @@ -121,8 +113,7 @@ static int sr_dev_init(struct omap_hwmod *oh, void *user) sr_data->enable_on_init = sr_enable_on_init; pdev = omap_device_build(name, i, oh, sr_data, sizeof(*sr_data), - omap_sr_latency, - ARRAY_SIZE(omap_sr_latency), 0); + NULL, 0, 0); if (IS_ERR(pdev)) pr_warning("%s: Could not build omap_device for %s: %s.\n\n", __func__, name, oh->name); |
