aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/ab8500-core.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-02-25 09:34:26 -0500
committerLee Jones <lee.jones@linaro.org>2013-03-06 23:27:20 -0500
commita29264b68a93556a09005b9f18cbd3f61f6fd355 (patch)
treede5f1bb5cf72aee2508e360440f6cc9cc053908c /drivers/mfd/ab8500-core.c
parent734823462590335cbf5c6a1fa5cae84a881dcb43 (diff)
mfd: ab8500-core: APE Interrupts are not cleared
There are missing register descriptions from the AB8505 user manual and these need to be masked so that the APEINT line can toggle. This patch also affects the behaviour of AB9540. Signed-off-by: Marcus Cooper <marcus.xm.cooper@stericsson.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Reviewed-by: Maxime COQUELIN <maxime.coquelin@stericsson.com> Reviewed-by: Alexandre TORGUE <alexandre.torgue@stericsson.com> Reviewed-by: Mattias WALLIN <mattias.wallin@stericsson.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/ab8500-core.c')
-rw-r--r--drivers/mfd/ab8500-core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 50e6f1e29727..baaf2ed8095b 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -95,6 +95,7 @@
95#define AB8500_IT_MASK22_REG 0x55 95#define AB8500_IT_MASK22_REG 0x55
96#define AB8500_IT_MASK23_REG 0x56 96#define AB8500_IT_MASK23_REG 0x56
97#define AB8500_IT_MASK24_REG 0x57 97#define AB8500_IT_MASK24_REG 0x57
98#define AB8500_IT_MASK25_REG 0x58
98 99
99/* 100/*
100 * latch hierarchy registers 101 * latch hierarchy registers
@@ -137,9 +138,9 @@ static const int ab8500_irq_regoffset[AB8500_NUM_IRQ_REGS] = {
137 0, 1, 2, 3, 4, 6, 7, 8, 9, 11, 18, 19, 20, 21, 138 0, 1, 2, 3, 4, 6, 7, 8, 9, 11, 18, 19, 20, 21,
138}; 139};
139 140
140/* AB9540 support */ 141/* AB9540 / AB8505 support */
141static const int ab9540_irq_regoffset[AB9540_NUM_IRQ_REGS] = { 142static const int ab9540_irq_regoffset[AB9540_NUM_IRQ_REGS] = {
142 0, 1, 2, 3, 4, 6, 7, 8, 9, 11, 18, 19, 20, 21, 12, 13, 24, 143 0, 1, 2, 3, 4, 6, 7, 8, 9, 11, 18, 19, 20, 21, 12, 13, 24, 5, 22, 23
143}; 144};
144 145
145static const char ab8500_version_str[][7] = { 146static const char ab8500_version_str[][7] = {