Skip to content

Commit 6b49d4f

Browse files
brglnsekhar
authored andcommitted
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: Bartosz Golaszewski <[email protected]> Reviewed-by: David Lechner <[email protected]> Signed-off-by: Sekhar Nori <[email protected]>
1 parent 20eb435 commit 6b49d4f

File tree

6 files changed

+1
-472
lines changed

6 files changed

+1
-472
lines changed

arch/arm/mach-davinci/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
88

99
# Common objects
10-
obj-y := time.o serial.o usb.o \
11-
common.o sram.o
10+
obj-y := serial.o usb.o common.o sram.o
1211

1312
obj-$(CONFIG_DAVINCI_MUX) += mux.o
1413

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <mach/common.h>
2222
#include <mach/cputype.h>
2323
#include <mach/da8xx.h>
24-
#include <mach/time.h>
2524

2625
#include "asp.h"
2726
#include "cpuidle.h"

arch/arm/mach-davinci/devices.c

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include <mach/hardware.h>
1818
#include <mach/cputype.h>
1919
#include <mach/mux.h>
20-
#include <mach/time.h>
2120

2221
#include "davinci.h"
2322
#include "irqs.h"
@@ -303,21 +302,3 @@ int davinci_gpio_register(struct resource *res, int size, void *pdata)
303302
davinci_gpio_device.dev.platform_data = pdata;
304303
return platform_device_register(&davinci_gpio_device);
305304
}
306-
307-
/*-------------------------------------------------------------------------*/
308-
309-
/*-------------------------------------------------------------------------*/
310-
311-
struct davinci_timer_instance davinci_timer_instance[2] = {
312-
{
313-
.base = DAVINCI_TIMER0_BASE,
314-
.bottom_irq = DAVINCI_INTC_IRQ(IRQ_TINT0_TINT12),
315-
.top_irq = DAVINCI_INTC_IRQ(IRQ_TINT0_TINT34),
316-
},
317-
{
318-
.base = DAVINCI_TIMER1_BASE,
319-
.bottom_irq = DAVINCI_INTC_IRQ(IRQ_TINT1_TINT12),
320-
.top_irq = DAVINCI_INTC_IRQ(IRQ_TINT1_TINT34),
321-
},
322-
};
323-

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,6 @@
2222
#define DAVINCI_INTC_START NR_IRQS
2323
#define DAVINCI_INTC_IRQ(_irqnum) (DAVINCI_INTC_START + (_irqnum))
2424

25-
void davinci_timer_init(struct clk *clk);
26-
27-
struct davinci_timer_instance {
28-
u32 base;
29-
u32 bottom_irq;
30-
u32 top_irq;
31-
unsigned long cmp_off;
32-
unsigned int cmp_irq;
33-
};
34-
35-
struct davinci_timer_info {
36-
struct davinci_timer_instance *timers;
37-
unsigned int clockevent_id;
38-
unsigned int clocksource_id;
39-
};
40-
4125
struct davinci_gpio_controller;
4226

4327
/*
@@ -58,7 +42,6 @@ struct davinci_soc_info {
5842
u32 pinmux_base;
5943
const struct mux_config *pinmux_pins;
6044
unsigned long pinmux_pins_num;
61-
struct davinci_timer_info *timer_info;
6245
int gpio_type;
6346
u32 gpio_base;
6447
unsigned gpio_num;

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)