diff options
| author | Michael Neuling <mikey@neuling.org> | 2006-01-11 12:08:56 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-11 14:49:24 +1100 |
| commit | 193cac99f6d8604aca71e5a966a8cd1dfb84819d (patch) | |
| tree | 1e2cca9d04fd495b0b7f538ab19fca6e4328c759 | |
| parent | 296167ae1799815b9ed2d135a847436502f2ee91 (diff) | |
| download | op-kernel-dev-193cac99f6d8604aca71e5a966a8cd1dfb84819d.zip op-kernel-dev-193cac99f6d8604aca71e5a966a8cd1dfb84819d.tar.gz | |
[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>
| -rw-r--r-- | include/asm-powerpc/parport.h | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/include/asm-powerpc/parport.h b/include/asm-powerpc/parport.h index 897e49a..3fca21d 100644 --- 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__ */ |
