diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-04-08 16:34:32 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-08 16:34:32 -0700 |
| commit | d05663a23f31a1baf25ab8894b8c3fb2a506aa6a (patch) | |
| tree | 6b40bb08676a2788b007482df65f6d21a4afe331 /arch/arm/mach-omap2/pmu.c | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| parent | 1fac4fffa719a98ec1047eaece236244333c9afe (diff) | |
Merge branch 'for_3.10/dts' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.10/dt
Diffstat (limited to 'arch/arm/mach-omap2/pmu.c')
| -rw-r--r-- | arch/arm/mach-omap2/pmu.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c index 9debf822687c..9ace8eae7ee8 100644 --- a/arch/arm/mach-omap2/pmu.c +++ b/arch/arm/mach-omap2/pmu.c @@ -11,6 +11,8 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ +#include <linux/of.h> + #include <asm/pmu.h> #include "soc.h" @@ -63,6 +65,15 @@ static int __init omap_init_pmu(void) unsigned oh_num; char **oh_names; + /* XXX Remove this check when the CTI driver is available */ + if (cpu_is_omap443x()) { + pr_info("ARM PMU: not yet supported on OMAP4430 due to missing CTI driver\n"); + return 0; + } + + if (of_have_populated_dt()) + return 0; + /* * To create an ARM-PMU device the following HWMODs * are required for the various OMAP2+ devices. @@ -75,9 +86,6 @@ static int __init omap_init_pmu(void) if (cpu_is_omap443x()) { oh_num = ARRAY_SIZE(omap4430_pmu_oh_names); oh_names = omap4430_pmu_oh_names; - /* XXX Remove the next two lines when CTI driver available */ - pr_info("ARM PMU: not yet supported on OMAP4430 due to missing CTI driver\n"); - return 0; } else if (cpu_is_omap34xx() || cpu_is_omap44xx()) { oh_num = ARRAY_SIZE(omap3_pmu_oh_names); oh_names = omap3_pmu_oh_names; |