[PATCH] 996/1: GraphicsClient irq code

Updated the IRQ code to the new model.
also removed some dead code.

Not tested (the tree is too broken to compile) but this should still
be better than totally wrong and obsolete code.

diff --git a/arch/arm/mach-sa1100/graphicsclient.c b/arch/arm/mach-sa1100/graphicsclient.c
index 9178fed76dec315fa31017505abaadb3dcd1ec6b..9997cdc1168660f6ed68972c73369f3b650e2728 100644 (file)
--- a/arch/arm/mach-sa1100/graphicsclient.c
+++ b/arch/arm/mach-sa1100/graphicsclient.c
@@ -32,67 +32,62 @@
  * Handlers for GraphicsClient's external IRQ logic
  */
 
-static void ADS_IRQ_demux( int irq, void *dev_id, struct pt_regs *regs )
+static void
+gc_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
 {
-       int i;
+       unsigned int mask;
+
+       while ((mask = ADS_INT_ST1 | (ADS_INT_ST2 << 8))) {
+               /* clear the parent IRQ */
+               GEDR = GPIO_GPIO0;
 
-       while( (irq = ADS_INT_ST1 | (ADS_INT_ST2 << 8)) ){
-               for( i = 0; i < 16; i++ )
-                       if( irq & (1<<i) )
-                               do_IRQ( ADS_EXT_IRQ(i), regs );
+               irq = ADS_EXT_IRQ(0);
+               desc = irq_desc + irq;
+
+               do {
+                       if (mask & 1)
+                               desc->handle(irq, desc, regs);
+                       mask >>= 1;
+                       irq++;
+                       desc++;
+               } while (mask);
        }
 }
 
-static struct irqaction ADS_ext_irq = {
-       name:           "ADS_ext_IRQ",
-       handler:        ADS_IRQ_demux,
-       flags:          SA_INTERRUPT
-};
-
-static void ADS_mask_and_ack_irq0(unsigned int irq)
+static void gc_mask_irq1(unsigned int irq)
 {
        int mask = (1 << (irq - ADS_EXT_IRQ(0)));
        ADS_INT_EN1 &= ~mask;
        ADS_INT_ST1 = mask;
 }
 
-static void ADS_mask_irq0(unsigned int irq)
-{
-       ADS_INT_ST1 = (1 << (irq - ADS_EXT_IRQ(0)));
-}
-
-static void ADS_unmask_irq0(unsigned int irq)
+static void gc_unmask_irq1(unsigned int irq)
 {
        ADS_INT_EN1 |= (1 << (irq - ADS_EXT_IRQ(0)));
 }
 
-static struct irqchip ADS0_chip = {
-       ack:    ADS_mask_and_ack_irq0,
-       mask:   ADS_mask_irq0,
-       unmask: ADS_unmask_irq0,
+static struct irqchip gc_irq1_chip = {
+       ack:    gc_mask_irq1,
+       mask:   gc_mask_irq1,
+       unmask: gc_unmask_irq1,
 };
 
-static void ADS_mask_and_ack_irq1(unsigned int irq)
+static void gc_mask_irq2(unsigned int irq)
 {
        int mask = (1 << (irq - ADS_EXT_IRQ(8)));
        ADS_INT_EN2 &= ~mask;
        ADS_INT_ST2 = mask;
 }
 
-static void ADS_mask_irq1(unsigned int irq)
-{
-       ADS_INT_ST2 = (1 << (irq - ADS_EXT_IRQ(8)));
-}
-
-static void ADS_unmask_irq1(unsigned int irq)
+static void gc_unmask_irq2(unsigned int irq)
 {
        ADS_INT_EN2 |= (1 << (irq - ADS_EXT_IRQ(8)));
 }
 
-static struct irqchip ADS1_chip = {
-       ack:    ADS_mask_and_ack_irq1,
-       mask:   ADS_mask_irq1,
-       unmask: ADS_unmask_irq1,
+static struct irqchip gc_irq2_chip = {
+       ack:    gc_mask_irq2,
+       mask:   gc_mask_irq2,
+       unmask: gc_unmask_irq2,
 };
 
 static void __init graphicsclient_init_irq(void)
@@ -105,22 +100,23 @@ static void __init graphicsclient_init_irq(void)
        /* disable all IRQs */
        ADS_INT_EN1 = 0;
        ADS_INT_EN2 = 0;
+
        /* clear all IRQs */
        ADS_INT_ST1 = 0xff;
        ADS_INT_ST2 = 0xff;
 
        for (irq = ADS_EXT_IRQ(0); irq <= ADS_EXT_IRQ(7); irq++) {
-               set_irq_chip(irq, &ADS0_chip);
+               set_irq_chip(irq, &gc_irq1_chip);
                set_irq_handler(irq, do_level_IRQ);
                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
        }
        for (irq = ADS_EXT_IRQ(8); irq <= ADS_EXT_IRQ(15); irq++) {
-               set_irq_chip(irq, &ADS1_chip);
+               set_irq_chip(irq, &gc_irq2_chip);
                set_irq_handler(irq, do_level_IRQ);
                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
        }
-       set_GPIO_IRQ_edge(GPIO_GPIO0, GPIO_FALLING_EDGE);
-       setup_arm_irq( IRQ_GPIO0, &ADS_ext_irq );
+       set_irq_type(IRQ_GPIO0, IRQT_FALLING);
+       set_irq_chained_handler(IRQ_GPIO0, gc_irq_handler);
 }
 
 
@@ -148,111 +144,6 @@ static struct map_desc graphicsclient_io_desc[] __initdata = {
   LAST_DESC
 };
 
-static struct gc_uart_ctrl_data_t gc_uart_ctrl_data[] = {
-  { GPIO_GC_UART0_CTS, 0, NULL,NULL },
-  { GPIO_GC_UART1_CTS, 0, NULL,NULL },
-  { GPIO_GC_UART2_CTS, 0, NULL,NULL }
-};
-
-#error Old code.  Someone needs to decide what to do with this
-#if 0 
-static void
-graphicsclient_cts_intr(int irq, void *dev_id, struct pt_regs *regs)
-{
-       struct gc_uart_ctrl_data_t * uart_data = (struct gc_uart_ctrl_data_t *)dev_id;
-       int cts = !(GPLR & uart_data->cts_gpio);
-
-       /* NOTE: I supose that we will no get any interrupt
-          if the GPIO is not changed, so maybe
-          the cts_prev_state can be removed ... */
-       if (cts != uart_data->cts_prev_state) {
-               uart_data->cts_prev_state = cts;
-
-               uart_handle_cts_change(uart_data->info, cts);
-       }
-}
-
-static int
-graphicsclient_register_cts_intr(int gpio, int irq,
-                                struct gc_uart_ctrl_data_t *uart_data)
-{
-       int ret = 0;
-
-       set_GPIO_IRQ_edge(gpio, GPIO_BOTH_EDGES);
-
-       ret = request_irq(irq, graphicsclient_cts_intr,
-                         0, "GC RS232 CTS", uart_data);
-       if (ret) {
-               printk(KERN_ERR "uart_open: failed to register CTS irq (%d)\n",
-                      ret);
-               free_irq(irq, uart_data);
-       }
-
-       return ret;
-}
-
-static int
-graphicsclient_uart_open(struct uart_port *port, struct uart_info *info)
-{
-       int ret = 0;
-
-       if (port->mapbase == _Ser1UTCR0) {
-               Ser1SDCR0 |= SDCR0_UART;
-               /* Set RTS Output */
-               GPSR  = GPIO_GC_UART0_RTS;
-
-               gc_uart_ctrl_data[0].cts_prev_state = 0;
-               gc_uart_ctrl_data[0].info = info;
-               gc_uart_ctrl_data[0].port = port;
-
-               /* register uart0 CTS irq */
-               ret = graphicsclient_register_cts_intr(GPIO_GC_UART0_CTS,
-                                                       IRQ_GC_UART0_CTS,
-                                                       &gc_uart_ctrl_data[0]);
-       } else if (port->mapbase == _Ser2UTCR0) {
-               Ser2UTCR4 = Ser2HSCR0 = 0;
-               /* Set RTS Output */
-               GPSR  = GPIO_GC_UART1_RTS;
-
-               gc_uart_ctrl_data[1].cts_prev_state = 0;
-               gc_uart_ctrl_data[1].info = info;
-               gc_uart_ctrl_data[1].port = port;
-
-               /* register uart1 CTS irq */
-               ret = graphicsclient_register_cts_intr(GPIO_GC_UART1_CTS,
-                                                       IRQ_GC_UART1_CTS,
-                                                       &gc_uart_ctrl_data[1]);
-       } else if (port->mapbase == _Ser3UTCR0) {
-               /* Set RTS Output */
-               GPSR =  GPIO_GC_UART2_RTS;
-
-               gc_uart_ctrl_data[2].cts_prev_state = 0;
-               gc_uart_ctrl_data[2].info = info;
-               gc_uart_ctrl_data[2].port = port;
-
-               /* register uart2 CTS irq */
-               ret = graphicsclient_register_cts_intr(GPIO_GC_UART2_CTS,
-                                                       IRQ_GC_UART2_CTS,
-                                                       &gc_uart_ctrl_data[2]);
-       }
-       return ret;
-}
-
-static int
-graphicsclient_uart_close(struct uart_port *port, struct uart_info *info)
-{
-       if (port->mapbase == _Ser1UTCR0) {
-               free_irq(IRQ_GC_UART0_CTS, &gc_uart_ctrl_data[0]);
-       } else if (port->mapbase == _Ser2UTCR0) {
-               free_irq(IRQ_GC_UART1_CTS, &gc_uart_ctrl_data[1]);
-       } else if (port->mapbase == _Ser3UTCR0) {
-               free_irq(IRQ_GC_UART2_CTS, &gc_uart_ctrl_data[2]);
-       }
-
-       return 0;
-}
-#endif
-
 static u_int graphicsclient_get_mctrl(struct uart_port *port)
 {
        u_int result = TIOCM_CD | TIOCM_DSR;

diff --git a/include/asm-arm/arch-sa1100/graphicsclient.h b/include/asm-arm/arch-sa1100/graphicsclient.h
index 794cbfe675bd561735c08ee4fd978c938dffe40b..024e38709f1bf0903abe40f36d7e51d7d6afba59 100644 (file)
--- a/include/asm-arm/arch-sa1100/graphicsclient.h
+++ b/include/asm-arm/arch-sa1100/graphicsclient.h
@@ -76,15 +76,6 @@
 #define IRQ_GC_UART1_CTS       IRQ_GPIO16
 #define IRQ_GC_UART2_CTS       IRQ_GPIO17
 
-#ifndef __ASSEMBLY__
-struct gc_uart_ctrl_data_t {
-  int cts_gpio;
-  int cts_prev_state;
-  struct uart_info *info;
-  struct uart_port *port;
-};
-#endif /* __ASSEMBLY__ */
-
 /* LEDs */
 
 #define ADS_LED0       GPIO_GPIO20             /* on-board D22 */