linux omap2 git: update TWL4030 patches for beagle, add mrus clock patches

12 files changed, 517 insertions, 613 deletions

diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch
index b6142ea1f5..c361c33d61 100644
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch
+++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch
@@ -1,42 +1,6 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00000000
-Return-Path: <linux-omap-owner@vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.2.1 (2007-05-02) on shovel.geekisp.com
-X-Spam-Level: 
-X-Spam-Status: No, score=-1.1 required=5.0 tests=AWL,DKIM_POLICY_SIGNSOME
-	autolearn=ham version=3.2.1
-Delivered-To: balister.org-philip@balister.org
-Received: (qmail 26975 invoked by uid 1003); 18 Jul 2008 01:35:27 -0000
-Received: from vger.kernel.org (209.132.176.167)
-  by mail.geekisp.com with SMTP; 18 Jul 2008 01:35:27 -0000
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1756265AbYGRBf0 (ORCPT <rfc822;philip@balister.org>);
-	Thu, 17 Jul 2008 21:35:26 -0400
-Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751582AbYGRBfZ
-	(ORCPT <rfc822;linux-omap-outgoing>);
-	Thu, 17 Jul 2008 21:35:25 -0400
-Received: from utopia.booyaka.com ([72.9.107.138]:49361 "EHLO
-	utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1752321AbYGRBfX (ORCPT
-	<rfc822;linux-omap@vger.kernel.org>); Thu, 17 Jul 2008 21:35:23 -0400
-Received: (qmail 13868 invoked by uid 526); 18 Jul 2008 01:35:22 -0000
-MBOX-Line: From nobody Thu Jul 17 19:34:49 2008
-From:	Paul Walmsley <paul@pwsan.com>
-Subject: [PATCH 1/9] TWL4030: remove superfluous PWR interrupt status clear
-	before masking
-To:	linux-omap@vger.kernel.org
-Date:	Thu, 17 Jul 2008 19:34:49 -0600
-Message-ID: <20080718013448.18943.6984.stgit@localhost.localdomain>
-In-Reply-To: <20080718013205.18943.34047.stgit@localhost.localdomain>
-References: <20080718013205.18943.34047.stgit@localhost.localdomain>
-User-Agent: StGIT/0.14.3.163.g06f9
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-Sender:	linux-omap-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-omap.vger.kernel.org>
-X-Mailing-List:	linux-omap@vger.kernel.org
+TWL4030: remove superfluous PWR interrupt status clear before masking
+
+From: Paul Walmsley <paul@pwsan.com>
 
 twl_irq_init() clears PWR interrupt status bits, then masks the interrupts
 off, then clears the PWR interrupt status bits again.  The first clear
@@ -77,10 +41,3 @@ index adc45d4..ff662bc 100644
  	/* PWR_IMR1 */
  	res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x1);
  	if (res < 0) {
-
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-omap" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-
diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch
index 18b2f589c1..48a59b945b 100644
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch
+++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch
@@ -1,42 +1,6 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00000000
-Return-Path: <linux-omap-owner@vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.2.2 (2007-07-23) on
-	morningsun.geekisp.com
-X-Spam-Level: 
-X-Spam-Status: No, score=-3.0 required=5.0 tests=AWL,DKIM_POLICY_SIGNSOME,
-	DK_POLICY_SIGNSOME,RCVD_IN_DNSWL_MED autolearn=ham version=3.2.2
-Delivered-To: balister.org-philip@balister.org
-Received: (qmail 17413 invoked by uid 1003); 18 Jul 2008 01:35:27 -0000
-Received: from vger.kernel.org (209.132.176.167)
-  by mail.geekisp.com with SMTP; 18 Jul 2008 01:35:27 -0000
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1757296AbYGRBf1 (ORCPT <rfc822;philip@balister.org>);
-	Thu, 17 Jul 2008 21:35:27 -0400
-Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751582AbYGRBf0
-	(ORCPT <rfc822;linux-omap-outgoing>);
-	Thu, 17 Jul 2008 21:35:26 -0400
-Received: from utopia.booyaka.com ([72.9.107.138]:49362 "EHLO
-	utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1754168AbYGRBfY (ORCPT
-	<rfc822;linux-omap@vger.kernel.org>); Thu, 17 Jul 2008 21:35:24 -0400
-Received: (qmail 13872 invoked by uid 526); 18 Jul 2008 01:35:23 -0000
-MBOX-Line: From nobody Thu Jul 17 19:34:50 2008
-From:	Paul Walmsley <paul@pwsan.com>
-Subject: [PATCH 2/9] TWL4030: clear TWL GPIO interrupt status registers
-To:	linux-omap@vger.kernel.org
-Date:	Thu, 17 Jul 2008 19:34:50 -0600
-Message-ID: <20080718013449.18943.78895.stgit@localhost.localdomain>
-In-Reply-To: <20080718013205.18943.34047.stgit@localhost.localdomain>
-References: <20080718013205.18943.34047.stgit@localhost.localdomain>
-User-Agent: StGIT/0.14.3.163.g06f9
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-Sender:	linux-omap-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-omap.vger.kernel.org>
-X-Mailing-List:	linux-omap@vger.kernel.org
+TWL4030: clear TWL GPIO interrupt status registers
+
+From: Paul Walmsley <paul@pwsan.com>
 
 twl_init_irq() does not clear the TWL GPIO ISR registers, but the PIH
 ISR thinks that it has.  This causes any previously-latched GPIO interrupts
@@ -105,10 +69,3 @@ index ff662bc..dfc3805 100644
  	/* install an irq handler for each of the PIH modules */
  	for (i = TWL4030_IRQ_BASE; i < TWL4030_IRQ_END; i++) {
  		set_irq_chip(i, &twl4030_irq_chip);
-
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-omap" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-
diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch
index 062d99fe5a..fe1bea5398 100644
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch
+++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch
@@ -1,43 +1,6 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00000000
-Return-Path: <linux-omap-owner@vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.2.2 (2007-07-23) on
-	morningsun.geekisp.com
-X-Spam-Level: 
-X-Spam-Status: No, score=-3.0 required=5.0 tests=AWL,DKIM_POLICY_SIGNSOME,
-	DK_POLICY_SIGNSOME,RCVD_IN_DNSWL_MED autolearn=ham version=3.2.2
-Delivered-To: balister.org-philip@balister.org
-Received: (qmail 14206 invoked by uid 1003); 18 Jul 2008 01:35:28 -0000
-Received: from vger.kernel.org (209.132.176.167)
-  by mail.geekisp.com with SMTP; 18 Jul 2008 01:35:28 -0000
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1751582AbYGRBf1 (ORCPT <rfc822;philip@balister.org>);
-	Thu, 17 Jul 2008 21:35:27 -0400
-Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754168AbYGRBf1
-	(ORCPT <rfc822;linux-omap-outgoing>);
-	Thu, 17 Jul 2008 21:35:27 -0400
-Received: from utopia.booyaka.com ([72.9.107.138]:49363 "EHLO
-	utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1754586AbYGRBfY (ORCPT
-	<rfc822;linux-omap@vger.kernel.org>); Thu, 17 Jul 2008 21:35:24 -0400
-Received: (qmail 13876 invoked by uid 526); 18 Jul 2008 01:35:23 -0000
-MBOX-Line: From nobody Thu Jul 17 19:34:50 2008
-From:	Paul Walmsley <paul@pwsan.com>
-Subject: [PATCH 3/9] TWL4030: use correct register addresses for BCI IMR
-	registers
-To:	linux-omap@vger.kernel.org
-Date:	Thu, 17 Jul 2008 19:34:50 -0600
-Message-ID: <20080718013450.18943.33123.stgit@localhost.localdomain>
-In-Reply-To: <20080718013205.18943.34047.stgit@localhost.localdomain>
-References: <20080718013205.18943.34047.stgit@localhost.localdomain>
-User-Agent: StGIT/0.14.3.163.g06f9
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-Sender:	linux-omap-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-omap.vger.kernel.org>
-X-Mailing-List:	linux-omap@vger.kernel.org
+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
@@ -117,10 +80,3 @@ index dfc3805..bb0732c 100644
  	if (res < 0) {
  		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
  		return;
-
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-omap" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-
diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch
index 12d76bfb23..fb65ac98bb 100644
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch
+++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch
@@ -1,42 +1,6 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00000000
-Return-Path: <linux-omap-owner@vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.2.2 (2007-07-23) on
-	morningsun.geekisp.com
-X-Spam-Level: 
-X-Spam-Status: No, score=-3.0 required=5.0 tests=AWL,DKIM_POLICY_SIGNSOME,
-	DK_POLICY_SIGNSOME,RCVD_IN_DNSWL_MED autolearn=ham version=3.2.2
-Delivered-To: balister.org-philip@balister.org
-Received: (qmail 21713 invoked by uid 1003); 18 Jul 2008 01:35:29 -0000
-Received: from vger.kernel.org (209.132.176.167)
-  by mail.geekisp.com with SMTP; 18 Jul 2008 01:35:29 -0000
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1754758AbYGRBf2 (ORCPT <rfc822;philip@balister.org>);
-	Thu, 17 Jul 2008 21:35:28 -0400
-Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757008AbYGRBf1
-	(ORCPT <rfc822;linux-omap-outgoing>);
-	Thu, 17 Jul 2008 21:35:27 -0400
-Received: from utopia.booyaka.com ([72.9.107.138]:49364 "EHLO
-	utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1754758AbYGRBfY (ORCPT
-	<rfc822;linux-omap@vger.kernel.org>); Thu, 17 Jul 2008 21:35:24 -0400
-Received: (qmail 13880 invoked by uid 526); 18 Jul 2008 01:35:23 -0000
-MBOX-Line: From nobody Thu Jul 17 19:34:51 2008
-From:	Paul Walmsley <paul@pwsan.com>
-Subject: [PATCH 4/9] TWL4030: clear MADC interrupt status registers upon init
-To:	linux-omap@vger.kernel.org
-Date:	Thu, 17 Jul 2008 19:34:51 -0600
-Message-ID: <20080718013450.18943.33397.stgit@localhost.localdomain>
-In-Reply-To: <20080718013205.18943.34047.stgit@localhost.localdomain>
-References: <20080718013205.18943.34047.stgit@localhost.localdomain>
-User-Agent: StGIT/0.14.3.163.g06f9
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-Sender:	linux-omap-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-omap.vger.kernel.org>
-X-Mailing-List:	linux-omap@vger.kernel.org
+TWL4030: clear MADC interrupt status registers upon init
+
+From: Paul Walmsley <paul@pwsan.com>
 
 twl_init_irq() does not clear MADC interrupt status registers upon init -
 fix.
@@ -72,10 +36,3 @@ index bb0732c..9d93524 100644
  	/* key Pad */
  	/* KEYPAD - IMR1 */
  	res = twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xFF, (0x12));
-
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-omap" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-
diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch
index b41c836711..02a72ed9df 100644
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch
+++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch
@@ -1,68 +1,54 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00000000
-Return-Path: <linux-omap-owner@vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.2.2 (2007-07-23) on
-	morningsun.geekisp.com
-X-Spam-Level: 
-X-Spam-Status: No, score=-3.0 required=5.0 tests=AWL,DKIM_POLICY_SIGNSOME,
-	DK_POLICY_SIGNSOME,RCVD_IN_DNSWL_MED autolearn=ham version=3.2.2
-Delivered-To: balister.org-philip@balister.org
-Received: (qmail 11680 invoked by uid 1003); 18 Jul 2008 01:35:29 -0000
-Received: from vger.kernel.org (209.132.176.167)
-  by mail.geekisp.com with SMTP; 18 Jul 2008 01:35:29 -0000
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1755063AbYGRBf2 (ORCPT <rfc822;philip@balister.org>);
-	Thu, 17 Jul 2008 21:35:28 -0400
-Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754168AbYGRBf2
-	(ORCPT <rfc822;linux-omap-outgoing>);
-	Thu, 17 Jul 2008 21:35:28 -0400
-Received: from utopia.booyaka.com ([72.9.107.138]:49365 "EHLO
-	utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1755063AbYGRBfZ (ORCPT
-	<rfc822;linux-omap@vger.kernel.org>); Thu, 17 Jul 2008 21:35:25 -0400
-Received: (qmail 13884 invoked by uid 526); 18 Jul 2008 01:35:23 -0000
-MBOX-Line: From nobody Thu Jul 17 19:34:52 2008
-From:	Paul Walmsley <paul@pwsan.com>
-Subject: [PATCH 5/9] TWL4030: read and write module ISRs to clear them at init
-To:	linux-omap@vger.kernel.org
-Date:	Thu, 17 Jul 2008 19:34:52 -0600
-Message-ID: <20080718013451.18943.18579.stgit@localhost.localdomain>
-In-Reply-To: <20080718013205.18943.34047.stgit@localhost.localdomain>
-References: <20080718013205.18943.34047.stgit@localhost.localdomain>
-User-Agent: StGIT/0.14.3.163.g06f9
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-Sender:	linux-omap-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-omap.vger.kernel.org>
-X-Mailing-List:	linux-omap@vger.kernel.org
+TWL4030: use *_SIH_CTRL.COR bit to determine whether to read or write ISR to clear
+
+From: Paul Walmsley <paul@pwsan.com>
 
 TWL4030 interrupt status register bits can be cleared in one of two ways:
 either by reading from the register, or by writing a 1 to the
 appropriate bit(s) in the register.  This behavior can be altered at any
 time by the <twlmodule>_SIH_CTRL.COR register bit ("clear-on-read").
 
-twl4030-core.c does not touch these *_SIH_CTRL registers during boot,
-and the TWL4030 TRM is deeply confused as to whether COR=1 means that
-the registers are cleared on reads, or cleared on writes.
+The TWL4030 TRM is deeply confused as to whether COR=1 means that the
+registers are cleared on reads, or cleared on writes.  Peter De
+Schrijver <peter.de-schrijver> confirms that COR=1 means that the registers
+are cleared on read.
+
+So, for each TWL4030 SIH, check the value of the *_SIH_CTRL.COR bit, and if
+it is 1, use reads to clear the ISRs; if it is 0, use writes.
+
+Also, use WARN_ON() to warn if the read/write failed, and don't skip
+the rest of the initialization on failure either.
+
+Thanks to Peter for his help with this patch.
 
-So, take the cautious way out and both read from and write to the TWL4030
-module ISRs to clear them at startup.  Also, use WARN_ON() to warn if the
-read/write failed, and don't skip the rest of the initialization on failure
-either.
 
 Signed-off-by: Paul Walmsley <paul@pwsan.com>
 ---
 
- drivers/i2c/chips/twl4030-core.c |  128 +++++++++++++++-----------------------
- 1 files changed, 51 insertions(+), 77 deletions(-)
+ drivers/i2c/chips/twl4030-core.c |  183 ++++++++++++++++++++++----------------
+ 1 files changed, 106 insertions(+), 77 deletions(-)
 
 diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c
-index 9d93524..615fb84 100644
+index 9d93524..eae0634 100644
 --- a/drivers/i2c/chips/twl4030-core.c
 +++ b/drivers/i2c/chips/twl4030-core.c
-@@ -712,6 +712,28 @@ static int power_companion_init(void)
+@@ -133,6 +133,16 @@
+ /* on I2C-1 for 2430SDP */
+ #define CONFIG_I2C_TWL4030_ID		1
+ 
++/* SIH_CTRL registers */
++#define TWL4030_INT_PWR_SIH_CTRL	0x07
++#define TWL4030_INTERRUPTS_BCISIHCTRL	0x0d
++#define TWL4030_MADC_MADC_SIH_CTRL	0x67
++#define TWL4030_KEYPAD_KEYP_SIH_CTRL	0x17
++#define TWL4030_GPIO_GPIO_SIH_CTRL	0x2d
++
++#define TWL4030_SIH_CTRL_COR_MASK	(1 << 2)
++
++
+ /* Helper functions */
+ static int
+ twl4030_detect_client(struct i2c_adapter *adapter, unsigned char sid);
+@@ -712,13 +722,61 @@ static int power_companion_init(void)
  	return e;
  }
  
@@ -70,28 +56,46 @@ index 9d93524..615fb84 100644
 + * twl4030_i2c_clear_isr - clear TWL4030 SIH ISR regs via read + write
 + * @mod_no: TWL4030 module number
 + * @reg: register index to clear
++ * @cor: value of the <module>_SIH_CTRL.COR bit (1 or 0)
 + *
-+ * Reads, then writes 0xff to a TWL4030 interrupt status register to ensure
-+ * that interrupts are cleared.  The read + write is necessary since we
-+ * don't know whether the COR bit is set in <module>_SIH_CTRL.  Returns
-+ * the status from the I2C read operation.
++ * Either reads (cor == 1) or writes (cor == 0) to a TWL4030 interrupt
++ * status register to ensure that any prior interrupts are cleared.
++ * Returns the status from the I2C read operation.
 + */
-+static int twl4030_i2c_clear_isr(u8 mod_no, u8 reg)
++static int twl4030_i2c_clear_isr(u8 mod_no, u8 reg, u8 cor)
 +{
-+	int res;
 +	u8 tmp;
 +
-+	res = twl4030_i2c_read_u8(mod_no, &tmp, reg);
-+	if (res < 0)
-+		return res;
++	return (cor) ? twl4030_i2c_read_u8(mod_no, &tmp, reg) :
++		twl4030_i2c_write_u8(mod_no, 0xff, reg);
++}
++
++/**
++ * twl4030_read_cor_bit - are TWL module ISRs cleared by reads or writes?
++ * @mod_no: TWL4030 module number
++ * @reg: register index to clear
++ *
++ * Returns 1 if the TWL4030 SIH interrupt status registers (ISRs) for
++ * the specified TWL module are cleared by reads, or 0 if cleared by
++ * writes.
++ */
++static int twl4030_read_cor_bit(u8 mod_no, u8 reg)
++{
++	u8 tmp = 0;
++
++	WARN_ON(twl4030_i2c_read_u8(mod_no, &tmp, reg) < 0);
++
++	tmp &= TWL4030_SIH_CTRL_COR_MASK;
++	tmp >>= __ffs(TWL4030_SIH_CTRL_COR_MASK);
 +
-+	return twl4030_i2c_write_u8(mod_no, 0xff, reg);
++	return tmp;
 +}
 +
  static void twl_init_irq(void)
  {
  	int	i = 0;
-@@ -719,6 +741,13 @@ static void twl_init_irq(void)
+ 	int	res = 0;
++	int cor;
  	char	*msg = "Unable to register interrupt subsystem";
  	unsigned int irq_num;
  
@@ -102,19 +106,27 @@ index 9d93524..615fb84 100644
 +	 * handlers present.
 +	 */
 +
++
  	/* PWR_IMR1 */
  	res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x1);
  	if (res < 0) {
-@@ -735,19 +764,11 @@ static void twl_init_irq(void)
+@@ -734,20 +792,18 @@ static void twl_init_irq(void)
+ 	}
  
  	/* Clear off any other pending interrupts on power */
++
++	/* Are PWR interrupt status bits cleared by reads or writes? */
++	cor = twl4030_read_cor_bit(TWL4030_MODULE_INT,
++				   TWL4030_INT_PWR_SIH_CTRL);
++	WARN_ON(cor < 0);
++
  	/* PWR_ISR1 */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x00);
 -	if (res < 0) {
 -		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
 -		return;
 -	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INT, 0x00) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INT, 0x00, cor) < 0);
  
  	/* PWR_ISR2 */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x02);
@@ -123,21 +135,27 @@ index 9d93524..615fb84 100644
 -		return;
 -	}
 -	/* POWER HACK (END) */
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INT, 0x02) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INT, 0x02, cor) < 0);
 +
  	/* Slave address 0x4A */
  
  	/* BCIIMR1A */
