Commit 6bb27d73 authored by Stephen Warren's avatar Stephen Warren
Browse files

ARM: delete struct sys_timer 

Now that the only field in struct sys_timer is .init, delete the struct,
and replace the machine descriptor .timer field with the initialization
function itself.

This will enable moving timer drivers into drivers/clocksource without
having to place a public prototype of each struct sys_timer object into
include/linux; the intent is to create a single of_clocksource_init()
function that determines which timer driver to initialize by scanning
the device dtree, much like the proposed irqchip_init() at:
http://www.spinics.net/lists/arm-kernel/msg203686.html



Includes mach-omap2 fixes from Igor Grinberg.

Tested-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 7704c095

arch/arm/include/asm/mach/arch.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -12,7 +12,6 @@ 




struct tag;

struct tag;

struct meminfo;

struct meminfo;

struct sys_timer;

struct pt_regs;

struct pt_regs;

struct smp_operations;

struct smp_operations;

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP
@@ -48,7 +47,7 @@ struct machine_desc { 
	void			(*map_io)(void);/* IO mapping function	*/

	void			(*map_io)(void);/* IO mapping function	*/

	void			(*init_early)(void);

	void			(*init_early)(void);

	void			(*init_irq)(void);

	void			(*init_irq)(void);

	struct sys_timer	*timer;		/* system tick timer	*/

	void			(*init_time)(void);

	void			(*init_machine)(void);

	void			(*init_machine)(void);

	void			(*init_late)(void);

	void			(*init_late)(void);

#ifdef CONFIG_MULTI_IRQ_HANDLER

#ifdef CONFIG_MULTI_IRQ_HANDLER

arch/arm/include/asm/mach/time.h

+0 −16
Original line number Original line Diff line number Diff line
@@ -10,22 +10,6 @@ 
#ifndef __ASM_ARM_MACH_TIME_H

#ifndef __ASM_ARM_MACH_TIME_H

#define __ASM_ARM_MACH_TIME_H

#define __ASM_ARM_MACH_TIME_H





/*

 * This is our kernel timer structure.

 *

 * - init

 *   Initialise the kernels jiffy timer source, claim interrupt

 *   using setup_irq.  This is called early on during initialisation

 *   while interrupts are still disabled on the local CPU.

 * - offset

 *   Return the timer offset in microseconds since the last timer

 *   interrupt.  Note: this must take account of any unprocessed

 *   timer interrupt which may be pending.

 */

struct sys_timer {

	void			(*init)(void);

};



extern void timer_tick(void);

extern void timer_tick(void);





struct timespec;

struct timespec;

arch/arm/kernel/time.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -30,11 +30,6 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/mach/time.h>





/*

 * Our system timer.

 */

static struct sys_timer *system_timer;



#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || \

#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || \

    defined(CONFIG_NVRAM) || defined(CONFIG_NVRAM_MODULE)

    defined(CONFIG_NVRAM) || defined(CONFIG_NVRAM_MODULE)

/* this needs a better home */

/* this needs a better home */
@@ -120,8 +115,6 @@ int __init register_persistent_clock(clock_access_fn read_boot, 




void __init time_init(void)

void __init time_init(void)

{

{

	system_timer = machine_desc->timer;

	machine_desc->init_time();

	system_timer->init();

	sched_clock_postinit();

	sched_clock_postinit();

}
 
}

arch/arm/mach-at91/at91rm9200_time.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -274,8 +274,3 @@ void __init at91rm9200_timer_init(void) 
	/* register clocksource */

	/* register clocksource */

	clocksource_register_hz(&clk32k, AT91_SLOW_CLOCK);

	clocksource_register_hz(&clk32k, AT91_SLOW_CLOCK);

}
 
}
 


struct sys_timer at91rm9200_timer = {

	.init		= at91rm9200_timer_init,

};

arch/arm/mach-at91/at91sam926x_time.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -224,7 +224,7 @@ static int __init of_at91sam926x_pit_init(void) 
/*

/*

 * Set up both clocksource and clockevent support.

 * Set up both clocksource and clockevent support.

 */

 */

static void __init at91sam926x_pit_init(void)

void __init at91sam926x_pit_init(void)

{

{

	unsigned long	pit_rate;

	unsigned long	pit_rate;

	unsigned	bits;

	unsigned	bits;
@@ -279,7 +279,3 @@ void __init at91sam926x_ioremap_pit(u32 addr) 
	if (!pit_base_addr)

	if (!pit_base_addr)

		panic("Impossible to ioremap PIT\n");

		panic("Impossible to ioremap PIT\n");

}
 
}
 


struct sys_timer at91sam926x_timer = {

	.init		= at91sam926x_pit_init,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE