linux-toradex.git/arch/m68k/mac/macints.c, branch v3.4.23

m68k/mac: oss irq fixes

2011-12-10T18:52:47+00:00

The IOP driver calls into the OSS driver to enable its IRQ. This undesirable coupling between drivers only exists because the OSS driver doesn't correctly handle all of its machspec IRQs.

Fix OSS handling of enable/disable for VIA1 IRQs (8 thru 15) which includes MAC_IRQ_ADB.

Back when I implemented pmac_zilog support I redefined IRQ_MAC_SCC incorrectly. Change this to a machspec IRQ so that it works on OSS.

Clean up the unused OSS audio IRQ and OSS_IRQLEV_* cruft that only confuses things.

Fix the OSS description in macints.c and remove an obsolete comment.

Don't enable the VIA1 irq before registering the handler.

Signed-off-by: Finn Thain 
Signed-off-by: Geert Uytterhoeven

m68k/mac: fix nubus slot irq disable and shutdown

2011-12-10T18:52:47+00:00

Improve NuBus slot interrupt handling code and documentation. This patch fixes the NuBus NIC (mac8390) in my Quadra 700.

Signed-off-by: Finn Thain 
Signed-off-by: Geert Uytterhoeven

m68k/mac: enable via_alt_mapping on performa 580

2011-12-10T18:52:46+00:00

Enable via_alt_mapping on the Performa 588 and tidy up related documentation.

I'm betting that remapped IRQs work just fine on the Performa 580 series since it works on the LC 630 and the logic board part numbers are reputedly the same.

And the consensus seems to be that the Mac TV is essentially a Performa 550, not dissimilar to the Performa 520, so set the via_type accordingly.

Signed-off-by: Finn Thain 
Signed-off-by: Geert Uytterhoeven

m68k/mac: cleanup forward declarations

2011-12-10T18:52:46+00:00

Move some forward declarations into header files and adjust includes.

Signed-off-by: Finn Thain 
Signed-off-by: Geert Uytterhoeven

m68k/mac: cleanup mac_irq_pending

2011-12-10T18:52:46+00:00

mac_irq_pending() has only one caller (mac_esp.c). Nothing tests for Baboon, PSC or OSS pending interrupts. Until that need arises, let's keep it simple and remove all the unused abstraction. Replace it with a routine to check for SCSI DRQ.

Signed-off-by: Finn Thain 
Signed-off-by: Geert Uytterhoeven

m68k/mac: cleanup mac_clear_irq

2011-12-10T18:52:45+00:00

mac_clear_irq() is dead code and has been dead for as long as I can recall. On certain Mac models, certain irqs can't be cleared this way. Outside of irq dispatch, this code appears be unusable without busy loops or worse, and for irq dispatch we duplicate the same logic. Remove mac_clear_irq() and supporting code.

Signed-off-by: Finn Thain 
Signed-off-by: Geert Uytterhoeven

m68k/mac: Remove mac_irq_{en,dis}able() wrappers

2011-11-08T21:35:52+00:00

Signed-off-by: Finn Thain 
Signed-off-by: Geert Uytterhoeven

m68k/irq: Add m68k_setup_irq_controller()

2011-11-08T21:35:48+00:00

This is a wrapper around m68k_setup_irq_chip() that discards its dummy
second parameter, to ease the future transition to genirq.

Signed-off-by: Geert Uytterhoeven

m68k/irq: Switch irq_chip methods to "struct irq_data *data"

2011-11-08T21:35:47+00:00

Signed-off-by: Geert Uytterhoeven 
Acked-by: Thomas Gleixner

m68k/irq: Rename irq_controller to irq_chip

2011-11-08T21:35:47+00:00

Make it more similar to the genirq version:
  - Remove lock (unused as we don't do SMP anyway),
  - Prepend methods with irq_,
  - Make irq_startup() return unsigned int.

Signed-off-by: Geert Uytterhoeven 
Acked-by: Thomas Gleixner