-@@ -779,32 +800,16 @@ static void twl_init_irq(void)
+@@ -778,33 +834,22 @@ static void twl_init_irq(void)
+ 		return;
  	}
  
++	/* Are BCI interrupt status bits cleared by reads or writes? */
++	cor = twl4030_read_cor_bit(TWL4030_MODULE_INTERRUPTS,
++				   TWL4030_INTERRUPTS_BCISIHCTRL);
++	WARN_ON(cor < 0);
++
  	/* BCIISR1A */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x0);
 -	if (res < 0) {
 -		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
 -		return;
 -	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x0) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x0, cor) < 0);
  
  	/* BCIISR2A */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x1);
@@ -145,7 +163,7 @@ index 9d93524..615fb84 100644
 -		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
 -		return;
 -	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x1) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x1, cor) < 0);
  
  	/* BCIISR1B */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x4);
@@ -153,7 +171,7 @@ index 9d93524..615fb84 100644
 -		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
 -		return;
 -	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x4) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x4, cor) < 0);
  
  	/* BCIISR2B */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x5);
@@ -161,20 +179,26 @@ index 9d93524..615fb84 100644
 -		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
 -		return;
 -	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x5) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x5, cor) < 0);
  
  	/* MAD C */
  	/* MADC_IMR1 */
