diff options
author | Paul Mackerras <paulus@samba.org> | 2006-08-25 00:56:07 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-08-25 00:56:07 -0400 |
commit | ea0763a7e62f60f3e166327268a80f16ad806718 (patch) | |
tree | de54ec5e5d5a49b3cba81b096b7572852aa6f5a9 /arch/powerpc/kernel/legacy_serial.c | |
parent | 271c511db9d37d6797745adb1f151a8bd2838c6f (diff) | |
parent | c85c41ad73c6db4cf4cc98c595cc5e2fdbdb53d5 (diff) |
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, | |||
116 | u64 addr; | 116 | u64 addr; |
117 | const u32 *addrp; | 117 | const u32 *addrp; |
118 | upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ; | 118 | upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ; |
119 | struct device_node *tsi = of_get_parent(np); | ||
119 | 120 | ||
120 | /* We only support ports that have a clock frequency properly | 121 | /* We only support ports that have a clock frequency properly |
121 | * encoded in the device-tree. | 122 | * encoded in the device-tree. |
@@ -135,7 +136,10 @@ static int __init add_legacy_soc_port(struct device_node *np, | |||
135 | /* Add port, irq will be dealt with later. We passed a translated | 136 | /* Add port, irq will be dealt with later. We passed a translated |
136 | * IO port value. It will be fixed up later along with the irq | 137 | * IO port value. It will be fixed up later along with the irq |
137 | */ | 138 | */ |
138 | return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags, 0); | 139 | if (tsi && !strcmp(tsi->type, "tsi-bridge")) |
140 | return add_legacy_port(np, -1, UPIO_TSI, addr, addr, NO_IRQ, flags, 0); | ||
141 | else | ||
142 | return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags, 0); | ||
139 | } | 143 | } |
140 | 144 | ||
141 | static int __init add_legacy_isa_port(struct device_node *np, | 145 | static int __init add_legacy_isa_port(struct device_node *np, |
@@ -465,7 +469,7 @@ static int __init serial_dev_init(void) | |||
465 | fixup_port_irq(i, np, port); | 469 | fixup_port_irq(i, np, port); |
466 | if (port->iotype == UPIO_PORT) | 470 | if (port->iotype == UPIO_PORT) |
467 | fixup_port_pio(i, np, port); | 471 | fixup_port_pio(i, np, port); |
468 | if (port->iotype == UPIO_MEM) | 472 | if ((port->iotype == UPIO_MEM) || (port->iotype == UPIO_TSI)) |
469 | fixup_port_mmio(i, np, port); | 473 | fixup_port_mmio(i, np, port); |
470 | } | 474 | } |
471 | 475 | ||