diff options
| author | Simone Willett <swillett@nvidia.com> | 2012-02-15 14:22:37 -0800 |
|---|---|---|
| committer | Lokesh Pathak <lpathak@nvidia.com> | 2012-02-16 05:07:10 -0800 |
| commit | ae1f9efe299b2f24680b04e429c76dec3240b60d (patch) | |
| tree | 3340a6e656ec9c6e920b534fb6a4413fc8408afd /drivers/video/tegra/host/nvhost_acm.h | |
| parent | 681c2688fc5a7001a2c0e568790e04be67552efd (diff) | |
Revert "video: tegra: host: use runtime pm for clock management"
This reverts commit 961c60fe7213d92793d6072abc16f58721a33fed
Change-Id: I8ef0fbaee30e94c78b8df609f729953fee6d1583
Reviewed-on: http://git-master/r/84135
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Tested-by: Lokesh Pathak <lpathak@nvidia.com>
Reviewed-by: Lokesh Pathak <lpathak@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/host/nvhost_acm.h')
| -rw-r--r-- | drivers/video/tegra/host/nvhost_acm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/tegra/host/nvhost_acm.h b/drivers/video/tegra/host/nvhost_acm.h index 68b18f6f65eb..06a11ff840f2 100644 --- a/drivers/video/tegra/host/nvhost_acm.h +++ b/drivers/video/tegra/host/nvhost_acm.h @@ -28,13 +28,12 @@ #include <linux/mutex.h> #include <linux/clk.h> #include <linux/nvhost.h> -#include <linux/pm_runtime.h> /* Sets clocks and powergating state for a module */ int nvhost_module_init(struct nvhost_device *ndev); void nvhost_module_deinit(struct nvhost_device *dev); int nvhost_module_suspend(struct nvhost_device *dev, bool system_suspend); -void nvhost_module_resume(struct nvhost_device *dev); + void nvhost_module_reset(struct nvhost_device *dev); void nvhost_module_busy(struct nvhost_device *dev); void nvhost_module_idle_mult(struct nvhost_device *dev, int refs); @@ -51,7 +50,7 @@ int nvhost_module_set_rate(struct nvhost_device *dev, void *priv, static inline bool nvhost_module_powered(struct nvhost_device *dev) { - return !pm_runtime_suspended(&dev->dev); + return dev->powerstate == NVHOST_POWER_STATE_RUNNING; } static inline void nvhost_module_idle(struct nvhost_device *dev) @@ -59,4 +58,5 @@ static inline void nvhost_module_idle(struct nvhost_device *dev) nvhost_module_idle_mult(dev, 1); } + #endif |