tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'vt8500/timer' of git://server.prisktech.co.nz/git/linuxwmt into next/cleanup

From Tony Prisk:
Move arch-vt8500/timer.c to drivers/clocksource/vt8500-timer.c

* tag 'vt8500/timer' of git://server.prisktech.co.nz/git/linuxwmt:
timer: vt8500: Move timer code to drivers/clocksource

Signed-off-by: Olof Johansson <olof@lixom.net>

Olof Johansson 175dbc1e 8d84981e

+29 -2
+1
arch/arm/mach-vt8500/Kconfig
··· 8 8 select GENERIC_CLOCKEVENTS 9 9 select GENERIC_GPIO 10 10 select HAVE_CLK 11 + select VT8500_TIMER 11 12 help 12 13 Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
+1 -1
arch/arm/mach-vt8500/Makefile
··· 1 - obj-$(CONFIG_ARCH_VT8500) += irq.o timer.o vt8500.o 1 + obj-$(CONFIG_ARCH_VT8500) += irq.o vt8500.o
-1
arch/arm/mach-vt8500/common.h
··· 18 18 19 19 #include <linux/of.h> 20 20 21 - void __init vt8500_timer_init(void); 22 21 int __init vt8500_irq_init(struct device_node *node, 23 22 struct device_node *parent); 24 23
arch/arm/mach-vt8500/timer.c drivers/clocksource/vt8500_timer.c
+1
arch/arm/mach-vt8500/vt8500.c
··· 20 20 21 21 #include <linux/io.h> 22 22 #include <linux/pm.h> 23 + #include <linux/vt8500_timer.h> 23 24 24 25 #include <asm/mach-types.h> 25 26 #include <asm/mach/arch.h>
+3
drivers/clocksource/Kconfig
··· 28 28 config SUNXI_TIMER 29 29 bool 30 30 31 + config VT8500_TIMER 32 + bool 33 + 31 34 config CLKSRC_NOMADIK_MTU 32 35 bool 33 36 depends on (ARCH_NOMADIK || ARCH_U8500)
+1
drivers/clocksource/Makefile
··· 17 17 obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o 18 18 obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o 19 19 obj-$(CONFIG_SUNXI_TIMER) += sunxi_timer.o 20 + obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o 20 21 21 22 obj-$(CONFIG_CLKSRC_ARM_GENERIC) += arm_generic.o
+22
include/linux/vt8500_timer.h
··· 1 + /* 2 + * Copyright 2012 Tony Prisk <linux@prisktech.co.nz> 3 + * 4 + * This program is free software; you can redistribute it and/or modify 5 + * it under the terms of the GNU General Public License as published by 6 + * the Free Software Foundation; either version 2 of the License, or 7 + * (at your option) any later version. 8 + * 9 + * This program is distributed in the hope that it will be useful, 10 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 + * GNU General Public License for more details. 13 + */ 14 + 15 + #ifndef __VT8500_TIMER_H 16 + #define __VT8500_TIMER_H 17 + 18 + #include <asm/mach/time.h> 19 + 20 + void vt8500_timer_init(void); 21 + 22 + #endif