diff options
10 files changed, 1803 insertions, 0 deletions
diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch new file mode 100644 index 0000000000..b6142ea1f5 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch @@ -0,0 +1,86 @@ +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 + +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) { + + +-- +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 new file mode 100644 index 0000000000..18b2f589c1 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch @@ -0,0 +1,114 @@ +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 + +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); + + +-- +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 new file mode 100644 index 0000000000..062d99fe5a --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch @@ -0,0 +1,126 @@ +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 + +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; + + +-- +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 new file mode 100644 index 0000000000..12d76bfb23 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch @@ -0,0 +1,81 @@ +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 + +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)); + + +-- +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 new file mode 100644 index 0000000000..b41c836711 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch @@ -0,0 +1,275 @@ +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 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. + +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(-) + +diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c +index 9d93524..615fb84 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) + return e; + } + ++/** ++ * twl4030_i2c_clear_isr - clear TWL4030 SIH ISR regs via read + write ++ * @mod_no: TWL4030 module number ++ * @reg: register index to clear ++ * ++ * 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. ++ */ ++static int twl4030_i2c_clear_isr(u8 mod_no, u8 reg) ++{ ++ int res; ++ u8 tmp; ++ ++ res = twl4030_i2c_read_u8(mod_no, &tmp, reg); ++ if (res < 0) ++ return res; ++ ++ return twl4030_i2c_write_u8(mod_no, 0xff, reg); ++} ++ + static void twl_init_irq(void) + { + int i = 0; +@@ -719,6 +741,13 @@ static void twl_init_irq(void) + 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) { +@@ -735,19 +764,11 @@ static void twl_init_irq(void) + + /* Clear off any other pending interrupts on power */ + /* 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); + + /* 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) < 0); ++ + /* Slave address 0x4A */ + + /* BCIIMR1A */ +@@ -779,32 +800,16 @@ static void twl_init_irq(void) + } + + /* 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); + + /* 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) < 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) < 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) < 0); + + /* MAD C */ + /* MADC_IMR1 */ +@@ -822,18 +827,10 @@ static void twl_init_irq(void) + } + + /* 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); + + /* 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) < 0); + + /* key Pad */ + /* KEYPAD - IMR1 */ +@@ -842,12 +839,10 @@ 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); +- } ++ ++ /* 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); + + /* KEYPAD - IMR2 */ + res = twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xFF, (0x14)); +@@ -856,6 +851,9 @@ static void twl_init_irq(void) + return; + } + ++ /* KEYPAD - ISR2 */ ++ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x13) < 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) + } + + /* 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); + + /* 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) < 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) < 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) < 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) < 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) < 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 new file mode 100644 index 0000000000..501437a365 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch @@ -0,0 +1,220 @@ +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 + +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 615fb84..1906635 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) + */ + + /* 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 */ + /* PWR_ISR1 */ +@@ -772,32 +764,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); + + /* BCIISR1A */ + WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x0) < 0); +@@ -813,18 +789,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); + + /* MADC_ISR1 */ + WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, 0x61) < 0); +@@ -834,68 +802,36 @@ 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); + + /* 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); + + /* 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) < 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); + + /* 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 + diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch new file mode 100644 index 0000000000..2847e84f62 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch @@ -0,0 +1,318 @@ +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, |