1 files changed, 58 insertions, 9 deletions

diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c
index 8812417247d4..ac05e0f692ef 100644
--- a/arch/sparc64/kernel/sbus.c
+++ b/arch/sparc64/kernel/sbus.c
@@ -19,6 +19,7 @@
 #include <asm/cache.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
+#include <asm/prom.h>
 #include <asm/starfire.h>
 
 #include "iommu_common.h"
@@ -1098,24 +1099,25 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)
 }
 
 /* Boot time initialization. */
-void __init sbus_iommu_init(int prom_node, struct sbus_bus *sbus)
+static void __init sbus_iommu_init(int __node, struct sbus_bus *sbus)
 {
-        struct linux_prom64_registers rprop;
+        struct linux_prom64_registers *pr;
+        struct device_node *dp;
         struct sbus_iommu *iommu;
         unsigned long regs, tsb_base;
         u64 control;
-        int err, i;
+        int i;
+
+        dp = of_find_node_by_phandle(__node);
 
-        sbus->portid = prom_getintdefault(sbus->prom_node,
-                                          "upa-portid", -1);
+        sbus->portid = of_getintprop_default(dp, "upa-portid", -1);
 
-        err = prom_getproperty(prom_node, "reg",
-                               (char *)&rprop, sizeof(rprop));
-        if (err < 0) {
+        pr = of_get_property(dp, "reg", NULL);
+        if (!pr) {
                 prom_printf("sbus_iommu_init: Cannot map SYSIO control registers.\n");
                 prom_halt();
         }
-        regs = rprop.phys_addr;
+        regs = pr->phys_addr;
 
         iommu = kmalloc(sizeof(*iommu) + SMP_CACHE_BYTES, GFP_ATOMIC);
         if (iommu == NULL) {
@@ -1225,3 +1227,50 @@ void __init sbus_iommu_init(int prom_node, struct sbus_bus *sbus)
 
         sysio_register_error_handlers(sbus);
 }
+
+void sbus_fill_device_irq(struct sbus_dev *sdev)
+{
+        struct device_node *dp = of_find_node_by_phandle(sdev->prom_node);
+        struct linux_prom_irqs *irqs;
+
+        irqs = of_get_property(dp, "interrupts", NULL);
+        if (!irqs) {
+                sdev->irqs[0] = 0;
+                sdev->num_irqs = 0;
+        } else {
+                unsigned int pri = irqs[0].pri;
+
+                sdev->num_irqs = 1;
+                if (pri < 0x20)
+                        pri += sdev->slot * 8;
+
+                sdev->irqs[0] = sbus_build_irq(sdev->bus, pri);
+        }
+}
+
+void __init sbus_arch_bus_ranges_init(struct device_node *pn, struct sbus_bus *sbus)
+{
+}
+
+void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)
+{
+        sbus_iommu_init(dp->node, sbus);
+}
+
+void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp)
+{
+}
+
+int __init sbus_arch_preinit(void)
+{
+        return 0;
+}
+
+void __init sbus_arch_postinit(void)
+{
+        extern void firetruck_init(void);
+        extern void clock_probe(void);
+
+        firetruck_init();
+        clock_probe();
+}