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

Commit be9633e9 authored by Zang Roy-r61911's avatar Zang Roy-r61911 Committed by Paul Mackerras
Browse files

[POWERPC] Pass UPIO_TSI flag to 8259 serial driver 



The patch passes the UPIO_TSI flag to general 8259 serial driver

Signed-off-by: default avatarRoy Zang <tie-fei.zang@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent c4342ff9

arch/powerpc/kernel/legacy_serial.c

+6 −2
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ static int __init add_legacy_soc_port(struct device_node *np, 
	u64 addr;

	u32 *addrp;

	upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ;

	struct device_node *tsi = of_get_parent(np);



	/* We only support ports that have a clock frequency properly

	 * encoded in the device-tree.
@@ -134,6 +135,9 @@ static int __init add_legacy_soc_port(struct device_node *np, 
	/* Add port, irq will be dealt with later. We passed a translated

	 * IO port value. It will be fixed up later along with the irq

	 */

	if (tsi && !strcmp(tsi->type, "tsi-bridge"))

		return add_legacy_port(np, -1, UPIO_TSI, addr, addr, NO_IRQ, flags, 0);

	else

		return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags, 0);

}
@@ -464,7 +468,7 @@ static int __init serial_dev_init(void) 
			fixup_port_irq(i, np, port);

		if (port->iotype == UPIO_PORT)

			fixup_port_pio(i, np, port);

		if (port->iotype == UPIO_MEM)

		if ((port->iotype == UPIO_MEM) || (port->iotype == UPIO_TSI))

			fixup_port_mmio(i, np, port);

	}