aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorEric Miao <eric.y.miao@gmail.com>2010-02-04 20:13:55 -0500
committerEric Miao <eric.y.miao@gmail.com>2010-03-01 18:40:49 -0500
commitda8065ac3ea29d1bfdb5a163be346fbe35066f8d (patch)
tree5b861839c7b61cd29eb5b04f9c68d2d040f72a1e /arch/arm/mach-pxa
parentefe7f8bda015b03ab1420b5bca538d18e6559863 (diff)
[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>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/include/mach/irqs.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h
index 3677a9af9c87..33a4f33de271 100644
--- a/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/arch/arm/mach-pxa/include/mach/irqs.h
@@ -188,7 +188,6 @@
188#define IRQ_S1_BVD1_STSCHG (IRQ_BOARD_END + 54) 188#define IRQ_S1_BVD1_STSCHG (IRQ_BOARD_END + 54)
189 189
190#define IRQ_LOCOMO_START (IRQ_BOARD_END) 190#define IRQ_LOCOMO_START (IRQ_BOARD_END)
191#define IRQ_LOCOMO_KEY (IRQ_BOARD_END + 0)
192#define IRQ_LOCOMO_GPIO0 (IRQ_BOARD_END + 1) 191#define IRQ_LOCOMO_GPIO0 (IRQ_BOARD_END + 1)
193#define IRQ_LOCOMO_GPIO1 (IRQ_BOARD_END + 2) 192#define IRQ_LOCOMO_GPIO1 (IRQ_BOARD_END + 2)
194#define IRQ_LOCOMO_GPIO2 (IRQ_BOARD_END + 3) 193#define IRQ_LOCOMO_GPIO2 (IRQ_BOARD_END + 3)
@@ -274,7 +273,7 @@
274#define BALLOON3_S0_CD_IRQ IRQ_GPIO(BALLOON3_GPIO_S0_CD) 273#define BALLOON3_S0_CD_IRQ IRQ_GPIO(BALLOON3_GPIO_S0_CD)
275 274
276/* LoCoMo Interrupts (CONFIG_SHARP_LOCOMO) */ 275/* LoCoMo Interrupts (CONFIG_SHARP_LOCOMO) */
277#define IRQ_LOCOMO_KEY_BASE (IRQ_BOARD_START + 0) 276#define IRQ_LOCOMO_KEY (IRQ_BOARD_START + 0)
278#define IRQ_LOCOMO_GPIO_BASE (IRQ_BOARD_START + 1) 277#define IRQ_LOCOMO_GPIO_BASE (IRQ_BOARD_START + 1)
279#define IRQ_LOCOMO_LT_BASE (IRQ_BOARD_START + 2) 278#define IRQ_LOCOMO_LT_BASE (IRQ_BOARD_START + 2)
280#define IRQ_LOCOMO_SPI_BASE (IRQ_BOARD_START + 3) 279#define IRQ_LOCOMO_SPI_BASE (IRQ_BOARD_START + 3)