Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 193cac99f6d8604aca71e5a966a8cd1dfb84819d

Authored by Michael Neuling
Committed by Paul Mackerras
1 parent 296167ae17
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 26 additions and 2 deletions Side-by-side Diff

include/asm-powerpc/parport.h
Diff comments   View file @ 193cac9
... ... @@ -10,10 +10,34 @@
10 10 #define _ASM_POWERPC_PARPORT_H
11 11 #ifdef __KERNEL__
12 12  
13   -static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma);
  13 +#include <asm/prom.h>
  14 +
  15 +extern struct parport *parport_pc_probe_port (unsigned long int base,
  16 + unsigned long int base_hi,
  17 + int irq, int dma,
  18 + struct pci_dev *dev);
  19 +
14 20 static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
15 21 {
16   - return parport_pc_find_isa_ports (autoirq, autodma);
  22 + struct device_node *np;
  23 + u32 *prop;
  24 + u32 io1, io2;
  25 + int propsize;
  26 + int count = 0;
  27 + for (np = NULL; (np = of_find_compatible_node(np,
  28 + "parallel",
  29 + "pnpPNP,400")) != NULL;) {
  30 + prop = (u32 *)get_property(np, "reg", &propsize);
  31 + if (!prop || propsize > 6*sizeof(u32))
  32 + continue;
  33 + io1 = prop[1]; io2 = prop[2];
  34 + prop = (u32 *)get_property(np, "interrupts", NULL);
  35 + if (!prop)
  36 + continue;
  37 + if (parport_pc_probe_port(io1, io2, prop[0], autodma, NULL) != NULL)
  38 + count++;
  39 + }
  40 + return count;
17 41 }
18 42  
19 43 #endif /* __KERNEL__ */