diff options
| author | Lee Jones <lee.jones@linaro.org> | 2013-02-25 14:34:26 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2013-03-07 12:27:20 +0800 |
| commit | a29264b68a93556a09005b9f18cbd3f61f6fd355 (patch) | |
| tree | de5f1bb5cf72aee2508e360440f6cc9cc053908c /drivers/mfd/ab8500-core.c | |
| parent | 734823462590335cbf5c6a1fa5cae84a881dcb43 (diff) | |
| download | linux-stable-a29264b68a93556a09005b9f18cbd3f61f6fd355.tar.gz linux-stable-a29264b68a93556a09005b9f18cbd3f61f6fd355.tar.bz2 linux-stable-a29264b68a93556a09005b9f18cbd3f61f6fd355.zip | |
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.c | 5 |
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 @@ #define AB8500_IT_MASK22_REG 0x55 #define AB8500_IT_MASK23_REG 0x56 #define AB8500_IT_MASK24_REG 0x57 +#define AB8500_IT_MASK25_REG 0x58 /* * latch hierarchy registers @@ -137,9 +138,9 @@ static const int ab8500_irq_regoffset[AB8500_NUM_IRQ_REGS] = { 0, 1, 2, 3, 4, 6, 7, 8, 9, 11, 18, 19, 20, 21, }; -/* AB9540 support */ +/* AB9540 / AB8505 support */ static const int ab9540_irq_regoffset[AB9540_NUM_IRQ_REGS] = { - 0, 1, 2, 3, 4, 6, 7, 8, 9, 11, 18, 19, 20, 21, 12, 13, 24, + 0, 1, 2, 3, 4, 6, 7, 8, 9, 11, 18, 19, 20, 21, 12, 13, 24, 5, 22, 23 }; static const char ab8500_version_str[][7] = { |