Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14385
b: refs/heads/master
c: a097a35
h: refs/heads/master
i:
  14383: 5d5c781
v: v3
  • Loading branch information
Segher Boessenkool authored and Paul Mackerras committed Nov 18, 2005
1 parent a0122b8 commit 76ea5d4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 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: 68643cfb879ad8c327441f875b60981822016575
refs/heads/master: a097a35c9a6de6316c18a3e914c64400b5a6db57
11 changes: 10 additions & 1 deletion trunk/arch/powerpc/platforms/maple/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,11 @@ int maple_set_rtc_time(struct rtc_time *tm)
return 0;
}

static struct resource rtc_iores = {
.name = "rtc",
.flags = IORESOURCE_BUSY,
};

unsigned long __init maple_get_boot_time(void)
{
struct rtc_time tm;
Expand All @@ -172,7 +177,11 @@ unsigned long __init maple_get_boot_time(void)
printk(KERN_INFO "Maple: No device node for RTC, assuming "
"legacy address (0x%x)\n", maple_rtc_addr);
}


rtc_iores.start = maple_rtc_addr;
rtc_iores.end = maple_rtc_addr + 7;
request_resource(&ioport_resource, &rtc_iores);

maple_get_rtc_time(&tm);
return mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
Expand Down

0 comments on commit 76ea5d4

Please sign in to comment.