Commit 69961c37 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

[PATCH] m68k/Atari: Interrupt updates



Misc Atari fixes:
  - initialize correct number of atari irqs
  - silence vbl interrupt until it's used by atafb
  - use mdelay() to read clock if necessary
Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent da96d0b5
...@@ -332,6 +332,9 @@ static void atari_shutdown_irq(unsigned int irq) ...@@ -332,6 +332,9 @@ static void atari_shutdown_irq(unsigned int irq)
atari_disable_irq(irq); atari_disable_irq(irq);
atari_turnoff_irq(irq); atari_turnoff_irq(irq);
m68k_irq_shutdown(irq); m68k_irq_shutdown(irq);
if (irq == IRQ_AUTO_4)
vectors[VEC_INT4] = falcon_hblhandler;
} }
static struct irq_controller atari_irq_controller = { static struct irq_controller atari_irq_controller = {
...@@ -356,7 +359,7 @@ static struct irq_controller atari_irq_controller = { ...@@ -356,7 +359,7 @@ static struct irq_controller atari_irq_controller = {
void __init atari_init_IRQ(void) void __init atari_init_IRQ(void)
{ {
m68k_setup_user_interrupt(VEC_USER, 192, NULL); m68k_setup_user_interrupt(VEC_USER, NUM_ATARI_SOURCES - IRQ_USER, NULL);
m68k_setup_irq_controller(&atari_irq_controller, 1, NUM_ATARI_SOURCES - 1); m68k_setup_irq_controller(&atari_irq_controller, 1, NUM_ATARI_SOURCES - 1);
/* Initialize the MFP(s) */ /* Initialize the MFP(s) */
...@@ -403,8 +406,10 @@ void __init atari_init_IRQ(void) ...@@ -403,8 +406,10 @@ void __init atari_init_IRQ(void)
* gets overruns) * gets overruns)
*/ */
if (!MACH_IS_HADES) if (!MACH_IS_HADES) {
vectors[VEC_INT2] = falcon_hblhandler; vectors[VEC_INT2] = falcon_hblhandler;
vectors[VEC_INT4] = falcon_hblhandler;
}
} }
if (ATARIHW_PRESENT(PCM_8BIT) && ATARIHW_PRESENT(MICROWIRE)) { if (ATARIHW_PRESENT(PCM_8BIT) && ATARIHW_PRESENT(MICROWIRE)) {
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/delay.h>
#include <asm/atariints.h> #include <asm/atariints.h>
...@@ -212,8 +213,12 @@ int atari_tt_hwclk( int op, struct rtc_time *t ) ...@@ -212,8 +213,12 @@ int atari_tt_hwclk( int op, struct rtc_time *t )
* additionally the RTC_SET bit is set to prevent an update cycle. * additionally the RTC_SET bit is set to prevent an update cycle.
*/ */
while( RTC_READ(RTC_FREQ_SELECT) & RTC_UIP ) while( RTC_READ(RTC_FREQ_SELECT) & RTC_UIP ) {
schedule_timeout_interruptible(HWCLK_POLL_INTERVAL); if (in_atomic() || irqs_disabled())
mdelay(1);
else
schedule_timeout_interruptible(HWCLK_POLL_INTERVAL);
}
local_irq_save(flags); local_irq_save(flags);
RTC_WRITE( RTC_CONTROL, ctrl | RTC_SET ); RTC_WRITE( RTC_CONTROL, ctrl | RTC_SET );
......
...@@ -132,6 +132,7 @@ void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt, ...@@ -132,6 +132,7 @@ void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,
{ {
int i; int i;
BUG_ON(IRQ_USER + cnt >= NR_IRQS);
m68k_first_user_vec = vec; m68k_first_user_vec = vec;
for (i = 0; i < cnt; i++) for (i = 0; i < cnt; i++)
irq_controller[IRQ_USER + i] = &user_irq_controller; irq_controller[IRQ_USER + i] = &user_irq_controller;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment