sparc: Remove generic SBUS probing layer.

The individual SBUS IOMMU arch code now sets the IOMMU information
directly into the OF device objects.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 41 insertions, 29 deletions

diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c
index 0f97ab30df3f..caf551ad9d8c 100644
--- a/arch/sparc/mm/io-unit.c
+++ b/arch/sparc/mm/io-unit.c
@@ -34,18 +34,10 @@
 #define IOPERM        (IOUPTE_CACHE | IOUPTE_WRITE | IOUPTE_VALID)
 #define MKIOPTE(phys) __iopte((((phys)>>4) & IOUPTE_PAGE) | IOPERM)
 
-void __init iounit_init(struct sbus_bus *sbus)
+static void __init iounit_iommu_init(struct of_device *op)
 {
-        struct device_node *dp = sbus->ofdev.node;
         struct iounit_struct *iounit;
         iopte_t *xpt, *xptend;
-        struct of_device *op;
-
-        op = of_find_device_by_node(dp);
-        if (!op) {
-                prom_printf("SUN4D: Cannot find SBI of_device.\n");
-                prom_halt();
-        }
 
         iounit = kzalloc(sizeof(struct iounit_struct), GFP_ATOMIC);
         if (!iounit) {
@@ -66,7 +58,6 @@ void __init iounit_init(struct sbus_bus *sbus)
                 prom_halt();
         }
         
-        sbus->ofdev.dev.archdata.iommu = iounit;
         op->dev.archdata.iommu = iounit;
         iounit->page_table = xpt;
         spin_lock_init(&iounit->lock);
@@ -76,6 +67,25 @@ void __init iounit_init(struct sbus_bus *sbus)
                 iopte_val(*xpt++) = 0;
 }
 
+static int __init iounit_init(void)
+{
+        extern void sun4d_init_sbi_irq(void);
+        struct device_node *dp;
+
+        for_each_node_by_name(dp, "sbi") {
+                struct of_device *op = of_find_device_by_node(dp);
+
+                iounit_iommu_init(op);
+                of_propagate_archdata(op);
+        }
+
+        sun4d_init_sbi_irq();
+
+        return 0;
+}
+
+subsys_initcall(iounit_init);
+
 /* One has to hold iounit->lock to call this */
 static unsigned long iounit_get_area(struct iounit_struct *iounit, unsigned long vaddr, int size)
 {
diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c
index 2970cea877b1..7c55450b55b9 100644
--- a/arch/sparc/mm/iommu.c
+++ b/arch/sparc/mm/iommu.c
@@ -55,33 +55,20 @@ static pgprot_t dvma_prot;		/* Consistent mapping pte flags */
 #define IOPERM        (IOPTE_CACHE | IOPTE_WRITE | IOPTE_VALID)
 #define MKIOPTE(pfn, perm) (((((pfn)<<8) & IOPTE_PAGE) | (perm)) & ~IOPTE_WAZ)
 
-void __init iommu_init(struct device_node *parent, struct sbus_bus *sbus)
+static void __init sbus_iommu_init(struct of_device *op)
 {
-        struct of_device *parent_op, *op;
         struct iommu_struct *iommu;
         unsigned int impl, vers;
         unsigned long *bitmap;
         unsigned long tmp;
 
-        parent_op = of_find_device_by_node(parent);
-        if (!parent_op) {
-                prom_printf("Unable to find IOMMU of_device\n");
-                prom_halt();
-        }
-
-        op = of_find_device_by_node(sbus->ofdev.node);
-        if (!op) {
-                prom_printf("Unable to find SBUS of_device\n");
-                prom_halt();
-        }
-
         iommu = kmalloc(sizeof(struct iommu_struct), GFP_ATOMIC);
         if (!iommu) {
                 prom_printf("Unable to allocate iommu structure\n");
                 prom_halt();
         }
 
-        iommu->regs = of_ioremap(&parent_op->resource[0], 0, PAGE_SIZE * 3,
+        iommu->regs = of_ioremap(&op->resource[0], 0, PAGE_SIZE * 3,
                                  "iommu_regs");
         if (!iommu->regs) {
                 prom_printf("Cannot map IOMMU registers\n");
@@ -132,14 +119,29 @@ void __init iommu_init(struct device_node *parent, struct sbus_bus *sbus)
         else
                 iommu->usemap.num_colors = 1;
 
-        printk("IOMMU: impl %d vers %d table 0x%p[%d B] map [%d b]\n",
-            impl, vers, iommu->page_table,
-            (int)(IOMMU_NPTES*sizeof(iopte_t)), (int)IOMMU_NPTES);
+        printk(KERN_INFO "IOMMU: impl %d vers %d table 0x%p[%d B] map [%d b]\n",
+               impl, vers, iommu->page_table,
+               (int)(IOMMU_NPTES*sizeof(iopte_t)), (int)IOMMU_NPTES);
 
-        sbus->ofdev.dev.archdata.iommu = iommu;
         op->dev.archdata.iommu = iommu;
 }
 
+static int __init iommu_init(void)
+{
+        struct device_node *dp;
+
+        for_each_node_by_name(dp, "iommu") {
+                struct of_device *op = of_find_device_by_node(dp);
+
+                sbus_iommu_init(op);
+                of_propagate_archdata(op);
+        }
+
+        return 0;
+}
+
+subsys_initcall(iommu_init);
+
 /* This begs to be btfixup-ed by srmmu. */
 /* Flush the iotlb entries to ram. */
 /* This could be better if we didn't have to flush whole pages. */