diff options
author | Omar Ramirez Luna <omar.luna@linaro.org> | 2012-11-19 20:05:51 -0500 |
---|---|---|
committer | Joerg Roedel <joro@8bytes.org> | 2012-12-03 12:48:23 -0500 |
commit | ebf7cda0f92effd8169b831fae81e9437dce1fef (patch) | |
tree | 4c506bb094eee7c2128c7c9b17a6b0480a99a0dd /drivers/iommu/omap-iommu.h | |
parent | 72b15b6ae97796c5fac687addde5dbfab872cf94 (diff) |
iommu/omap: Adapt to runtime pm
Use runtime PM functionality interfaced with hwmod enable/idle
functions, to replace direct clock operations and sysconfig
handling.
Due to reset sequence, pm_runtime_[get|put]_sync must be used, to
avoid possible operations with the module under reset. Because of
this and given that the driver uses spin_locks to protect their
critical sections, we must use pm_runtime_irq_safe in order for the
runtime ops to be happy, otherwise might_sleep_if checks in runtime
framework will complain.
The remaining pm_runtime out of iommu_enable and iommu_disable
corresponds to paths that can be accessed through debugfs, some of
them doesn't work if the module is not enabled first, but in future
if the mmu is idled withouth freeing, these are needed to debug.
Signed-off-by: Omar Ramirez Luna <omar.luna@linaro.org>
Tested-by: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
Diffstat (limited to 'drivers/iommu/omap-iommu.h')
-rw-r--r-- | drivers/iommu/omap-iommu.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/iommu/omap-iommu.h b/drivers/iommu/omap-iommu.h index 2b5f3c04d167..120084206602 100644 --- a/drivers/iommu/omap-iommu.h +++ b/drivers/iommu/omap-iommu.h | |||
@@ -29,7 +29,6 @@ struct iotlb_entry { | |||
29 | struct omap_iommu { | 29 | struct omap_iommu { |
30 | const char *name; | 30 | const char *name; |
31 | struct module *owner; | 31 | struct module *owner; |
32 | struct clk *clk; | ||
33 | void __iomem *regbase; | 32 | void __iomem *regbase; |
34 | struct device *dev; | 33 | struct device *dev; |
35 | void *isr_priv; | 34 | void *isr_priv; |
@@ -116,8 +115,6 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev) | |||
116 | * MMU Register offsets | 115 | * MMU Register offsets |
117 | */ | 116 | */ |
118 | #define MMU_REVISION 0x00 | 117 | #define MMU_REVISION 0x00 |
119 | #define MMU_SYSCONFIG 0x10 | ||
120 | #define MMU_SYSSTATUS 0x14 | ||
121 | #define MMU_IRQSTATUS 0x18 | 118 | #define MMU_IRQSTATUS 0x18 |
122 | #define MMU_IRQENABLE 0x1c | 119 | #define MMU_IRQENABLE 0x1c |
123 | #define MMU_WALKING_ST 0x40 | 120 | #define MMU_WALKING_ST 0x40 |