omap2+: Remove omap2_gp_clockevent_set_gptimer
This is no longer needed as we now just set the desired .timer in MACHINE_START. We can now also remove timer-gp.h. Signed-off-by: Tony Lindgren <tony@atomide.com> Reviewed-by: Kevin Hilman <khilman@ti.com>
This commit is contained in:
parent
3d05a3e80c
commit
0c336dc5ec
|
@ -40,7 +40,6 @@
|
||||||
|
|
||||||
#include "mux.h"
|
#include "mux.h"
|
||||||
#include "hsmmc.h"
|
#include "hsmmc.h"
|
||||||
#include "timer-gp.h"
|
|
||||||
#include "control.h"
|
#include "control.h"
|
||||||
#include "common-board-devices.h"
|
#include "common-board-devices.h"
|
||||||
|
|
||||||
|
@ -295,9 +294,6 @@ static void __init omap_4430sdp_init_early(void)
|
||||||
{
|
{
|
||||||
omap2_init_common_infrastructure();
|
omap2_init_common_infrastructure();
|
||||||
omap2_init_common_devices(NULL, NULL);
|
omap2_init_common_devices(NULL, NULL);
|
||||||
#ifdef CONFIG_OMAP_32K_TIMER
|
|
||||||
omap2_gp_clockevent_set_gptimer(1);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct omap_musb_board_data musb_board_data = {
|
static struct omap_musb_board_data musb_board_data = {
|
||||||
|
|
|
@ -58,7 +58,6 @@
|
||||||
|
|
||||||
#include "mux.h"
|
#include "mux.h"
|
||||||
#include "hsmmc.h"
|
#include "hsmmc.h"
|
||||||
#include "timer-gp.h"
|
|
||||||
#include "common-board-devices.h"
|
#include "common-board-devices.h"
|
||||||
|
|
||||||
#define OMAP_DM9000_GPIO_IRQ 25
|
#define OMAP_DM9000_GPIO_IRQ 25
|
||||||
|
@ -439,9 +438,6 @@ static void __init devkit8000_init_early(void)
|
||||||
static void __init devkit8000_init_irq(void)
|
static void __init devkit8000_init_irq(void)
|
||||||
{
|
{
|
||||||
omap3_init_irq();
|
omap3_init_irq();
|
||||||
#ifdef CONFIG_OMAP_32K_TIMER
|
|
||||||
omap2_gp_clockevent_set_gptimer(12);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#define OMAP_DM9000_BASE 0x2c000000
|
#define OMAP_DM9000_BASE 0x2c000000
|
||||||
|
|
|
@ -50,7 +50,6 @@
|
||||||
|
|
||||||
#include "mux.h"
|
#include "mux.h"
|
||||||
#include "hsmmc.h"
|
#include "hsmmc.h"
|
||||||
#include "timer-gp.h"
|
|
||||||
#include "pm.h"
|
#include "pm.h"
|
||||||
#include "common-board-devices.h"
|
#include "common-board-devices.h"
|
||||||
|
|
||||||
|
@ -487,9 +486,6 @@ static void __init omap3_beagle_init_early(void)
|
||||||
static void __init omap3_beagle_init_irq(void)
|
static void __init omap3_beagle_init_irq(void)
|
||||||
{
|
{
|
||||||
omap3_init_irq();
|
omap3_init_irq();
|
||||||
#ifdef CONFIG_OMAP_32K_TIMER
|
|
||||||
omap2_gp_clockevent_set_gptimer(12);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct platform_device *omap3_beagle_devices[] __initdata = {
|
static struct platform_device *omap3_beagle_devices[] __initdata = {
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
|
|
||||||
#include "mux.h"
|
#include "mux.h"
|
||||||
#include "hsmmc.h"
|
#include "hsmmc.h"
|
||||||
#include "timer-gp.h"
|
|
||||||
#include "control.h"
|
#include "control.h"
|
||||||
#include "common-board-devices.h"
|
#include "common-board-devices.h"
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,6 @@
|
||||||
#include "sdram-micron-mt46h32m32lf-6.h"
|
#include "sdram-micron-mt46h32m32lf-6.h"
|
||||||
#include "mux.h"
|
#include "mux.h"
|
||||||
#include "hsmmc.h"
|
#include "hsmmc.h"
|
||||||
#include "timer-gp.h"
|
|
||||||
#include "common-board-devices.h"
|
#include "common-board-devices.h"
|
||||||
|
|
||||||
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
|
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
|
||||||
|
@ -495,9 +494,6 @@ static void __init omap3_stalker_init_early(void)
|
||||||
static void __init omap3_stalker_init_irq(void)
|
static void __init omap3_stalker_init_irq(void)
|
||||||
{
|
{
|
||||||
omap3_init_irq();
|
omap3_init_irq();
|
||||||
#ifdef CONFIG_OMAP_32K_TIMER
|
|
||||||
omap2_gp_clockevent_set_gptimer(12);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct platform_device *omap3_stalker_devices[] __initdata = {
|
static struct platform_device *omap3_stalker_devices[] __initdata = {
|
||||||
|
|
|
@ -51,7 +51,6 @@
|
||||||
|
|
||||||
#include "mux.h"
|
#include "mux.h"
|
||||||
#include "hsmmc.h"
|
#include "hsmmc.h"
|
||||||
#include "timer-gp.h"
|
|
||||||
#include "common-board-devices.h"
|
#include "common-board-devices.h"
|
||||||
|
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
|
@ -372,9 +371,6 @@ static void __init omap3_touchbook_init_early(void)
|
||||||
static void __init omap3_touchbook_init_irq(void)
|
static void __init omap3_touchbook_init_irq(void)
|
||||||
{
|
{
|
||||||
omap3_init_irq();
|
omap3_init_irq();
|
||||||
#ifdef CONFIG_OMAP_32K_TIMER
|
|
||||||
omap2_gp_clockevent_set_gptimer(12);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct platform_device *omap3_touchbook_devices[] __initdata = {
|
static struct platform_device *omap3_touchbook_devices[] __initdata = {
|
||||||
|
|
|
@ -41,7 +41,6 @@
|
||||||
#include <plat/usb.h>
|
#include <plat/usb.h>
|
||||||
#include <plat/mmc.h>
|
#include <plat/mmc.h>
|
||||||
#include <video/omap-panel-generic-dpi.h>
|
#include <video/omap-panel-generic-dpi.h>
|
||||||
#include "timer-gp.h"
|
|
||||||
|
|
||||||
#include "hsmmc.h"
|
#include "hsmmc.h"
|
||||||
#include "control.h"
|
#include "control.h"
|
||||||
|
|
|
@ -43,8 +43,6 @@
|
||||||
#include <plat/common.h>
|
#include <plat/common.h>
|
||||||
#include <plat/omap_hwmod.h>
|
#include <plat/omap_hwmod.h>
|
||||||
|
|
||||||
#include "timer-gp.h"
|
|
||||||
|
|
||||||
/* Parent clocks, eventually these will come from the clock framework */
|
/* Parent clocks, eventually these will come from the clock framework */
|
||||||
|
|
||||||
#define OMAP2_MPU_SOURCE "sys_ck"
|
#define OMAP2_MPU_SOURCE "sys_ck"
|
||||||
|
@ -75,8 +73,6 @@ u32 sys_timer_reserved;
|
||||||
|
|
||||||
static struct omap_dm_timer clkev;
|
static struct omap_dm_timer clkev;
|
||||||
static struct clock_event_device clockevent_gpt;
|
static struct clock_event_device clockevent_gpt;
|
||||||
static u8 __initdata gptimer_id = 1;
|
|
||||||
static u8 __initdata inited;
|
|
||||||
|
|
||||||
static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id)
|
static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id)
|
||||||
{
|
{
|
||||||
|
@ -138,26 +134,6 @@ static struct clock_event_device clockevent_gpt = {
|
||||||
.set_mode = omap2_gp_timer_set_mode,
|
.set_mode = omap2_gp_timer_set_mode,
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* omap2_gp_clockevent_set_gptimer - set which GPTIMER is used for clockevents
|
|
||||||
* @id: GPTIMER to use (1..MAX_GPTIMER_ID)
|
|
||||||
*
|
|
||||||
* Define the GPTIMER that the system should use for the tick timer.
|
|
||||||
* Meant to be called from board-*.c files in the event that GPTIMER1, the
|
|
||||||
* default, is unsuitable. Returns -EINVAL on error or 0 on success.
|
|
||||||
*/
|
|
||||||
int __init omap2_gp_clockevent_set_gptimer(u8 id)
|
|
||||||
{
|
|
||||||
if (id < 1 || id > MAX_GPTIMER_ID)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
BUG_ON(inited);
|
|
||||||
|
|
||||||
gptimer_id = id;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
|
static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
|
||||||
int gptimer_id,
|
int gptimer_id,
|
||||||
const char *fck_source)
|
const char *fck_source)
|
||||||
|
@ -228,8 +204,6 @@ static void __init omap2_gp_clockevent_init(int gptimer_id,
|
||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
|
|
||||||
inited = 1;
|
|
||||||
|
|
||||||
res = omap_dm_timer_init_one(&clkev, gptimer_id, fck_source);
|
res = omap_dm_timer_init_one(&clkev, gptimer_id, fck_source);
|
||||||
BUG_ON(res);
|
BUG_ON(res);
|
||||||
|
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
/*
|
|
||||||
* OMAP2/3 GPTIMER support.headers
|
|
||||||
*
|
|
||||||
* Copyright (C) 2009 Nokia Corporation
|
|
||||||
*
|
|
||||||
* This file is subject to the terms and conditions of the GNU General Public
|
|
||||||
* License. See the file "COPYING" in the main directory of this archive
|
|
||||||
* for more details.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_TIMER_GP_H
|
|
||||||
#define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_TIMER_GP_H
|
|
||||||
|
|
||||||
extern int __init omap2_gp_clockevent_set_gptimer(u8 id);
|
|
||||||
|
|
||||||
#endif
|
|
Loading…
Reference in a new issue