Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 655a0a77 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

[PATCH] serial: add MMIO support to 8250_pnp 



Add support for UARTs in MMIO space and clean up a little whitespace.

HP legacy-free ia64 machines need this.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3d483f47

drivers/serial/8250_pnp.c

+15 −7
Original line number Diff line number Diff line
@@ -407,14 +407,22 @@ serial_pnp_probe(struct pnp_dev * dev, const struct pnp_device_id *dev_id) 


	memset(&port, 0, sizeof(struct uart_port));

	port.irq = pnp_irq(dev, 0);

	if (pnp_port_valid(dev, 0)) {

		port.iobase = pnp_port_start(dev, 0);

		port.iotype = UPIO_PORT;

	} else if (pnp_mem_valid(dev, 0)) {

		port.mapbase = pnp_mem_start(dev, 0);

		port.iotype = UPIO_MEM;

		port.flags = UPF_IOREMAP;

	} else

		return -ENODEV;



#ifdef SERIAL_DEBUG_PNP

	printk("Setup PNP port: port %x, irq %d, type %d\n",

	       port.iobase, port.irq, port.iotype);

	printk("Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n",

	       port.iobase, port.mapbase, port.irq, port.iotype);

#endif



	port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;

	port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;

	port.uartclk = 1843200;

	port.dev = &dev->dev;