aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-03-10 14:28:07 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-03-10 17:51:13 -0700
commitdcc52c29951570bc702ef6c0d107931b9747e2c1 (patch)
treeff8fd55479a830c8dea32503750e528a2f3bc81e
parent0b24c53c630ae3dc7881716bb66e121fe58f192a (diff)
panda twl6030 enable all irq sources
Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--debian.linaro/changelog3
-rw-r--r--drivers/mfd/twl6030-irq.c10
2 files changed, 10 insertions, 3 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index f3132a80ddc0..2f139e4a8e36 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -26,6 +26,9 @@ linux-linaro (2.6.38-1001.2) UNRELEASED; urgency=low
- LP: #724377
* Add ubuntu/lttng-modules from aviksil-lttng/linaro
* Remove generated file kernel-versions and sort kerne-versions.in
+ * panda twl6030 enable all irq sources
+ - LP: #708883
+
-- John Rigby <john.rigby@linaro.org> Thu, 10 Mar 2011 11:32:20 -0700
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 */