projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
pmu.c
diff --git
a/arch/arm/mach-omap2/pmu.c
b/arch/arm/mach-omap2/pmu.c
index 9debf822687c7a0a11724ed4ea218237d2cd1ce6..9ace8eae7ee8b1444aa9b0634764d2ad93871ecb 100644
(file)
--- 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.
*/
* 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"
#include <asm/pmu.h>
#include "soc.h"
@@
-63,6
+65,15
@@
static int __init omap_init_pmu(void)
unsigned oh_num;
char **oh_names;
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.
/*
* 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;
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;
} else if (cpu_is_omap34xx() || cpu_is_omap44xx()) {
oh_num = ARRAY_SIZE(omap3_pmu_oh_names);
oh_names = omap3_pmu_oh_names;