Commit 2ea0dde7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'vt8500/timer' into next/cleanup 



* vt8500/timer:
  timer: vt8500: Convert vt8500 to use CLKSRC_OF

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f8060f54 41d16512

arch/arm/mach-vt8500/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config ARCH_VT8500 
	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_OF

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

arch/arm/mach-vt8500/vt8500.c

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#include <linux/clocksource.h>

#include <linux/io.h>

#include <linux/pm.h>

#include <linux/vt8500_timer.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -186,8 +186,8 @@ DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)") 
	.dt_compat	= vt8500_dt_compat,

	.map_io		= vt8500_map_io,

	.init_irq	= vt8500_init_irq,

	.init_time	= vt8500_timer_init,

	.init_machine	= vt8500_init,

	.init_time	= clocksource_of_init,

	.restart	= vt8500_restart,

	.handle_irq	= vt8500_handle_irq,

MACHINE_END

drivers/clocksource/vt8500_timer.c

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static struct of_device_id vt8500_timer_ids[] = { 
	{ }

};



void __init vt8500_timer_init(void)

static void __init vt8500_timer_init(void)

{

	struct device_node *np;

	int timer_irq;
@@ -177,3 +177,4 @@ void __init vt8500_timer_init(void) 
					4, 0xf0000000);

}



CLOCKSOURCE_OF_DECLARE(vt8500, "via,vt8500-timer", vt8500_timer_init)

include/linux/vt8500_timer.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Tony Prisk <linux@prisktech.co.nz>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * 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.

 */



#ifndef __VT8500_TIMER_H

#define __VT8500_TIMER_H



#include <asm/mach/time.h>



void vt8500_timer_init(void);



#endif