-@@ -822,18 +827,10 @@ static void twl_init_irq(void)
+@@ -821,19 +866,16 @@ static void twl_init_irq(void)
+ 		return;
  	}
  
++	/* Are MADC interrupt status bits cleared by reads or writes? */
++	cor = twl4030_read_cor_bit(TWL4030_MODULE_MADC,
++				   TWL4030_MADC_MADC_SIH_CTRL);
++	WARN_ON(cor < 0);
++
  	/* MADC_ISR1 */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xFF, 0x61);
 -	if (res < 0) {
 -		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
 -		return;
 -	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, 0x61) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, 0x61, cor) < 0);
  
  	/* MADC_ISR2 */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xFF, 0x63);
@@ -182,11 +206,11 @@ index 9d93524..615fb84 100644
 -		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
 -		return;
 -	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, 0x63) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, 0x63, cor) < 0);
  
  	/* key Pad */
  	/* KEYPAD - IMR1 */
-@@ -842,12 +839,10 @@ static void twl_init_irq(void)
+@@ -842,12 +884,15 @@ static void twl_init_irq(void)
  		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
  		return;
  	}
@@ -197,32 +221,43 @@ index 9d93524..615fb84 100644
 -		twl4030_i2c_read_u8(TWL4030_MODULE_KEYPAD, &clear, 0x11);
 -	}
 +
