Skip to content

Commit

Permalink
ARM: OMAP2+: PMU: Add runtime PM support
Browse files Browse the repository at this point in the history
The original implementation of this patch was done by Ming Lei for PMU on OMAP4
[1]. Since then the PM runtime calls have been moved into the ARM PMU code and
this greatly simplifies the changes.

The another differnce since the original version, is that it is no longer
necessary to call pm_runtime_get/put during the PMU initialisation was we are no
longer accessing the hardware at this stage.

By adding runtime PM support, we can ensure that the appropriate power and clock
domains are kept on while PMU is being used.

[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2011-November/074153.html

Cc: Ming Lei <ming.lei@canonical.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@ti.com>
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
  • Loading branch information
Jon Hunter authored and Paul Walmsley committed Sep 23, 2012
1 parent efc7f49 commit 6a9bce2
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion arch/arm/mach-omap2/pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
#include <linux/pm_runtime.h>

#include <asm/pmu.h>

Expand Down Expand Up @@ -53,7 +54,12 @@ static int __init omap2_init_pmu(unsigned oh_num, char *oh_names[])
WARN(IS_ERR(omap_pmu_dev), "Can't build omap_device for %s.\n",
dev_name);

return IS_ERR(omap_pmu_dev) ? PTR_ERR(omap_pmu_dev) : 0;
if (IS_ERR(omap_pmu_dev))
return PTR_ERR(omap_pmu_dev);

pm_runtime_enable(&omap_pmu_dev->dev);

return 0;
}

static int __init omap_init_pmu(void)
Expand Down

0 comments on commit 6a9bce2

Please sign in to comment.