[ARM] locomo: avoid unnecessary cascaded keyboard IRQ

It is not necessary and is over-complicated for IRQ_LOCOMO_KEY to
be a cascaded IRQ of IRQ_LOCOMO_KEY_BASE. Removed and introduced
locomokbd_{open,close} for masking/unmasking of the keyboard IRQ.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index bd36c77..96cd073 100644 (file)
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -143,12 +143,10 @@ static struct locomo_dev_info locomo_devices[] = {
  * IRQ_LOCOMO_*_BASE and those handlers generate more interrupts
  *
  * hardware irq reads LOCOMO_ICR & 0x0f00
- *   IRQ_LOCOMO_KEY_BASE
+ *   IRQ_LOCOMO_KEY
  *   IRQ_LOCOMO_GPIO_BASE
  *   IRQ_LOCOMO_LT_BASE
  *   IRQ_LOCOMO_SPI_BASE
- * IRQ_LOCOMO_KEY_BASE reads LOCOMO_KIC & 0x0001
- *   IRQ_LOCOMO_KEY
  * IRQ_LOCOMO_GPIO_BASE reads LOCOMO_GIR & LOCOMO_GPD & 0xffff
  *   IRQ_LOCOMO_GPIO[0-15]
  * IRQ_LOCOMO_LT_BASE reads LOCOMO_LTINT & 0x0001
@@ -160,8 +158,7 @@ static struct locomo_dev_info locomo_devices[] = {
  *   IRQ_LOCOMO_SPI_TEND
  */
 
-#define LOCOMO_IRQ_START       (IRQ_LOCOMO_KEY_BASE)
-#define LOCOMO_IRQ_KEY_START   (IRQ_LOCOMO_KEY)
+#define LOCOMO_IRQ_START       (IRQ_LOCOMO_KEY)
 #define        LOCOMO_IRQ_GPIO_START   (IRQ_LOCOMO_GPIO0)
 #define        LOCOMO_IRQ_LT_START     (IRQ_LOCOMO_LT)
 #define        LOCOMO_IRQ_SPI_START    (IRQ_LOCOMO_SPI_RFR)
@@ -218,49 +215,6 @@ static struct irq_chip locomo_chip = {
        .unmask = locomo_unmask_irq,
 };
 
-static void locomo_key_handler(unsigned int irq, struct irq_desc *desc)
-{
-       void __iomem *mapbase = get_irq_chip_data(irq);
-
-       if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) {
-               generic_handle_irq(LOCOMO_IRQ_KEY_START);
-       }
-}
-
-static void locomo_key_ack_irq(unsigned int irq)
-{
-       void __iomem *mapbase = get_irq_chip_data(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
-       r &= ~(0x0100 << (irq - LOCOMO_IRQ_KEY_START));
-       locomo_writel(r, mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
-}
-
-static void locomo_key_mask_irq(unsigned int irq)
-{
-       void __iomem *mapbase = get_irq_chip_data(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
-       r &= ~(0x0010 << (irq - LOCOMO_IRQ_KEY_START));
-       locomo_writel(r, mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
-}
-
-static void locomo_key_unmask_irq(unsigned int irq)
-{
-       void __iomem *mapbase = get_irq_chip_data(irq);
-       unsigned int r;
-       r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
-       r |= (0x0010 << (irq - LOCOMO_IRQ_KEY_START));
-       locomo_writel(r, mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
-}
-
-static struct irq_chip locomo_key_chip = {
-       .name   = "LOCOMO-key",
-       .ack    = locomo_key_ack_irq,
-       .mask   = locomo_key_mask_irq,
-       .unmask = locomo_key_unmask_irq,
-};
-
 static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)
 {
        int req, i;
@@ -468,9 +422,10 @@ static void locomo_setup_irq(struct locomo *lchip)
        set_irq_chained_handler(lchip->irq, locomo_handler);
 
        /* Install handlers for IRQ_LOCOMO_*_BASE */
-       set_irq_chip(IRQ_LOCOMO_KEY_BASE, &locomo_chip);
-       set_irq_chip_data(IRQ_LOCOMO_KEY_BASE, irqbase);
-       set_irq_chained_handler(IRQ_LOCOMO_KEY_BASE, locomo_key_handler);
+       set_irq_chip(IRQ_LOCOMO_KEY, &locomo_chip);
+       set_irq_chip_data(IRQ_LOCOMO_KEY, irqbase);
+       set_irq_handler(IRQ_LOCOMO_KEY, handle_edge_irq);
+       set_irq_flags(IRQ_LOCOMO_KEY, IRQF_VALID | IRQF_PROBE);
 
        set_irq_chip(IRQ_LOCOMO_GPIO_BASE, &locomo_chip);
        set_irq_chip_data(IRQ_LOCOMO_GPIO_BASE, irqbase);
@@ -484,12 +439,6 @@ static void locomo_setup_irq(struct locomo *lchip)
        set_irq_chip_data(IRQ_LOCOMO_SPI_BASE, irqbase);
        set_irq_chained_handler(IRQ_LOCOMO_SPI_BASE, locomo_spi_handler);
 
-       /* install handlers for IRQ_LOCOMO_KEY_BASE generated interrupts */
-       set_irq_chip(LOCOMO_IRQ_KEY_START, &locomo_key_chip);
-       set_irq_chip_data(LOCOMO_IRQ_KEY_START, irqbase);
-       set_irq_handler(LOCOMO_IRQ_KEY_START, handle_edge_irq);
-       set_irq_flags(LOCOMO_IRQ_KEY_START, IRQF_VALID | IRQF_PROBE);
-
        /* install handlers for IRQ_LOCOMO_GPIO_BASE generated interrupts */
        for (irq = LOCOMO_IRQ_GPIO_START; irq < LOCOMO_IRQ_GPIO_START + 16; irq++) {
                set_irq_chip(irq, &locomo_gpio_chip);

diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h
index 3677a9a..33a4f33 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/arch/arm/mach-pxa/include/mach/irqs.h
@@ -188,7 +188,6 @@
 #define IRQ_S1_BVD1_STSCHG     (IRQ_BOARD_END + 54)
 
 #define IRQ_LOCOMO_START       (IRQ_BOARD_END)
-#define IRQ_LOCOMO_KEY         (IRQ_BOARD_END + 0)
 #define IRQ_LOCOMO_GPIO0       (IRQ_BOARD_END + 1)
 #define IRQ_LOCOMO_GPIO1       (IRQ_BOARD_END + 2)
 #define IRQ_LOCOMO_GPIO2       (IRQ_BOARD_END + 3)
@@ -274,7 +273,7 @@
 #define BALLOON3_S0_CD_IRQ     IRQ_GPIO(BALLOON3_GPIO_S0_CD)
 
 /* LoCoMo Interrupts (CONFIG_SHARP_LOCOMO) */
-#define IRQ_LOCOMO_KEY_BASE    (IRQ_BOARD_START + 0)
+#define IRQ_LOCOMO_KEY         (IRQ_BOARD_START + 0)
 #define IRQ_LOCOMO_GPIO_BASE   (IRQ_BOARD_START + 1)
 #define IRQ_LOCOMO_LT_BASE     (IRQ_BOARD_START + 2)
 #define IRQ_LOCOMO_SPI_BASE    (IRQ_BOARD_START + 3)

diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h
index ae81f80..9731c78 100644 (file)
--- a/arch/arm/mach-sa1100/include/mach/irqs.h
+++ b/arch/arm/mach-sa1100/include/mach/irqs.h
@@ -121,7 +121,6 @@
 #define IRQ_S1_BVD1_STSCHG     (IRQ_BOARD_END + 54)
 
 #define IRQ_LOCOMO_START       (IRQ_BOARD_END)
-#define IRQ_LOCOMO_KEY         (IRQ_BOARD_END + 0)
 #define IRQ_LOCOMO_GPIO0       (IRQ_BOARD_END + 1)
 #define IRQ_LOCOMO_GPIO1       (IRQ_BOARD_END + 2)
 #define IRQ_LOCOMO_GPIO2       (IRQ_BOARD_END + 3)
@@ -168,7 +167,7 @@
 #define IRQ_NEPONSET_SA1111    (IRQ_BOARD_START + 2)
 
 /* LoCoMo Interrupts (CONFIG_SHARP_LOCOMO) */
-#define IRQ_LOCOMO_KEY_BASE    (IRQ_BOARD_START + 0)
+#define IRQ_LOCOMO_KEY         (IRQ_BOARD_START + 0)
 #define IRQ_LOCOMO_GPIO_BASE   (IRQ_BOARD_START + 1)
 #define IRQ_LOCOMO_LT_BASE     (IRQ_BOARD_START + 2)
 #define IRQ_LOCOMO_SPI_BASE    (IRQ_BOARD_START + 3)

diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
index 9caed30..b1ab298 100644 (file)
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -192,11 +192,18 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd)
 static irqreturn_t locomokbd_interrupt(int irq, void *dev_id)
 {
        struct locomokbd *locomokbd = dev_id;
+       u16 r;
+
+       r = locomo_readl(locomokbd->base + LOCOMO_KIC);
+       if ((r & 0x0001) == 0)
+               return IRQ_HANDLED;
+
+       locomo_writel(r & ~0x0100, locomokbd->base + LOCOMO_KIC); /* Ack */
+
        /** wait chattering delay **/
        udelay(100);
 
        locomokbd_scankeyboard(locomokbd);
-
        return IRQ_HANDLED;
 }
 
@@ -210,6 +217,25 @@ static void locomokbd_timer_callback(unsigned long data)
        locomokbd_scankeyboard(locomokbd);
 }
 
+static int locomokbd_open(struct input_dev *dev)
+{
+       struct locomokbd *locomokbd = input_get_drvdata(dev);
+       u16 r;
+       
+       r = locomo_readl(locomokbd->base + LOCOMO_KIC) | 0x0010;
+       locomo_writel(r, locomokbd->base + LOCOMO_KIC);
+       return 0;
+}
+
+static void locomokbd_close(struct input_dev *dev)
+{
+       struct locomokbd *locomokbd = input_get_drvdata(dev);
+       u16 r;
+       
+       r = locomo_readl(locomokbd->base + LOCOMO_KIC) & ~0x0010;
+       locomo_writel(r, locomokbd->base + LOCOMO_KIC);
+}
+
 static int __devinit locomokbd_probe(struct locomo_dev *dev)
 {
        struct locomokbd *locomokbd;
@@ -253,6 +279,8 @@ static int __devinit locomokbd_probe(struct locomo_dev *dev)
        input_dev->id.vendor = 0x0001;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
+       input_dev->open = locomokbd_open;
+       input_dev->close = locomokbd_close;
        input_dev->dev.parent = &dev->dev;
 
        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP) |
@@ -261,6 +289,8 @@ static int __devinit locomokbd_probe(struct locomo_dev *dev)
        input_dev->keycodesize = sizeof(locomokbd_keycode[0]);
        input_dev->keycodemax = ARRAY_SIZE(locomokbd_keycode);
 
+       input_set_drvdata(input_dev, locomokbd);
+
        memcpy(locomokbd->keycode, locomokbd_keycode, sizeof(locomokbd->keycode));
        for (i = 0; i < LOCOMOKBD_NUMKEYS; i++)
                set_bit(locomokbd->keycode[i], input_dev->keybit);