linux omap2 git: sync with upstream git

12 files changed, 122 insertions, 1934 deletions

diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch
deleted file mode 100644
index c361c33d61..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-seems unnecessary, so, remove it.
-
-Signed-off-by: Paul Walmsley <paul@pwsan.com>
----
-
- drivers/i2c/chips/twl4030-core.c |   18 ------------------
- 1 files changed, 0 insertions(+), 18 deletions(-)
-
-diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c
-index adc45d4..ff662bc 100644
---- a/drivers/i2c/chips/twl4030-core.c
-+++ b/drivers/i2c/chips/twl4030-core.c
-@@ -719,24 +719,6 @@ static void twl_init_irq(void)
- 	char	*msg = "Unable to register interrupt subsystem";
- 	unsigned int irq_num;
- 
--	/*
--	 * We end up with interrupts from other modules before
--	 * they get a chance to handle them...
--	 */
--	/* 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;
--	}
--
--	/* PWR_ISR2 */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x02);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
--
- 	/* PWR_IMR1 */
- 	res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x1);
- 	if (res < 0) {
diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch
deleted file mode 100644
index 48a59b945b..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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
-to be stuck on until twl4030-gpio.c initializes, often drowning the console in
-
-    TWL4030 module irq 368 is disabled but can't be masked!
-
-messages.  This seems to be a particular problem when booting on Beagle.
-
-Signed-off-by: Paul Walmsley <paul@pwsan.com>
----
-
- drivers/i2c/chips/twl4030-core.c |   42 ++++++++++++++++++++++++++++++++++++++
- 1 files changed, 42 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c
-index ff662bc..dfc3805 100644
---- a/drivers/i2c/chips/twl4030-core.c
-+++ b/drivers/i2c/chips/twl4030-core.c
-@@ -857,6 +857,48 @@ static void twl_init_irq(void)
- 		return;
- 	}
- 
-+	/* 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;
-+	}
-+
-+	/* GPIO_ISR2A */
-+	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1a);
-+	if (res < 0) {
-+		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
-+		return;
-+	}
-+
-+	/* GPIO_ISR3A */
-+	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1b);
-+	if (res < 0) {
-+		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
-+		return;
-+	}
-+
-+	/* GPIO_ISR1B */
-+	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1f);
-+	if (res < 0) {
-+		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
-+		return;
-+	}
-+
-+	/* GPIO_ISR2B */
-+	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x20);
-+	if (res < 0) {
-+		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
-+		return;
-+	}
-+
-+	/* GPIO_ISR3B */
-+	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x21);
-+	if (res < 0) {
-+		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
-+		return;
-+	}
-+
- 	/* 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);
diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch
deleted file mode 100644
index fe1bea5398..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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;
diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch
deleted file mode 100644
index fb65ac98bb..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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.
-
-Signed-off-by: Paul Walmsley <paul@pwsan.com>
----
-
- drivers/i2c/chips/twl4030-core.c |   14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c
-index bb0732c..9d93524 100644
---- a/drivers/i2c/chips/twl4030-core.c
-+++ b/drivers/i2c/chips/twl4030-core.c
-@@ -821,6 +821,20 @@ static void twl_init_irq(void)
- 		return;
- 	}
- 
-+	/* 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;
-+	}
-+
-+	/* MADC_ISR2 */
-+	res = twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xFF, 0x63);
-+	if (res < 0) {
-+		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
-+		return;
-+	}
-+
- 	/* key Pad */
- 	/* KEYPAD - IMR1 */
- 	res = twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xFF, (0x12));
diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch
deleted file mode 100644
index 02a72ed9df..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-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").
-
-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.
-
-
-Signed-off-by: Paul Walmsley <paul@pwsan.com>
----
-
- 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..eae0634 100644
---- a/drivers/i2c/chips/twl4030-core.c
-+++ b/drivers/i2c/chips/twl4030-core.c
-@@ -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;
- }
- 
-+/**
-+ * 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)
-+ *
-+ * 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, u8 cor)
-+{
-+	u8 tmp;
-+
-+	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 tmp;
-+}
-+
- static void twl_init_irq(void)
- {
- 	int	i = 0;
- 	int	res = 0;
-+	int cor;
- 	char	*msg = "Unable to register interrupt subsystem";
- 	unsigned int irq_num;
- 
-+	/*
-+	 * For each TWL4030 module with ISR/IMR registers, mask all
-+	 * interrupts and then clear any existing interrupt status bits,
-+	 * since we initially do not have any TWL4030 module interrupt
-+	 * handlers present.
-+	 */
-+
-+
- 	/* PWR_IMR1 */
- 	res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x1);
- 	if (res < 0) {
-@@ -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, cor) < 0);
- 
- 	/* PWR_ISR2 */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x02);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
--	/* POWER HACK (END) */
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INT, 0x02, cor) < 0);
-+
- 	/* Slave address 0x4A */
- 
- 	/* BCIIMR1A */
-@@ -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, cor) < 0);
- 
- 	/* BCIISR2A */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x1);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x1, cor) < 0);
- 
- 	/* BCIISR1B */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x4);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x4, cor) < 0);
- 
- 	/* BCIISR2B */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x5);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x5, cor) < 0);
- 
- 	/* MAD C */
- 	/* MADC_IMR1 */
-@@ -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, cor) < 0);
- 
- 	/* MADC_ISR2 */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xFF, 0x63);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, 0x63, cor) < 0);
- 
- 	/* key Pad */
- 	/* KEYPAD - IMR1 */
-@@ -842,12 +884,15 @@ static void twl_init_irq(void)
- 		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
- 		return;
- 	}
--	{
--		u8 clear;
--		/* Clear ISR */
--		twl4030_i2c_read_u8(TWL4030_MODULE_KEYPAD, &clear, 0x11);
--		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, cor) < 0);
- 
- 	/* KEYPAD - IMR2 */
- 	res = twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xFF, (0x14));
-@@ -856,6 +901,9 @@ static void twl_init_irq(void)
- 		return;
- 	}
- 
-+	/* KEYPAD - ISR2 */
-+	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));
-@@ -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, cor) < 0);
- 
- 	/* GPIO_ISR2A */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1a);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1a, cor) < 0);
- 
- 	/* GPIO_ISR3A */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1b);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1b, cor) < 0);
- 
- 	/* GPIO_ISR1B */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1f);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1f, cor) < 0);
- 
- 	/* GPIO_ISR2B */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x20);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x20, cor) < 0);
- 
- 	/* GPIO_ISR3B */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x21);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	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++) {
diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch
deleted file mode 100644
index 67b837c454..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-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
-to continue execution rather than skipping TWL init.  (These mask
-writes should not fail at all unless either the I2C bus or the TWL4030
-is somehow wedged.)
-
-Signed-off-by: Paul Walmsley <paul@pwsan.com>
----
-
- drivers/i2c/chips/twl4030-core.c |  100 +++++++-------------------------------
- 1 files changed, 18 insertions(+), 82 deletions(-)
-
-diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c
-index eae0634..99cc143 100644
---- a/drivers/i2c/chips/twl4030-core.c
-+++ b/drivers/i2c/chips/twl4030-core.c
-@@ -778,18 +778,10 @@ static void twl_init_irq(void)
- 
- 
- 	/* PWR_IMR1 */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x1);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xff, 0x1) < 0);
- 
- 	/* PWR_IMR2 */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x3);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xff, 0x3) < 0);
- 
- 	/* Clear off any other pending interrupts on power */
- 
-@@ -807,32 +799,16 @@ static void twl_init_irq(void)
- 	/* Slave address 0x4A */
- 
- 	/* BCIIMR1A */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x2);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, 0x2) < 0);
- 
--	/* BCIIMR2A */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x3);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	/* BCIIMR2A  */
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, 0x3) < 0);
- 
--	/* BCIIMR1B */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x6);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	/* BCIIMR2A */
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, 0x6) < 0);
- 
- 	/* BCIIMR2B */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x7);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, 0x7) < 0);
- 
- 	/* 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 */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xFF, 0x62);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xff, 0x62) < 0);
- 
- 	/* MADC_IMR2 */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xFF, 0x64);
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xff, 0x64) < 0);
- 
- 	/* 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 */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xFF, (0x12));
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xff, 0x12) < 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));
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xff, 0x14) < 0);
- 
- 	/* KEYPAD - ISR2 */
- 	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));
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1c) < 0);
- 
- 	/* GPIO_IMR2A */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xFF, (0x1D));
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1d) < 0);
- 
- 	/* GPIO_IMR3A */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xFF, (0x1E));
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1e) < 0);
- 
- 	/* GPIO_IMR1B */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xFF, (0x22));
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x22) < 0);
- 
- 	/* GPIO_IMR2B */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xFF, (0x23));
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x23) < 0);
- 
- 	/* GPIO_IMR3B */
--	res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xFF, (0x24));
--	if (res < 0) {
--		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
--		return;
--	}
-+	WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x24) < 0);
- 
- 	/* 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
deleted file mode 100644
index 8e4c4d6be4..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-TWL4030: move TWL module register defs into separate include files
-
-From: Paul Walmsley <paul@pwsan.com>
-
-twl_init_irq() uses "magic numbers" to access TWL module IMR and ISR
-registers.  Symbolic constants are definitely preferred.
-
-Rather than duplicating already existing symbolic constants in
-twl4030-gpio.c and twl4030-pwrirq.c, move the existing constants out
-into include files.  This patch should not change kernel behavior.
-
-Signed-off-by: Paul Walmsley <paul@pwsan.com>
----
-
- drivers/i2c/chips/twl4030-gpio.c   |   48 -----------------------
- drivers/i2c/chips/twl4030-pwrirq.c |   15 +++----
- include/linux/i2c/twl4030-gpio.h   |   76 ++++++++++++++++++++++++++++++++++++
- include/linux/i2c/twl4030-pwrirq.h |   37 ++++++++++++++++++
- 4 files changed, 121 insertions(+), 55 deletions(-)
- create mode 100644 include/linux/i2c/twl4030-gpio.h
- create mode 100644 include/linux/i2c/twl4030-pwrirq.h
-
-diff --git a/drivers/i2c/chips/twl4030-gpio.c b/drivers/i2c/chips/twl4030-gpio.c
-index f16a48b..9d17f45 100644
---- a/drivers/i2c/chips/twl4030-gpio.c
-+++ b/drivers/i2c/chips/twl4030-gpio.c
-@@ -38,6 +38,7 @@
- 
- #include <linux/i2c.h>
- #include <linux/i2c/twl4030.h>
-+#include <linux/i2c/twl4030-gpio.h>
- #include <linux/slab.h>
- 
- #include <asm/arch/irqs.h>
-@@ -47,53 +48,6 @@
- 
- #include <linux/device.h>
- 
--/*
-- * GPIO Block Register definitions
-- */
--
--#define REG_GPIODATAIN1			0x0
--#define REG_GPIODATAIN2			0x1
--#define REG_GPIODATAIN3			0x2
--#define REG_GPIODATADIR1		0x3
--#define REG_GPIODATADIR2		0x4
--#define REG_GPIODATADIR3		0x5
--#define REG_GPIODATAOUT1		0x6
--#define REG_GPIODATAOUT2		0x7
--#define REG_GPIODATAOUT3		0x8
--#define REG_CLEARGPIODATAOUT1		0x9
--#define REG_CLEARGPIODATAOUT2		0xA
--#define REG_CLEARGPIODATAOUT3		0xB
--#define REG_SETGPIODATAOUT1		0xC
--#define REG_SETGPIODATAOUT2		0xD
--#define REG_SETGPIODATAOUT3		0xE
--#define REG_GPIO_DEBEN1			0xF
--#define REG_GPIO_DEBEN2			0x10
--#define REG_GPIO_DEBEN3			0x11
--#define REG_GPIO_CTRL			0x12
--#define REG_GPIOPUPDCTR1		0x13
--#define REG_GPIOPUPDCTR2		0x14
--#define REG_GPIOPUPDCTR3		0x15
--#define REG_GPIOPUPDCTR4		0x16
--#define REG_GPIOPUPDCTR5		0x17
--#define REG_GPIO_ISR1A			0x19
--#define REG_GPIO_ISR2A			0x1A
--#define REG_GPIO_ISR3A			0x1B
--#define REG_GPIO_IMR1A			0x1C
--#define REG_GPIO_IMR2A			0x1D
--#define REG_GPIO_IMR3A			0x1E
--#define REG_GPIO_ISR1B			0x1F
--#define REG_GPIO_ISR2B			0x20
--#define REG_GPIO_ISR3B			0x21
--#define REG_GPIO_IMR1B			0x22
--#define REG_GPIO_IMR2B			0x23
--#define REG_GPIO_IMR3B			0x24
--#define REG_GPIO_EDR1			0x28
--#define REG_GPIO_EDR2			0x29
--#define REG_GPIO_EDR3			0x2A
--#define REG_GPIO_EDR4			0x2B
--#define REG_GPIO_EDR5			0x2C
--#define REG_GPIO_SIH_CTRL		0x2D
--
- /* BitField Definitions */
- 
- /* Data banks : 3 banks for 8 gpios each */
-diff --git a/drivers/i2c/chips/twl4030-pwrirq.c b/drivers/i2c/chips/twl4030-pwrirq.c
-index a4d2e92..1afdb65 100644
---- a/drivers/i2c/chips/twl4030-pwrirq.c
-+++ b/drivers/i2c/chips/twl4030-pwrirq.c
-@@ -27,10 +27,8 @@
- #include <linux/random.h>
- #include <linux/kthread.h>
- #include <linux/i2c/twl4030.h>
-+#include <linux/i2c/twl4030-pwrirq.h>
- 
--#define PWR_ISR1 0
--#define PWR_IMR1 1
--#define PWR_SIH_CTRL 7
- #define PWR_SIH_CTRL_COR (1<<2)
- 
- static u8 twl4030_pwrirq_mask;
-@@ -93,7 +91,8 @@ static void do_twl4030_pwrmodule_irq(unsigned int irq, irq_desc_t *desc)
- 			twl4030_pwrirq_mask |= 1 << (irq - TWL4030_PWR_IRQ_BASE);
- 			local_irq_enable();
- 			twl4030_i2c_write_u8(TWL4030_MODULE_INT,
--						twl4030_pwrirq_mask, PWR_IMR1);
-+					     twl4030_pwrirq_mask,
-+					     TWL4030_INT_PWR_IMR1);
- 		}
- 	}
- }
-@@ -115,7 +114,7 @@ static void do_twl4030_pwrirq(unsigned int irq, irq_desc_t *desc)
- 
- 		local_irq_enable();
- 		ret = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &pwr_isr,
--						PWR_ISR1);
-+					  TWL4030_INT_PWR_ISR1);
- 		if (ret) {
- 			printk(KERN_WARNING
- 				"I2C error %d while reading TWL4030"
-@@ -151,7 +150,7 @@ static int twl4030_pwrirq_thread(void *data)
- 		twl4030_pwrirq_mask &= ~local_unmask;
- 
- 		twl4030_i2c_write_u8(TWL4030_MODULE_INT, twl4030_pwrirq_mask,
--					PWR_IMR1);
-+				     TWL4030_INT_PWR_IMR1);
- 
- 		local_irq_disable();
- 		if (!twl4030_pwrirq_pending_unmask)
-@@ -172,14 +171,14 @@ static int __init twl4030_pwrirq_init(void)
- 	twl4030_pwrirq_pending_unmask = 0;
- 
- 	err = twl4030_i2c_write_u8(TWL4030_MODULE_INT, twl4030_pwrirq_mask,
--					PWR_IMR1);
-+					TWL4030_INT_PWR_IMR1);
- 	if (err)
- 		return err;
- 
- 	/* Enable clear on read */
- 
- 	err = twl4030_i2c_write_u8(TWL4030_MODULE_INT, PWR_SIH_CTRL_COR,
--					PWR_SIH_CTRL);
-+				   TWL4030_INT_PWR_SIH_CTRL);
- 	if (err)
- 		return err;
- 
-diff --git a/include/linux/i2c/twl4030-gpio.h b/include/linux/i2c/twl4030-gpio.h
-new file mode 100644
-index 0000000..7cbf610
---- /dev/null
-+++ b/include/linux/i2c/twl4030-gpio.h
-@@ -0,0 +1,76 @@
-+/*
-+ * twl4030-gpio.h - header for TWL4030 GPIO module
-+ *
-+ * Copyright (C) 2005-2006, 2008 Texas Instruments, Inc.
-+ * Copyright (C) 2008 Nokia Corporation
-+ *
-+ * Based on tlv320aic23.c:
-+ * Copyright (c) by Kai Svahn <kai.svahn@nokia.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-+ *
-+ */
-+
-+#ifndef __TWL4030_GPIO_H_
-+#define __TWL4030_GPIO_H_
-+
-+/*
-+ * GPIO Block Register definitions
-+ */
-+
-+#define REG_GPIODATAIN1			0x0
-+#define REG_GPIODATAIN2			0x1
-+#define REG_GPIODATAIN3			0x2
-+#define REG_GPIODATADIR1		0x3
-+#define REG_GPIODATADIR2		0x4
-+#define REG_GPIODATADIR3		0x5
-+#define REG_GPIODATAOUT1		0x6
-+#define REG_GPIODATAOUT2		0x7
-+#define REG_GPIODATAOUT3		0x8
-+#define REG_CLEARGPIODATAOUT1		0x9
-+#define REG_CLEARGPIODATAOUT2		0xA
-+#define REG_CLEARGPIODATAOUT3		0xB
-+#define REG_SETGPIODATAOUT1		0xC
-+#define REG_SETGPIODATAOUT2		0xD
-+#define REG_SETGPIODATAOUT3		0xE
-+#define REG_GPIO_DEBEN1			0xF
-+#define REG_GPIO_DEBEN2			0x10
-+#define REG_GPIO_DEBEN3			0x11
-+#define REG_GPIO_CTRL			0x12
-+#define REG_GPIOPUPDCTR1		0x13
-+#define REG_GPIOPUPDCTR2		0x14
-+#define REG_GPIOPUPDCTR3		0x15
-+#define REG_GPIOPUPDCTR4		0x16
-+#define REG_GPIOPUPDCTR5		0x17
-+#define REG_GPIO_ISR1A			0x19
-+#define REG_GPIO_ISR2A			0x1A
-+#define REG_GPIO_ISR3A			0x1B
-+#define REG_GPIO_IMR1A			0x1C
-+#define REG_GPIO_IMR2A			0x1D
-+#define REG_GPIO_IMR3A			0x1E
-+#define REG_GPIO_ISR1B			0x1F
-+#define REG_GPIO_ISR2B			0x20
-+#define REG_GPIO_ISR3B			0x21
-+#define REG_GPIO_IMR1B			0x22
-+#define REG_GPIO_IMR2B			0x23
-+#define REG_GPIO_IMR3B			0x24
-+#define REG_GPIO_EDR1			0x28
-+#define REG_GPIO_EDR2			0x29