++	/* Are keypad interrupt status bits cleared by reads or writes? */
++	cor = twl4030_read_cor_bit(TWL4030_MODULE_KEYPAD,
++				   TWL4030_KEYPAD_KEYP_SIH_CTRL);
++	WARN_ON(cor < 0);
++
 +	/* KEYPAD - ISR1 */
 +	/* XXX does this still need to be done twice for some reason? */
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x11) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x11, cor) < 0);
  
  	/* KEYPAD - IMR2 */
  	res = twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xFF, (0x14));
-@@ -856,6 +851,9 @@ static void twl_init_irq(void)
+@@ -856,6 +901,9 @@ static void twl_init_irq(void)
  		return;
  	}
  
 +	/* KEYPAD - ISR2 */
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x13) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x13, cor) < 0);
 +
  	/* Slave address 0x49 */
  	/* GPIO_IMR1A */
  	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xFF, (0x1C));
-@@ -900,46 +898,22 @@ static void twl_init_irq(void)
+@@ -899,47 +947,28 @@ static void twl_init_irq(void)
+ 		return;
  	}
  
++	/* Are GPIO interrupt status bits cleared by reads or writes? */
++	cor = twl4030_read_cor_bit(TWL4030_MODULE_GPIO,
++				   TWL4030_GPIO_GPIO_SIH_CTRL);
++	WARN_ON(cor < 0);
++
  	/* GPIO_ISR1A */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x19);
 -	if (res < 0) {
 -		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
 -		return;
 -	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x19) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x19, cor) < 0);
  
  	/* GPIO_ISR2A */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1a);
