|
@@ -48,6 +48,9 @@ static struct of_device_id legacy_serial_parents[] __initdata = {
|
|
|
static unsigned int legacy_serial_count;
|
|
|
static int legacy_serial_console = -1;
|
|
|
|
|
|
+static const upf_t legacy_port_flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
|
|
|
+ UPF_SHARE_IRQ | UPF_FIXED_PORT;
|
|
|
+
|
|
|
static unsigned int tsi_serial_in(struct uart_port *p, int offset)
|
|
|
{
|
|
|
unsigned int tmp;
|
|
@@ -160,8 +163,6 @@ static int __init add_legacy_soc_port(struct device_node *np,
|
|
|
{
|
|
|
u64 addr;
|
|
|
const __be32 *addrp;
|
|
|
- upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ
|
|
|
- | UPF_FIXED_PORT;
|
|
|
struct device_node *tsi = of_get_parent(np);
|
|
|
|
|
|
/* We only support ports that have a clock frequency properly
|
|
@@ -191,9 +192,11 @@ static int __init add_legacy_soc_port(struct device_node *np,
|
|
|
* 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);
|
|
|
+ return add_legacy_port(np, -1, UPIO_TSI, addr, addr,
|
|
|
+ NO_IRQ, legacy_port_flags, 0);
|
|
|
else
|
|
|
- return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags, 0);
|
|
|
+ return add_legacy_port(np, -1, UPIO_MEM, addr, addr,
|
|
|
+ NO_IRQ, legacy_port_flags, 0);
|
|
|
}
|
|
|
|
|
|
static int __init add_legacy_isa_port(struct device_node *np,
|
|
@@ -239,7 +242,7 @@ static int __init add_legacy_isa_port(struct device_node *np,
|
|
|
|
|
|
/* Add port, irq will be dealt with later */
|
|
|
return add_legacy_port(np, index, UPIO_PORT, be32_to_cpu(reg[1]),
|
|
|
- taddr, NO_IRQ, UPF_BOOT_AUTOCONF, 0);
|
|
|
+ taddr, NO_IRQ, legacy_port_flags, 0);
|
|
|
|
|
|
}
|
|
|
|
|
@@ -312,7 +315,7 @@ static int __init add_legacy_pci_port(struct device_node *np,
|
|
|
* IO port value. It will be fixed up later along with the irq
|
|
|
*/
|
|
|
return add_legacy_port(np, index, iotype, base, addr, NO_IRQ,
|
|
|
- UPF_BOOT_AUTOCONF, np != pci_dev);
|
|
|
+ legacy_port_flags, np != pci_dev);
|
|
|
}
|
|
|
#endif
|
|
|
|