Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 175dbc1e authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 8d84981e ff7ec345

arch/arm/mach-vt8500/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,5 +8,6 @@ config ARCH_VT8500 
	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK

	select VT8500_TIMER

	help

	  Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.

arch/arm/mach-vt8500/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_ARCH_VT8500) += irq.o timer.o vt8500.o
 
obj-$(CONFIG_ARCH_VT8500) += irq.o vt8500.o

arch/arm/mach-vt8500/common.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include <linux/of.h>



void __init vt8500_timer_init(void);

int __init vt8500_irq_init(struct device_node *node,

				struct device_node *parent);

arch/arm/mach-vt8500/vt8500.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include <linux/io.h>

#include <linux/pm.h>

#include <linux/vt8500_timer.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

drivers/clocksource/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ config ARMADA_370_XP_TIMER 
config SUNXI_TIMER

	bool



config VT8500_TIMER

	bool



config CLKSRC_NOMADIK_MTU

	bool

	depends on (ARCH_NOMADIK || ARCH_U8500)