diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 11:37:23 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 11:37:23 -0700 |
| commit | f6304f5804f228b6c2fea9e3dfac25c5b2db9b38 (patch) | |
| tree | 362b9b6a3bd32b868e5917a32d448ac75c5854df /arch/arm/mach-davinci/devices-da8xx.c | |
| parent | 4fa73a1bf89ebea4eba8a9982b5f64d266d8b5e9 (diff) | |
| parent | 6daa642d9b8ec762b3c5641cd5e5fa855a5405bf (diff) | |
| download | blackbird-op-linux-f6304f5804f228b6c2fea9e3dfac25c5b2db9b38.tar.gz blackbird-op-linux-f6304f5804f228b6c2fea9e3dfac25c5b2db9b38.zip | |
Merge branch 'omap4-i2c-init' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-davinci/devices-da8xx.c')
| -rw-r--r-- | arch/arm/mach-davinci/devices-da8xx.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 0a96791d3b0f..8cda729be273 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -326,7 +326,7 @@ static struct resource da8xx_watchdog_resources[] = { }, }; -struct platform_device davinci_wdt_device = { +struct platform_device da8xx_wdt_device = { .name = "watchdog", .id = -1, .num_resources = ARRAY_SIZE(da8xx_watchdog_resources), @@ -335,7 +335,7 @@ struct platform_device davinci_wdt_device = { int __init da8xx_register_watchdog(void) { - return platform_device_register(&davinci_wdt_device); + return platform_device_register(&da8xx_wdt_device); } static struct resource da8xx_emac_resources[] = { @@ -584,10 +584,17 @@ static struct platform_device da8xx_rtc_device = { int da8xx_register_rtc(void) { int ret; + void __iomem *base; + + base = ioremap(DA8XX_RTC_BASE, SZ_4K); + if (WARN_ON(!base)) + return -ENOMEM; /* Unlock the rtc's registers */ - __raw_writel(0x83e70b13, IO_ADDRESS(DA8XX_RTC_BASE + 0x6c)); - __raw_writel(0x95a4f1e0, IO_ADDRESS(DA8XX_RTC_BASE + 0x70)); + __raw_writel(0x83e70b13, base + 0x6c); + __raw_writel(0x95a4f1e0, base + 0x70); + + iounmap(base); ret = platform_device_register(&da8xx_rtc_device); if (!ret) |
