mirror of
https://git.yoctoproject.org/poky
synced 2026-06-10 04:00:28 +00:00
linux-omap2-git: Sync with OE.dev, add fixes to compile correctly with gcc 4.3.1
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5009 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
@@ -0,0 +1,82 @@
|
||||
TWL4030: use correct register addresses for BCI IMR registers
|
||||
|
||||
From: Paul Walmsley <paul@pwsan.com>
|
||||
|
||||
The existing code to mask and clear BCI interrupts in twl_init_irq() is
|
||||
wrong. It uses the wrong register offsets, it does not mask all of the
|
||||
BCI IMR registers, and it does not clear all of the BCI ISR registers.
|
||||
|
||||
Signed-off-by: Paul Walmsley <paul@pwsan.com>
|
||||
---
|
||||
|
||||
drivers/i2c/chips/twl4030-core.c | 40 ++++++++++++++++++++++++++++++++------
|
||||
1 files changed, 34 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c
|
||||
index dfc3805..bb0732c 100644
|
||||
--- a/drivers/i2c/chips/twl4030-core.c
|
||||
+++ b/drivers/i2c/chips/twl4030-core.c
|
||||
@@ -750,29 +750,57 @@ static void twl_init_irq(void)
|
||||
/* POWER HACK (END) */
|
||||
/* Slave address 0x4A */
|
||||
|
||||
- /* BCIIMR1_1 */
|
||||
+ /* BCIIMR1A */
|
||||
+ res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x2);
|
||||
+ if (res < 0) {
|
||||
+ pr_err("%s[%d][%d]\n", msg, res, __LINE__);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ /* BCIIMR2A */
|
||||
res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x3);
|
||||
if (res < 0) {
|
||||
pr_err("%s[%d][%d]\n", msg, res, __LINE__);
|
||||
return;
|
||||
}
|
||||
|
||||
- /* BCIIMR1_2 */
|
||||
- res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x4);
|
||||
+ /* BCIIMR1B */
|
||||
+ res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x6);
|
||||
if (res < 0) {
|
||||
pr_err("%s[%d][%d]\n", msg, res, __LINE__);
|
||||
return;
|
||||
}
|
||||
|
||||
- /* BCIIMR2_1 */
|
||||
+ /* BCIIMR2B */
|
||||
res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x7);
|
||||
if (res < 0) {
|
||||
pr_err("%s[%d][%d]\n", msg, res, __LINE__);
|
||||
return;
|
||||
}
|
||||
|
||||
- /* BCIIMR2_2 */
|
||||
- res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x8);
|
||||
+ /* BCIISR1A */
|
||||
+ res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x0);
|
||||
+ if (res < 0) {
|
||||
+ pr_err("%s[%d][%d]\n", msg, res, __LINE__);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ /* BCIISR2A */
|
||||
+ res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x1);
|
||||
+ if (res < 0) {
|
||||
+ pr_err("%s[%d][%d]\n", msg, res, __LINE__);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ /* BCIISR1B */
|
||||
+ res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x4);
|
||||
+ if (res < 0) {
|
||||
+ pr_err("%s[%d][%d]\n", msg, res, __LINE__);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ /* BCIISR2B */
|
||||
+ res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x5);
|
||||
if (res < 0) {
|
||||
pr_err("%s[%d][%d]\n", msg, res, __LINE__);
|
||||
return;
|
||||
Reference in New Issue
Block a user