lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc32: Fix multiple RTC detections on SUN4D
This commit is contained in:
Linus Torvalds
2011-03-25 17:47:38 -07:00
parent 7c8d891c2c 1c833bc3b6
commit 73939bb56a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sparc/kernel/time_32.c
View File

@@ -145,6 +145,10 @@ static int __devinit clock_probe(struct platform_device *op)
if (!model) if (!model)
return -ENODEV; return -ENODEV;
/* Only the primary RTC has an address property */
if (!of_find_property(dp, "address", NULL))
return -ENODEV;
m48t59_rtc.resource = &op->resource[0]; m48t59_rtc.resource = &op->resource[0];
if (!strcmp(model, "mk48t02")) { if (!strcmp(model, "mk48t02")) {
/* Map the clock register io area read-only */ /* Map the clock register io area read-only */