aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-03-10 14:28:07 -0700
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-03-15 23:10:44 -0400
commit47b21351fce4408a82abb6a8898ffc8b31f16bdc (patch)
tree6fe981a284ce57ad988c469235c1c297d194454c
parent8a41fb22ceda3c531416246f7cae457aacaff7b4 (diff)
downloadlinux-linaro-natty-linaro-linux-2.6.38-upstream-16Mar2011.tar.gz
panda twl6030 enable all irq sourceslinaro-linux-2.6.38-upstream-16Mar2011
This allows the overcurrent interrupt from twl6030 to be acknowledged so the panda board does not shutdown. Signed-off-by: Andy Green <andy.green@linaro.org> Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
-rw-r--r--drivers/mfd/twl6030-irq.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index 4082ed73613f..6692fa2adf2c 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -127,6 +127,7 @@ static int twl6030_irq_thread(void *data)
sts.bytes[3] = 0; /* Only 24 bits are valid*/
+ pr_info("twl6030: Interrupt status 0x%06x\n", sts.int_sts);
/*
* Since VBUS status bit is not reliable for VBUS disconnect
@@ -315,13 +316,16 @@ int twl6030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
u8 mask[4];
static struct irq_chip twl6030_irq_chip;
- mask[1] = 0xFF;
- mask[2] = 0xFF;
- mask[3] = 0xFF;
+ mask[1] = 0;
+ mask[2] = 0;
+ mask[3] = 0;
ret = twl_i2c_write(TWL_MODULE_PIH, &mask[0],
REG_INT_MSK_LINE_A, 3); /* MASK ALL INT LINES */
ret = twl_i2c_write(TWL_MODULE_PIH, &mask[0],
REG_INT_MSK_STS_A, 3); /* MASK ALL INT STS */
+ mask[1] = 0xFF;
+ mask[2] = 0xFF;
+ mask[3] = 0xFF;
ret = twl_i2c_write(TWL_MODULE_PIH, &mask[0],
REG_INT_STS_A, 3); /* clear INT_STS_A,B,C */