diff options
| author | Benoit Cousson <b-cousson@ti.com> | 2011-08-09 16:54:19 +0200 | 
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-10-04 09:52:23 -0700 | 
| commit | b7b5bc91d422ff51ff84dfd5949e9d2f17a550c8 (patch) | |
| tree | 2266e8185ed35a7f76de97f35f704db5e3561c5d | |
| parent | 766e7afc38754e4bdcbf948fa523af8999a6296f (diff) | |
| download | olio-linux-3.10-b7b5bc91d422ff51ff84dfd5949e9d2f17a550c8.tar.xz olio-linux-3.10-b7b5bc91d422ff51ff84dfd5949e9d2f17a550c8.zip  | |
ARM: OMAP: omap_device: Create a default omap_device_pm_latency
Most devices are using the same default omap_device_pm_latency structure
during device built. In order to avoid the duplication of the same
structure everywhere, add a default structure that will be used if
the device does not have an explicit one.
Next patches will clean the duplicated structures.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
| -rw-r--r-- | arch/arm/plat-omap/omap_device.c | 19 | 
1 files changed, 18 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index f832f92013b..cd8d9778b14 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -97,6 +97,14 @@  static int omap_device_register(struct platform_device *pdev);  static int omap_early_device_register(struct platform_device *pdev); +static struct omap_device_pm_latency omap_default_latency[] = { +	{ +		.deactivate_func = omap_device_idle_hwmods, +		.activate_func   = omap_device_enable_hwmods, +		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST, +	} +}; +  /* Private functions */  /** @@ -510,8 +518,17 @@ struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,  	if (ret)  		goto odbs_exit3; -	od->pm_lats = pm_lats; +	if (!pm_lats) { +		pm_lats = omap_default_latency; +		pm_lats_cnt = ARRAY_SIZE(omap_default_latency); +	} +  	od->pm_lats_cnt = pm_lats_cnt; +	od->pm_lats = kmemdup(pm_lats, +			sizeof(struct omap_device_pm_latency) * pm_lats_cnt, +			GFP_KERNEL); +	if (!od->pm_lats) +		goto odbs_exit3;  	for (i = 0; i < oh_cnt; i++) {  		hwmods[i]->od = od;  |