Commit 1c833bc3 authored by Kjetil Oftedal's avatar Kjetil Oftedal Committed by David S. Miller

sparc32: Fix multiple RTC detections on SUN4D

During the preparation for testing the recent changes made to the SUN4D
specific code in the kernel by Sam Ravnborg the following was discovered:

Since the removal of of_platform_bus_type (commit: eca39301 )
multiboard SUN4Ds have not been able to boot. The kernel crashes due to a
zero-pointer error encountered when registering multiple M48T59 RTCs
(There is one on each board).

A patch for the was previously submitted, but the problem was not a
serious at that time, as it would only generate warnings. Now the kernel
will crash and stop executing before the serial console has been started.
(Crash output can be viewed by using the -p boot flag)
Signed-off-by: default avatarKjetil Oftedal <oftedal@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b3f80f6d
...@@ -145,6 +145,10 @@ static int __devinit clock_probe(struct platform_device *op) ...@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment