diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2005-11-18 16:39:20 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-11-18 16:39:20 -0500 |
| commit | 2161558fa5bebfeb272493ae91e836b497029023 (patch) | |
| tree | 16304f91757243626d74e65063ee7224cacbf797 /arch/powerpc/platforms/maple/time.c | |
| parent | e670dfb9a4f9e136da44db167da75b2365f7cebb (diff) | |
| parent | e67b23c71cb9ee02d65a74c3858716ba2dedd554 (diff) | |
| download | talos-op-linux-2161558fa5bebfeb272493ae91e836b497029023.tar.gz talos-op-linux-2161558fa5bebfeb272493ae91e836b497029023.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/powerpc/platforms/maple/time.c')
| -rw-r--r-- | arch/powerpc/platforms/maple/time.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/maple/time.c b/arch/powerpc/platforms/maple/time.c index 40fc07a8e606..15846cc938ac 100644 --- a/arch/powerpc/platforms/maple/time.c +++ b/arch/powerpc/platforms/maple/time.c @@ -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; @@ -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); |
