Commit 50273978 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King

[PATCH] ARM: 2763/1: S3C24XX - mark IRQ_LCD as valid

Patch from Ben Dooks

Fix the IRQ_LCD so that it is marked as valid
since we no longer de-mux this in the main IRQ
handler.
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f2be64b3
...@@ -40,8 +40,11 @@ ...@@ -40,8 +40,11 @@
* 04-Nov-2004 Ben Dooks * 04-Nov-2004 Ben Dooks
* Fix standard IRQ wake for EINT0..4 and RTC * Fix standard IRQ wake for EINT0..4 and RTC
* *
* 22-Feb-2004 Ben Dooks * 22-Feb-2005 Ben Dooks
* Fixed edge-triggering on ADC IRQ * Fixed edge-triggering on ADC IRQ
*
* 28-Jun-2005 Ben Dooks
* Mark IRQ_LCD valid
*/ */
#include <linux/init.h> #include <linux/init.h>
...@@ -366,7 +369,6 @@ static struct irqchip s3c_irq_eint0t4 = { ...@@ -366,7 +369,6 @@ static struct irqchip s3c_irq_eint0t4 = {
#define INTMSK_UART1 (1UL << (IRQ_UART1 - IRQ_EINT0)) #define INTMSK_UART1 (1UL << (IRQ_UART1 - IRQ_EINT0))
#define INTMSK_UART2 (1UL << (IRQ_UART2 - IRQ_EINT0)) #define INTMSK_UART2 (1UL << (IRQ_UART2 - IRQ_EINT0))
#define INTMSK_ADCPARENT (1UL << (IRQ_ADCPARENT - IRQ_EINT0)) #define INTMSK_ADCPARENT (1UL << (IRQ_ADCPARENT - IRQ_EINT0))
#define INTMSK_LCD (1UL << (IRQ_LCD - IRQ_EINT0))
static inline void static inline void
s3c_irqsub_mask(unsigned int irqno, unsigned int parentbit, s3c_irqsub_mask(unsigned int irqno, unsigned int parentbit,
...@@ -716,7 +718,6 @@ void __init s3c24xx_init_irq(void) ...@@ -716,7 +718,6 @@ void __init s3c24xx_init_irq(void)
case IRQ_UART0: case IRQ_UART0:
case IRQ_UART1: case IRQ_UART1:
case IRQ_UART2: case IRQ_UART2:
case IRQ_LCD:
case IRQ_ADCPARENT: case IRQ_ADCPARENT:
set_irq_chip(irqno, &s3c_irq_level_chip); set_irq_chip(irqno, &s3c_irq_level_chip);
set_irq_handler(irqno, do_level_IRQ); set_irq_handler(irqno, do_level_IRQ);
......
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