@@ -230,7 +265,7 @@ index 9d93524..615fb84 100644
 -		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
 -		return;
 -	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1a) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1a, cor) < 0);
  
  	/* GPIO_ISR3A */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1b);
@@ -238,7 +273,7 @@ index 9d93524..615fb84 100644
 -		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
 -		return;
 -	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1b) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1b, cor) < 0);
  
  	/* GPIO_ISR1B */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1f);
@@ -246,7 +281,7 @@ index 9d93524..615fb84 100644
 -		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
 -		return;
 -	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1f) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1f, cor) < 0);
  
  	/* GPIO_ISR2B */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x20);
@@ -254,7 +289,7 @@ index 9d93524..615fb84 100644
 -		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
 -		return;
 -	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x20) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x20, cor) < 0);
  
  	/* GPIO_ISR3B */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x21);
@@ -262,14 +297,7 @@ index 9d93524..615fb84 100644
 -		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
 -		return;
 -	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x21) < 0);
++	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x21, cor) < 0);
  
  	/* install an irq handler for each of the PIH modules */
  	for (i = TWL4030_IRQ_BASE; i < TWL4030_IRQ_END; i++) {
-
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-omap" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-
diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch
index 501437a365..67b837c454 100644
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch
+++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch
@@ -1,41 +1,6 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00000000
-Return-Path: <linux-omap-owner@vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.2.1 (2007-05-02) on shovel.geekisp.com
-X-Spam-Level: 
-X-Spam-Status: No, score=-1.0 required=5.0 tests=AWL,DKIM_POLICY_SIGNSOME
-	autolearn=ham version=3.2.1
-Delivered-To: balister.org-philip@balister.org
-Received: (qmail 19695 invoked by uid 1003); 18 Jul 2008 01:35:30 -0000
-Received: from vger.kernel.org (209.132.176.167)
-  by mail.geekisp.com with SMTP; 18 Jul 2008 01:35:30 -0000
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1756218AbYGRBf3 (ORCPT <rfc822;philip@balister.org>);
-	Thu, 17 Jul 2008 21:35:29 -0400
-Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754168AbYGRBf3
-	(ORCPT <rfc822;linux-omap-outgoing>);
-	Thu, 17 Jul 2008 21:35:29 -0400
-Received: from utopia.booyaka.com ([72.9.107.138]:49366 "EHLO
-	utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1756218AbYGRBfZ (ORCPT
-	<rfc822;linux-omap@vger.kernel.org>); Thu, 17 Jul 2008 21:35:25 -0400
-Received: (qmail 13888 invoked by uid 526); 18 Jul 2008 01:35:23 -0000
-MBOX-Line: From nobody Thu Jul 17 19:34:53 2008
-From:	Paul Walmsley <paul@pwsan.com>
-Subject: [PATCH 6/9] TWL4030: change init-time IMR mask code to WARN if error
-To:	linux-omap@vger.kernel.org
-Date:	Thu, 17 Jul 2008 19:34:53 -0600
-Message-ID: <20080718013452.18943.96350.stgit@localhost.localdomain>
-In-Reply-To: <20080718013205.18943.34047.stgit@localhost.localdomain>
-References: <20080718013205.18943.34047.stgit@localhost.localdomain>
-User-Agent: StGIT/0.14.3.163.g06f9
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-Sender:	linux-omap-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-omap.vger.kernel.org>
-X-Mailing-List:	linux-omap@vger.kernel.org
+TWL4030: change init-time IMR mask code to WARN if error
+
+From: Paul Walmsley <paul@pwsan.com>
 
 twl_init_irq() prints error messages and returns if any interrupt mask
 register writes fail.  Change this to generate a warning traceback and
@@ -50,11 +15,11 @@ Signed-off-by: Paul Walmsley <paul@pwsan.com>
  1 files changed, 18 insertions(+), 82 deletions(-)
 
 diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c
-index 615fb84..1906635 100644
+index eae0634..99cc143 100644
 --- a/drivers/i2c/chips/twl4030-core.c
 +++ b/drivers/i2c/chips/twl4030-core.c
-@@ -749,18 +749,10 @@ static void twl_init_irq(void)
- 	 */
+@@ -778,18 +778,10 @@ static void twl_init_irq(void)
+ 
  
  	/* PWR_IMR1 */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x1);
@@ -73,8 +38,8 @@ index 615fb84..1906635 100644
 +	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xff, 0x3) < 0);
  
  	/* Clear off any other pending interrupts on power */
