Commit 75081322 authored by David S. Miller's avatar David S. Miller

sparc32: Convert PC RTC probing to pure OF driver.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent afc88ad6
...@@ -88,12 +88,12 @@ ...@@ -88,12 +88,12 @@
#endif #endif
#ifdef CONFIG_SPARC32 #ifdef CONFIG_SPARC32
#include <linux/pci.h> #include <linux/of.h>
#include <linux/jiffies.h> #include <linux/of_device.h>
#include <asm/ebus.h> #include <asm/io.h>
static unsigned long rtc_port; static unsigned long rtc_port;
static int rtc_irq = PCI_IRQ_NONE; static int rtc_irq;
#endif #endif
#ifdef CONFIG_HPET_RTC_IRQ #ifdef CONFIG_HPET_RTC_IRQ
...@@ -973,8 +973,8 @@ static int __init rtc_init(void) ...@@ -973,8 +973,8 @@ static int __init rtc_init(void)
char *guess = NULL; char *guess = NULL;
#endif #endif
#ifdef CONFIG_SPARC32 #ifdef CONFIG_SPARC32
struct linux_ebus *ebus; struct device_node *ebus_dp;
struct linux_ebus_device *edev; struct of_device *op;
#else #else
void *r; void *r;
#ifdef RTC_IRQ #ifdef RTC_IRQ
...@@ -983,21 +983,25 @@ static int __init rtc_init(void) ...@@ -983,21 +983,25 @@ static int __init rtc_init(void)
#endif #endif
#ifdef CONFIG_SPARC32 #ifdef CONFIG_SPARC32
for_each_ebus(ebus) { for_each_node_by_name(ebus_dp, "ebus") {
for_each_ebusdev(edev, ebus) { struct device_node *dp;
if (strcmp(edev->prom_node->name, "rtc") == 0) { for (dp = ebus_dp; dp; dp = dp->sibling) {
rtc_port = edev->resource[0].start; if (!strcmp(dp->name, "rtc")) {
rtc_irq = edev->irqs[0]; op = of_find_device_by_node(dp);
if (op) {
rtc_port = op->resource[0].start;
rtc_irq = op->irqs[0];
goto found; goto found;
} }
} }
} }
}
rtc_has_irq = 0; rtc_has_irq = 0;
printk(KERN_ERR "rtc_init: no PC rtc found\n"); printk(KERN_ERR "rtc_init: no PC rtc found\n");
return -EIO; return -EIO;
found: found:
if (rtc_irq == PCI_IRQ_NONE) { if (!rtc_irq) {
rtc_has_irq = 0; rtc_has_irq = 0;
goto no_irq; goto no_irq;
} }
......
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