diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-30 17:34:04 +0000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2009-04-07 15:07:43 +1000 |
| commit | f08b7e9f551fa74219bf32df483fb95c58aad94b (patch) | |
| tree | b509d5f95e751bd5017e4689da7d24165c94b50c /drivers/serial | |
| parent | b6966b1be568e83a48585369731f1123a6f85157 (diff) | |
| download | linux-3.10-f08b7e9f551fa74219bf32df483fb95c58aad94b.tar.gz linux-3.10-f08b7e9f551fa74219bf32df483fb95c58aad94b.tar.bz2 linux-3.10-f08b7e9f551fa74219bf32df483fb95c58aad94b.zip | |
powerpc/pmac: Fix internal modem IRQ on Wallstreet PowerBook
The (relatively) new pmac_zilog driver doesn't use the pre-munged
IRQ numbers from the macio_dev unlike other macio things, it
directly maps it off the OF device-tree.
It does that because it can be initialized much earlier than the
registration of the macio devices, in order to get a serial
console early.
Unfortunately, that means that it "misses" some fixups done
by the macio layer to work around missing interrupt descriptions
in the device-tree of the Wallstreet machines.
This patch brings the necessary workaround into the pmac_zilog
driver itself to bring it back to working condition.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/pmac_zilog.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index ad348850401..9c1243fbd51 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c @@ -1538,6 +1538,21 @@ no_dma: uap->port.type = PORT_PMAC_ZILOG; uap->port.flags = 0; + /* + * Fixup for the port on Gatwick for which the device-tree has + * missing interrupts. Normally, the macio_dev would contain + * fixed up interrupt info, but we use the device-tree directly + * here due to early probing so we need the fixup too. + */ + if (uap->port.irq == NO_IRQ && + np->parent && np->parent->parent && + of_device_is_compatible(np->parent->parent, "gatwick")) { + /* IRQs on gatwick are offset by 64 */ + uap->port.irq = irq_create_mapping(NULL, 64 + 15); + uap->tx_dma_irq = irq_create_mapping(NULL, 64 + 4); + uap->rx_dma_irq = irq_create_mapping(NULL, 64 + 5); + } + /* Setup some valid baud rate information in the register * shadows so we don't write crap there before baud rate is * first initialized. |