Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / sh / boards / mach-landisk / irq.c

diff --git a/arch/sh/boards/mach-landisk/irq.c b/arch/sh/boards/mach-landisk/irq.c
index e79412a4049094a2610dbefc554da89384cfbce8..c00ace38db3f6e0913e35ac218a7731dcc522870 100644 (file)
--- a/arch/sh/boards/mach-landisk/irq.c
+++ b/arch/sh/boards/mach-landisk/irq.c
@@ -1,9 +1,10 @@
 /*
- * arch/sh/boards/landisk/irq.c
+ * arch/sh/boards/mach-landisk/irq.c
  *
  * I-O DATA Device, Inc. LANDISK Support
  *
  * Copyright (C) 2005-2007 kogiidena
+ * Copyright (C) 2011 Nobuhiro Iwamatsu
  *
  * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
  * Based largely on io_se.c.
@@ -12,44 +13,54 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
+
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <mach-landisk/mach/iodata_landisk.h>
 
-static void disable_landisk_irq(struct irq_data *data)
-{
-       unsigned char mask = 0xff ^ (0x01 << (data->irq - 5));
+enum {
+       UNUSED = 0,
 
-       __raw_writeb(__raw_readb(PA_IMASK) & mask, PA_IMASK);
-}
-
-static void enable_landisk_irq(struct irq_data *data)
-{
-       unsigned char value = (0x01 << (data->irq - 5));
+       PCI_INTA, /* PCI int A */
+       PCI_INTB, /* PCI int B */
+       PCI_INTC, /* PCI int C */
+       PCI_INTD, /* PCI int D */
+       ATA,      /* ATA */
+       FATA,     /* CF */
+       POWER,    /* Power swtich */
+       BUTTON,   /* Button swtich */
+};
 
-       __raw_writeb(__raw_readb(PA_IMASK) | value, PA_IMASK);
-}
+/* Vectors for LANDISK */
+static struct intc_vect vectors_landisk[] __initdata = {
+       INTC_IRQ(PCI_INTA, IRQ_PCIINTA),
+       INTC_IRQ(PCI_INTB, IRQ_PCIINTB),
+       INTC_IRQ(PCI_INTC, IRQ_PCIINTC),
+       INTC_IRQ(PCI_INTD, IRQ_PCIINTD),
+       INTC_IRQ(ATA, IRQ_ATA),
+       INTC_IRQ(FATA, IRQ_FATA),
+       INTC_IRQ(POWER, IRQ_POWER),
+       INTC_IRQ(BUTTON, IRQ_BUTTON),
+};
 
-static struct irq_chip landisk_irq_chip __read_mostly = {
-       .name           = "LANDISK",
-       .irq_mask       = disable_landisk_irq,
-       .irq_unmask     = enable_landisk_irq,
+/* IRLMSK mask register layout for LANDISK */
+static struct intc_mask_reg mask_registers_landisk[] __initdata = {
+       { PA_IMASK, 0, 8, /* IRLMSK */
+         {  BUTTON, POWER, FATA, ATA,
+            PCI_INTD, PCI_INTC, PCI_INTB, PCI_INTA,
+         }
+       },
 };
 
+static DECLARE_INTC_DESC(intc_desc_landisk, "landisk", vectors_landisk, NULL,
+                       mask_registers_landisk, NULL, NULL);
 /*
  * Initialize IRQ setting
  */
 void __init init_landisk_IRQ(void)
 {
-       int i;
-
-       for (i = 5; i < 14; i++) {
-               disable_irq_nosync(i);
-               set_irq_chip_and_handler_name(i, &landisk_irq_chip,
-                                             handle_level_irq, "level");
-               enable_landisk_irq(irq_get_irq_data(i));
-       }
+       register_intc_controller(&intc_desc_landisk);
        __raw_writeb(0x00, PA_PWRINT_CLR);
 }