diff options
| author | Peng Du <pdu@nvidia.com> | 2013-08-14 21:55:58 -0700 |
|---|---|---|
| committer | Tom Cherry <tcherry@nvidia.com> | 2014-01-21 15:13:52 -0800 |
| commit | faf8fd570fb90831360af5dad3156e85039cf5f3 (patch) | |
| tree | 16cb6639c17d4cfac028aa9472d963cb0ad34bdd /arch/arm/mach-tegra/common.c | |
| parent | 3c8044f03c2611b8d84744c016328ec5716119d2 (diff) | |
ARM: tegra: fix platform drivers for ARM64
Change-Id: I03dae90251ce6c2cf0c0a237ebe0cf53bda9d57d
Reviewed-on: http://git-master/r/200297
Reviewed-on: http://git-master/r/225393
Signed-off-by: Peng Du <pdu@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/common.c')
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index b462c4270981..9bab953c4a7d 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -48,7 +48,7 @@ #include <linux/tegra-fuse.h> #ifdef CONFIG_ARM64 -#include <linux/irqchip/gic.h> +#include <linux/irqchip/arm-gic.h> #include <asm/system_info.h> #else #include <asm/system.h> @@ -182,7 +182,11 @@ u32 notrace tegra_read_cycle(void) { u32 cycle_count; +#ifdef CONFIG_ARM64 + asm volatile("mrs %0, pmccntr_el0" : "=r"(cycle_count)); +#else asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(cycle_count)); +#endif return cycle_count; } |