- 	/* PWR_ISR1 */
-@@ -772,32 +764,16 @@ static void twl_init_irq(void)
+ 
+@@ -807,32 +799,16 @@ static void twl_init_irq(void)
  	/* Slave address 0x4A */
  
  	/* BCIIMR1A */
@@ -111,9 +76,9 @@ index 615fb84..1906635 100644
 -	}
 +	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, 0x7) < 0);
  
- 	/* BCIISR1A */
- 	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x0) < 0);
-@@ -813,18 +789,10 @@ static void twl_init_irq(void)
+ 	/* Are BCI interrupt status bits cleared by reads or writes? */
+ 	cor = twl4030_read_cor_bit(TWL4030_MODULE_INTERRUPTS,
+@@ -853,18 +829,10 @@ static void twl_init_irq(void)
  
  	/* MAD C */
  	/* MADC_IMR1 */
@@ -132,9 +97,9 @@ index 615fb84..1906635 100644
 -	}
 +	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xff, 0x64) < 0);
  
- 	/* MADC_ISR1 */
- 	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, 0x61) < 0);
-@@ -834,68 +802,36 @@ static void twl_init_irq(void)
+ 	/* Are MADC interrupt status bits cleared by reads or writes? */
+ 	cor = twl4030_read_cor_bit(TWL4030_MODULE_MADC,
+@@ -879,11 +847,7 @@ static void twl_init_irq(void)
  
  	/* key Pad */
  	/* KEYPAD - IMR1 */
@@ -145,9 +110,10 @@ index 615fb84..1906635 100644
 -	}
 +	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xff, 0x12) < 0);
  
