Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 91354
b: refs/heads/master
c: 62c6df6
h: refs/heads/master
v: v3
  • Loading branch information
David Brownell authored and Haavard Skinnemoen committed Apr 20, 2008
1 parent c5954b8 commit 9c59df2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 38 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 040b28fc0a69281a46adcebd6b31dd74da4a8d49
refs/heads/master: 62c6df62f9575cffd673bfc395270e6896a12a60
45 changes: 8 additions & 37 deletions trunk/arch/avr32/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,15 @@ cycle_t __weak read_cycle_count(void)
return (cycle_t)sysreg_read(COUNT);
}

/*
* The architectural cycle count registers are a fine clocksource unless
* the system idle loop use sleep states like "idle": the CPU cycles
* measured by COUNT (and COMPARE) don't happen during sleep states.
* So we rate the clocksource using COUNT as very low quality.
*/
struct clocksource __weak clocksource_avr32 = {
.name = "avr32",
.rating = 350,
.rating = 50,
.read = read_cycle_count,
.mask = CLOCKSOURCE_MASK(32),
.shift = 16,
Expand All @@ -55,22 +61,6 @@ struct irqaction timer_irqaction = {
.name = "timer",
};

/*
* By default we provide the null RTC ops
*/
static unsigned long null_rtc_get_time(void)
{
return mktime(2007, 1, 1, 0, 0, 0);
}

static int null_rtc_set_time(unsigned long sec)
{
return 0;
}

static unsigned long (*rtc_get_time)(void) = null_rtc_get_time;
static int (*rtc_set_time)(unsigned long) = null_rtc_set_time;

static void avr32_timer_ack(void)
{
u32 count;
Expand Down Expand Up @@ -190,7 +180,7 @@ void __init time_init(void)
*/
sysreg_write(COMPARE, 0);

xtime.tv_sec = rtc_get_time();
xtime.tv_sec = mktime(2007, 1, 1, 0, 0, 0);
xtime.tv_nsec = 0;

set_normalized_timespec(&wall_to_monotonic,
Expand All @@ -212,22 +202,3 @@ void __init time_init(void)
return;
}
}

static struct sysdev_class timer_class = {
.name = "timer",
};

static struct sys_device timer_device = {
.id = 0,
.cls = &timer_class,
};

static int __init init_timer_sysfs(void)
{
int err = sysdev_class_register(&timer_class);
if (!err)
err = sysdev_register(&timer_device);
return err;
}

device_initcall(init_timer_sysfs);

0 comments on commit 9c59df2

Please sign in to comment.