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

Commit ff7ec345 authored by Tony Prisk's avatar Tony Prisk
Browse files

timer: vt8500: Move timer code to drivers/clocksource 



This patch moves arch-vt8500/timer.c into drivers/clocksource and
updates the necessary Kconfig/Makefile options.

Signed-off-by: default avatarTony Prisk <linux@prisktech.co.nz>
parent 1c2584c3

arch/arm/mach-vt8500/Kconfig

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

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_CLK

	select VT8500_TIMER

	help

	help

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

arch/arm/mach-vt8500/Makefile

+1 −1
Original line number Original line 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 Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 




#include <linux/of.h>

#include <linux/of.h>





void __init vt8500_timer_init(void);

int __init vt8500_irq_init(struct device_node *node,

int __init vt8500_irq_init(struct device_node *node,

				struct device_node *parent);

				struct device_node *parent);

arch/arm/mach-vt8500/vt8500.c

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




#include <linux/io.h>

#include <linux/io.h>

#include <linux/pm.h>

#include <linux/pm.h>

#include <linux/vt8500_timer.h>





#include <asm/mach-types.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

drivers/clocksource/Kconfig

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

config SUNXI_TIMER

	bool

	bool





config VT8500_TIMER

	bool



config CLKSRC_NOMADIK_MTU

config CLKSRC_NOMADIK_MTU

	bool

	bool

	depends on (ARCH_NOMADIK || ARCH_U8500)

	depends on (ARCH_NOMADIK || ARCH_U8500)