diff options
author | Paul Mackerras <paulus@samba.org> | 2006-08-25 14:56:07 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-08-25 14:56:07 +1000 |
commit | ea0763a7e62f60f3e166327268a80f16ad806718 (patch) | |
tree | de54ec5e5d5a49b3cba81b096b7572852aa6f5a9 /arch/powerpc/kernel/legacy_serial.c | |
parent | 271c511db9d37d6797745adb1f151a8bd2838c6f (diff) | |
parent | c85c41ad73c6db4cf4cc98c595cc5e2fdbdb53d5 (diff) | |
download | linux-ea0763a7e62f60f3e166327268a80f16ad806718.tar.gz linux-ea0763a7e62f60f3e166327268a80f16ad806718.tar.bz2 linux-ea0763a7e62f60f3e166327268a80f16ad806718.zip |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/kernel/legacy_serial.c')
-rw-r--r-- | arch/powerpc/kernel/legacy_serial.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index ee1e0b8c7f1f..5e6ddfa474c0 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c @@ -116,6 +116,7 @@ static int __init add_legacy_soc_port(struct device_node *np, u64 addr; const 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. @@ -135,7 +136,10 @@ 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 */ - return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags, 0); + 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); } static int __init add_legacy_isa_port(struct device_node *np, @@ -465,7 +469,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); } |