diff options
| author | Erik Gilling <konkers@android.com> | 2011-09-08 14:02:09 -0700 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2011-09-08 14:02:09 -0700 |
| commit | 9107d2b0023ed5862c032e90f850417294757767 (patch) | |
| tree | f0abe765f71dcbe16a4be4e836424356d6bce540 /arch/arm/plat-omap | |
| parent | e5a9a68d0a55d7ef23d16af3d6508bd5e36ddebf (diff) | |
| parent | 907c066b42634069ad7fbf599922a3e935bba092 (diff) | |
| download | kernel_samsung_tuna-9107d2b0023ed5862c032e90f850417294757767.zip kernel_samsung_tuna-9107d2b0023ed5862c032e90f850417294757767.tar.gz kernel_samsung_tuna-9107d2b0023ed5862c032e90f850417294757767.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/dmtimer.c | 8 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/dmtimer.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/mcpdm.h | 4 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/mmc.h | 3 |
4 files changed, 2 insertions, 15 deletions
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index bccbb30..4278e3c 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -573,8 +573,6 @@ int omap_dm_timer_start(struct omap_dm_timer *timer) spin_lock_irqsave(&timer->lock, flags); if (timer->loses_context) { - u32 ctx_loss_cnt_after; - __timer_enable(timer); if (omap_pm_was_context_lost(&timer->pdev->dev) && timer->context_saved) { @@ -705,12 +703,8 @@ int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload, spin_lock_irqsave(&timer->lock, flags); if (timer->loses_context) { - u32 ctx_loss_cnt_after; - __timer_enable(timer); - ctx_loss_cnt_after = - timer->get_context_loss_count(&timer->pdev->dev); - if ((ctx_loss_cnt_after != timer->ctx_loss_count) && + if (omap_pm_was_context_lost(&timer->pdev->dev) && timer->context_saved) { omap_timer_restore_context(timer); timer->context_saved = false; diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/arch/arm/plat-omap/include/plat/dmtimer.h index b2e391d..aaa676f 100644 --- a/arch/arm/plat-omap/include/plat/dmtimer.h +++ b/arch/arm/plat-omap/include/plat/dmtimer.h @@ -104,7 +104,6 @@ struct omap_dm_timer { struct platform_device *pdev; struct list_head node; - int (*get_context_loss_count)(struct device *dev); }; extern struct omap_dm_timer *gptimer_wakeup; @@ -118,7 +117,6 @@ struct dmtimer_platform_data { u32 needs_manual_reset:1; bool loses_context; - int (*get_context_loss_count)(struct device *dev); }; struct omap_dm_timer *omap_dm_timer_request(void); diff --git a/arch/arm/plat-omap/include/plat/mcpdm.h b/arch/arm/plat-omap/include/plat/mcpdm.h index 1ed2b8f..19ae03b 100644 --- a/arch/arm/plat-omap/include/plat/mcpdm.h +++ b/arch/arm/plat-omap/include/plat/mcpdm.h @@ -22,9 +22,7 @@ #include <linux/platform_device.h> struct omap_mcpdm_platform_data { - int (*device_enable) (struct platform_device *pdev); - int (*device_shutdown) (struct platform_device *pdev); - int (*device_idle) (struct platform_device *pdev); + bool (*was_context_lost)(struct device *dev); }; #endif diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h index d9edb6b..b95aabd 100644 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/arch/arm/plat-omap/include/plat/mmc.h @@ -61,9 +61,6 @@ struct omap_mmc_platform_data { int (*suspend)(struct device *dev, int slot); int (*resume)(struct device *dev, int slot); - /* Return context loss count due to PM states changing */ - int (*get_context_loss_count)(struct device *dev); - u64 dma_mask; /* Integrating attributes from the omap_hwmod layer */ |