Commit 6b49d4fb authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori
Browse files

ARM: davinci: remove legacy timer support 



All platforms have now been switched to the new clocksource driver.
Remove the old code and various no longer needed bits and pieces.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 20eb4354

arch/arm/mach-davinci/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -7,8 +7,7 @@ 
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include



# Common objects

obj-y 					:= time.o serial.o usb.o \

					   common.o sram.o

obj-y 					:= serial.o usb.o common.o sram.o



obj-$(CONFIG_DAVINCI_MUX)		+= mux.o

arch/arm/mach-davinci/devices-da8xx.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <mach/common.h>

#include <mach/cputype.h>

#include <mach/da8xx.h>

#include <mach/time.h>



#include "asp.h"

#include "cpuidle.h"

arch/arm/mach-davinci/devices.c

+0 −19
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <mach/hardware.h>

#include <mach/cputype.h>

#include <mach/mux.h>

#include <mach/time.h>



#include "davinci.h"

#include "irqs.h"
@@ -303,21 +302,3 @@ int davinci_gpio_register(struct resource *res, int size, void *pdata) 
	davinci_gpio_device.dev.platform_data = pdata;

	return platform_device_register(&davinci_gpio_device);

}
 


/*-------------------------------------------------------------------------*/



/*-------------------------------------------------------------------------*/



struct davinci_timer_instance davinci_timer_instance[2] = {

	{

		.base		= DAVINCI_TIMER0_BASE,

		.bottom_irq	= DAVINCI_INTC_IRQ(IRQ_TINT0_TINT12),

		.top_irq	= DAVINCI_INTC_IRQ(IRQ_TINT0_TINT34),

	},

	{

		.base		= DAVINCI_TIMER1_BASE,

		.bottom_irq	= DAVINCI_INTC_IRQ(IRQ_TINT1_TINT12),

		.top_irq	= DAVINCI_INTC_IRQ(IRQ_TINT1_TINT34),

	},

};

arch/arm/mach-davinci/include/mach/common.h

+0 −17
Original line number Diff line number Diff line
@@ -22,22 +22,6 @@ 
#define DAVINCI_INTC_START		NR_IRQS

#define DAVINCI_INTC_IRQ(_irqnum)	(DAVINCI_INTC_START + (_irqnum))



void davinci_timer_init(struct clk *clk);



struct davinci_timer_instance {

	u32		base;

	u32		bottom_irq;

	u32		top_irq;

	unsigned long	cmp_off;

	unsigned int	cmp_irq;

};



struct davinci_timer_info {

	struct davinci_timer_instance	*timers;

	unsigned int			clockevent_id;

	unsigned int			clocksource_id;

};



struct davinci_gpio_controller;



/*
@@ -58,7 +42,6 @@ struct davinci_soc_info { 
	u32				pinmux_base;

	const struct mux_config		*pinmux_pins;

	unsigned long			pinmux_pins_num;

	struct davinci_timer_info	*timer_info;

	int				gpio_type;

	u32				gpio_base;

	unsigned			gpio_num;

arch/arm/mach-davinci/include/mach/time.h

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

 * Local header file for DaVinci time code.

 *

 * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>

 *

 * 2007 (c) MontaVista Software, Inc. This file is licensed under

 * the terms of the GNU General Public License version 2. This program

 * is licensed "as is" without any warranty of any kind, whether express

 * or implied.

 */

#ifndef __ARCH_ARM_MACH_DAVINCI_TIME_H

#define __ARCH_ARM_MACH_DAVINCI_TIME_H



#define DAVINCI_TIMER1_BASE		(IO_PHYS + 0x21800)



enum {

	T0_BOT,

	T0_TOP,

	T1_BOT,

	T1_TOP,

	NUM_TIMERS

};



#define IS_TIMER1(id)		(id & 0x2)

#define IS_TIMER0(id)		(!IS_TIMER1(id))

#define IS_TIMER_TOP(id)	((id & 0x1))

#define IS_TIMER_BOT(id)	(!IS_TIMER_TOP(id))



#define ID_TO_TIMER(id)		(IS_TIMER1(id) != 0)



extern struct davinci_timer_instance davinci_timer_instance[];



#endif /* __ARCH_ARM_MACH_DAVINCI_TIME_H */