- 	/* KEYPAD - ISR1 */
- 	/* XXX does this still need to be done twice for some reason? */
- 	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x11) < 0);
+ 	/* Are keypad interrupt status bits cleared by reads or writes? */
+ 	cor = twl4030_read_cor_bit(TWL4030_MODULE_KEYPAD,
+@@ -895,57 +859,29 @@ static void twl_init_irq(void)
+ 	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x11, cor) < 0);
  
  	/* KEYPAD - IMR2 */
 -	res = twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xFF, (0x14));
@@ -158,7 +124,7 @@ index 615fb84..1906635 100644
 +	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xff, 0x14) < 0);
  
  	/* KEYPAD - ISR2 */
- 	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x13) < 0);
+ 	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x13, cor) < 0);
  
  	/* Slave address 0x49 */
  	/* GPIO_IMR1A */
@@ -209,12 +175,5 @@ index 615fb84..1906635 100644
 -	}
 +	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x24) < 0);
  
- 	/* GPIO_ISR1A */
- 	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x19) < 0);
-
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-omap" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-
+ 	/* Are GPIO interrupt status bits cleared by reads or writes? */
+ 	cor = twl4030_read_cor_bit(TWL4030_MODULE_GPIO,
diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch
index 2847e84f62..8e4c4d6be4 100644
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch
+++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch
@@ -1,50 +1,13 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00000000
-Return-Path: <linux-omap-owner@vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.2.2 (2007-07-23) on
-	morningsun.geekisp.com
-X-Spam-Level: 
-X-Spam-Status: No, score=-3.0 required=5.0 tests=AWL,DKIM_POLICY_SIGNSOME,
-	DK_POLICY_SIGNSOME,RCVD_IN_DNSWL_MED autolearn=ham version=3.2.2
-Delivered-To: balister.org-philip@balister.org
-Received: (qmail 26193 invoked by uid 1003); 18 Jul 2008 01:35:31 -0000
-Received: from vger.kernel.org (209.132.176.167)
-  by mail.geekisp.com with SMTP; 18 Jul 2008 01:35:31 -0000
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1752321AbYGRBfb (ORCPT <rfc822;philip@balister.org>);
-	Thu, 17 Jul 2008 21:35:31 -0400
-Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756854AbYGRBfb
-	(ORCPT <rfc822;linux-omap-outgoing>);
-	Thu, 17 Jul 2008 21:35:31 -0400
-Received: from utopia.booyaka.com ([72.9.107.138]:49367 "EHLO
-	utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1756351AbYGRBfZ (ORCPT
-	<rfc822;linux-omap@vger.kernel.org>); Thu, 17 Jul 2008 21:35:25 -0400
-Received: (qmail 13892 invoked by uid 526); 18 Jul 2008 01:35:23 -0000
-MBOX-Line: From nobody Thu Jul 17 19:34:54 2008
-From:	Paul Walmsley <paul@pwsan.com>
-Subject: [PATCH 7/9] TWL4030: move TWL module register defs into separate
-	include files
-To:	linux-omap@vger.kernel.org