diff options
author | Tony Prisk <linux@prisktech.co.nz> | 2013-01-15 01:50:49 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-01-15 13:56:24 -0500 |
commit | 41d16512ebea6938b95c5e4f2ae008914e91abc1 (patch) | |
tree | f0024aa64f7b737b2e19b468a85573514e9e564c /arch/arm/mach-vt8500 | |
parent | ff7ec345f0ece9ddbb28538b70ba0c7f0acc17dc (diff) |
timer: vt8500: Convert vt8500 to use CLKSRC_OF
This patch converts arch-vt8500 to make use of CLKSRC_OF. Doing so
removes the need for include/linux/vt8500_timer.h as vt8500_timer_init
no longer needs to be visible outside vt8500_timer.c
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-vt8500')
-rw-r--r-- | arch/arm/mach-vt8500/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-vt8500/vt8500.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig index 570a801fb862..d1cbda66dc9c 100644 --- a/arch/arm/mach-vt8500/Kconfig +++ b/arch/arm/mach-vt8500/Kconfig | |||
@@ -4,6 +4,7 @@ config ARCH_VT8500 | |||
4 | select ARCH_HAS_CPUFREQ | 4 | select ARCH_HAS_CPUFREQ |
5 | select ARCH_REQUIRE_GPIOLIB | 5 | select ARCH_REQUIRE_GPIOLIB |
6 | select CLKDEV_LOOKUP | 6 | select CLKDEV_LOOKUP |
7 | select CLKSRC_OF | ||
7 | select CPU_ARM926T | 8 | select CPU_ARM926T |
8 | select GENERIC_CLOCKEVENTS | 9 | select GENERIC_CLOCKEVENTS |
9 | select GENERIC_GPIO | 10 | select GENERIC_GPIO |
diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c index b9fd9d3cbfb3..fe99b709f11f 100644 --- a/arch/arm/mach-vt8500/vt8500.c +++ b/arch/arm/mach-vt8500/vt8500.c | |||
@@ -18,9 +18,9 @@ | |||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/clocksource.h> | ||
21 | #include <linux/io.h> | 22 | #include <linux/io.h> |
22 | #include <linux/pm.h> | 23 | #include <linux/pm.h> |
23 | #include <linux/vt8500_timer.h> | ||
24 | 24 | ||
25 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
26 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
@@ -186,8 +186,8 @@ DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)") | |||
186 | .dt_compat = vt8500_dt_compat, | 186 | .dt_compat = vt8500_dt_compat, |
187 | .map_io = vt8500_map_io, | 187 | .map_io = vt8500_map_io, |
188 | .init_irq = vt8500_init_irq, | 188 | .init_irq = vt8500_init_irq, |
189 | .init_time = vt8500_timer_init, | ||
190 | .init_machine = vt8500_init, | 189 | .init_machine = vt8500_init, |
190 | .init_time = clocksource_of_init, | ||
191 | .restart = vt8500_restart, | 191 | .restart = vt8500_restart, |
192 | .handle_irq = vt8500_handle_irq, | 192 | .handle_irq = vt8500_handle_irq, |
193 | MACHINE_END | 193 | MACHINE_END |