[PATCH 2/2] PC speaker init fix

[Michael Neuling]

Fixes init for the PC speaker on ppc64

Signed-off-by: Michael Neuling <mikey at neuling.org>
---
 include/asm-ppc64/parport.h |   28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

Index: linux-2.6/include/asm-ppc64/parport.h
===================================================================
--- linux-2.6.orig/include/asm-ppc64/parport.h	2005-10-26 16:50:32.000000000 +1000
+++ linux-2.6/include/asm-ppc64/parport.h	2005-10-27 17:07:04.000000000 +1000
@@ -9,10 +9,34 @@
 #ifndef _ASM_PPC64_PARPORT_H
 #define _ASM_PPC64_PARPORT_H
 
-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 /* !(_ASM_PPC_PARPORT_H) */