aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty/serial/pmac_zilog.c')
-rw-r--r--drivers/tty/serial/pmac_zilog.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 063484b22523..d6aef8a1f0a4 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1693,22 +1693,26 @@ static int __init pmz_probe(void)
1693 1693
1694#else 1694#else
1695 1695
1696/* On PCI PowerMacs, pmz_probe() does an explicit search of the OpenFirmware
1697 * tree to obtain the device_nodes needed to start the console before the
1698 * macio driver. On Macs without OpenFirmware, global platform_devices take
1699 * the place of those device_nodes.
1700 */
1696extern struct platform_device scc_a_pdev, scc_b_pdev; 1701extern struct platform_device scc_a_pdev, scc_b_pdev;
1697 1702
1698static int __init pmz_init_port(struct uart_pmac_port *uap) 1703static int __init pmz_init_port(struct uart_pmac_port *uap)
1699{ 1704{
1700 struct resource *r_ports; 1705 struct resource *r_ports, *r_irq;
1701 int irq;
1702 1706
1703 r_ports = platform_get_resource(uap->pdev, IORESOURCE_MEM, 0); 1707 r_ports = platform_get_resource(uap->pdev, IORESOURCE_MEM, 0);
1704 irq = platform_get_irq(uap->pdev, 0); 1708 r_irq = platform_get_resource(uap->pdev, IORESOURCE_IRQ, 0);
1705 if (!r_ports || irq <= 0) 1709 if (!r_ports || !r_irq)
1706 return -ENODEV; 1710 return -ENODEV;
1707 1711
1708 uap->port.mapbase = r_ports->start; 1712 uap->port.mapbase = r_ports->start;
1709 uap->port.membase = (unsigned char __iomem *) r_ports->start; 1713 uap->port.membase = (unsigned char __iomem *) r_ports->start;
1710 uap->port.iotype = UPIO_MEM; 1714 uap->port.iotype = UPIO_MEM;
1711 uap->port.irq = irq; 1715 uap->port.irq = r_irq->start;
1712 uap->port.uartclk = ZS_CLOCK; 1716 uap->port.uartclk = ZS_CLOCK;
1713 uap->port.fifosize = 1; 1717 uap->port.fifosize = 1;
1714 uap->port.ops = &pmz_pops; 1718 uap->port.ops = &pmz_pops;