diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2012-11-20 10:06:00 +0000 |
|---|---|---|
| committer | Mark Rutland <mark.rutland@arm.com> | 2013-01-31 15:51:59 +0000 |
| commit | 1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2 (patch) | |
| tree | ac02d4cdc545251cb9197456c7fbd41a64a4dbe0 /include/clocksource | |
| parent | 1dac0dd71cdda2bd7395dd47a6b617ed296d4901 (diff) | |
| download | linux-1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2.tar.gz linux-1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2.tar.bz2 linux-1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2.zip | |
arm64: move from arm_generic to arm_arch_timer
The arch_timer driver supports a superset of the functionality of the
arm_generic driver, and is not tied to a particular arch.
This patch moves arm64 to use the arch_timer driver, gaining additional
functionality in doing so, and removes the (now unused) arm_generic
driver. Timer-related hooks specific to arm64 are moved into
arch/arm64/kernel/time.c.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'include/clocksource')
| -rw-r--r-- | include/clocksource/arm_generic.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/include/clocksource/arm_generic.h b/include/clocksource/arm_generic.h deleted file mode 100644 index 5b41b0d27f0f..000000000000 --- a/include/clocksource/arm_generic.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2012 ARM Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#ifndef __CLKSOURCE_ARM_GENERIC_H -#define __CLKSOURCE_ARM_GENERIC_H - -extern int arm_generic_timer_init(void); - -#endif |