[PATCH] powerpc: parallel port init fix

This stops parport from accessing nonexistent parallel ports.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/include/asm-powerpc/parport.h b/include/asm-powerpc/parport.h
index 897e49a88a6b091dde6d8910d0553adf8578887e..3fca21ddf546c4213f863bffa8cf7790d612e516 100644 (file)
--- a/include/asm-powerpc/parport.h
+++ b/include/asm-powerpc/parport.h
@@ -10,10 +10,34 @@
 #define _ASM_POWERPC_PARPORT_H
 #ifdef __KERNEL__
 
-static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma);
+#include <asm/prom.h>
+
+extern struct parport *parport_pc_probe_port (unsigned long int base,
+                                              unsigned long int base_hi,
+                                              int irq, int dma,
+                                              struct pci_dev *dev);
+
 static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
 {
-       return parport_pc_find_isa_ports (autoirq, autodma);
+       struct device_node *np;
+       u32 *prop;
+       u32 io1, io2;
+       int propsize;
+       int count = 0;
+       for (np = NULL; (np = of_find_compatible_node(np,
+                                                     "parallel",
+                                                     "pnpPNP,400")) != NULL;) {
+               prop = (u32 *)get_property(np, "reg", &propsize);
+               if (!prop || propsize > 6*sizeof(u32))
+                       continue;
+               io1 = prop[1]; io2 = prop[2];
+               prop = (u32 *)get_property(np, "interrupts", NULL);
+               if (!prop)
+                       continue;
+               if (parport_pc_probe_port(io1, io2, prop[0], autodma, NULL) != NULL)
+                       count++;
+       }
+       return count;
 }
 
 #endif /* __KERNEL__ */