time.c (ecf0aa5317b0ad6bb015128a5b763c954fd58708) | time.c (c73b9099da4fb5703abaa804a0377850eea66cb5) |
---|---|
1/* 2 * linux/arch/arm/mach-omap1/time.c 3 * 4 * OMAP Timers 5 * 6 * Copyright (C) 2004 Nokia Corporation 7 * Partial timer rewrite and additional dynamic tick timer support by 8 * Tony Lindgen <tony@atomide.com> and --- 37 unchanged lines hidden (view full) --- 46#include <linux/sched_clock.h> 47 48#include <asm/irq.h> 49 50#include <asm/mach/irq.h> 51#include <asm/mach/time.h> 52 53#include "hardware.h" | 1/* 2 * linux/arch/arm/mach-omap1/time.c 3 * 4 * OMAP Timers 5 * 6 * Copyright (C) 2004 Nokia Corporation 7 * Partial timer rewrite and additional dynamic tick timer support by 8 * Tony Lindgen <tony@atomide.com> and --- 37 unchanged lines hidden (view full) --- 46#include <linux/sched_clock.h> 47 48#include <asm/irq.h> 49 50#include <asm/mach/irq.h> 51#include <asm/mach/time.h> 52 53#include "hardware.h" |
54#include "mux.h" |
|
54#include "iomap.h" 55#include "common.h" | 55#include "iomap.h" 56#include "common.h" |
57#include "clock.h" |
|
56 57#ifdef CONFIG_OMAP_MPU_TIMER 58 59#define OMAP_MPU_TIMER_BASE OMAP_MPU_TIMER1_BASE 60#define OMAP_MPU_TIMER_OFFSET 0x100 61 62typedef struct { 63 u32 cntl; /* CNTL_TIMER, R/W */ --- 155 unchanged lines hidden (view full) --- 219 220/* 221 * --------------------------------------------------------------------------- 222 * Timer initialization 223 * --------------------------------------------------------------------------- 224 */ 225void __init omap1_timer_init(void) 226{ | 58 59#ifdef CONFIG_OMAP_MPU_TIMER 60 61#define OMAP_MPU_TIMER_BASE OMAP_MPU_TIMER1_BASE 62#define OMAP_MPU_TIMER_OFFSET 0x100 63 64typedef struct { 65 u32 cntl; /* CNTL_TIMER, R/W */ --- 155 unchanged lines hidden (view full) --- 221 222/* 223 * --------------------------------------------------------------------------- 224 * Timer initialization 225 * --------------------------------------------------------------------------- 226 */ 227void __init omap1_timer_init(void) 228{ |
229 omap1_clk_init(); 230 omap1_mux_init(); 231 |
|
227 if (omap_32k_timer_init() != 0) 228 omap_mpu_timer_init(); 229} | 232 if (omap_32k_timer_init() != 0) 233 omap_mpu_timer_init(); 234} |