diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2011-12-29 16:03:51 +0200 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-01-12 09:56:22 -0800 |
| commit | 10c8828c7b2bf26ab6ec9feee860fc5cc8eb2ce7 (patch) | |
| tree | 6e1c0b97ddd63f64eee95c313f46fb49940edc25 /drivers/video/tegra/dc | |
| parent | 6bc2684e40093d8859b90d96c0d9957e1472c5c9 (diff) | |
video: tegra: host: Move device data to nvhost_device
Move all device data from nvhost_channeldesc, nvhost_moduledesc and
nvhost_module to nvhost_device. nvhost_devices are also assigned into
a hierarchy to prepare for implementation of runtime power management.
Change-Id: I1e18daae8fe538086cd1f453d316e0f73e9d7d92
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/72844
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Reviewed-on: http://git-master/r/74560
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc')
| -rw-r--r-- | drivers/video/tegra/dc/dc.c | 2 | ||||
| -rw-r--r-- | drivers/video/tegra/dc/dc_priv.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index 87ef9c4395dc..98c518ad9b14 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -2110,7 +2110,7 @@ static irqreturn_t tegra_dc_irq(int irq, void *ptr) unsigned long val; unsigned long underflow_mask; - if (!nvhost_module_powered(&dc->ndev->host->mod)) { + if (!nvhost_module_powered(dc->ndev->host->dev)) { WARN(1, "IRQ when DC not powered!\n"); tegra_dc_io_start(dc); status = tegra_dc_readl(dc, DC_CMD_INT_STATUS); diff --git a/drivers/video/tegra/dc/dc_priv.h b/drivers/video/tegra/dc/dc_priv.h index 994edfe46d31..ca25265bfdb8 100644 --- a/drivers/video/tegra/dc/dc_priv.h +++ b/drivers/video/tegra/dc/dc_priv.h @@ -142,25 +142,25 @@ struct tegra_dc { static inline void tegra_dc_io_start(struct tegra_dc *dc) { - nvhost_module_busy(&dc->ndev->host->mod); + nvhost_module_busy(dc->ndev->host->dev); } static inline void tegra_dc_io_end(struct tegra_dc *dc) { - nvhost_module_idle(&dc->ndev->host->mod); + nvhost_module_idle(dc->ndev->host->dev); } static inline unsigned long tegra_dc_readl(struct tegra_dc *dc, unsigned long reg) { - BUG_ON(!nvhost_module_powered(&dc->ndev->host->mod)); + BUG_ON(!nvhost_module_powered(dc->ndev->host->dev)); return readl(dc->base + reg * 4); } static inline void tegra_dc_writel(struct tegra_dc *dc, unsigned long val, unsigned long reg) { - BUG_ON(!nvhost_module_powered(&dc->ndev->host->mod)); + BUG_ON(!nvhost_module_powered(dc->ndev->host->dev)); writel(val, dc->base + reg * 4); } |