summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-12-30 09:23:15 +0800
committerAndy Green <andy.green@linaro.org>2011-12-30 09:23:15 +0800
commit4e0a3efdaf103836ea7cbf22abdf4d38e1466706 (patch)
treec426219642bc56604bc37e4332da18d6fa18da1f
parent7e54cf6d85636af91708fbafcc1f15c2276f8116 (diff)
revert twl6030 enable all ints
This isn't needed any more and also has the side-effect of killing musb insertion detect Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--drivers/mfd/twl6030-irq.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index ad779d36695..eb3b5f88e56 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -127,7 +127,6 @@ 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
@@ -301,18 +300,13 @@ 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] = 0;
- mask[2] = 0;
- mask[3] = 0;
+ mask[1] = 0xFF;
+ mask[2] = 0xFF;
+ mask[3] = 0xFF;
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 */