diff for duplicates of <20100311235640.GW2900@atomide.com> diff --git a/a/1.txt b/N1/1.txt index ce1d77e..7fc25fd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,10 +2,10 @@ > Hi Tony, > > > -----Original Message----- -> > From: Tony Lindgren [mailto:tony@atomide.com] +> > From: Tony Lindgren [mailto:tony at atomide.com] > > Sent: Thursday, March 11, 2010 5:49 PM -> > To: linux-arm-kernel@lists.infradead.org -> > Cc: Aguirre, Sergio; linux-omap@vger.kernel.org +> > To: linux-arm-kernel at lists.infradead.org +> > Cc: Aguirre, Sergio; linux-omap at vger.kernel.org > > Subject: [PATCH 12/19] omap: Fix gpio_resume_after_retention > > > > From: Tony Lindgren <Aguirre> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 0c4a68e..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="gpio-fix.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 4e42863..0000000 --- a/a/2.txt +++ /dev/null @@ -1,46 +0,0 @@ ->From f00d649703fbedbdeb33d63c4c4731656e11297c Mon Sep 17 00:00:00 2001 -From: Sergio Aguirre <saaguirre@ti.com> -Date: Wed, 3 Mar 2010 16:21:08 +0000 -Subject: [PATCH] omap: Fix gpio_resume_after_retention - -For omap4 case, this was wrongly writing GPIO_LEVELDETECTx -registers with OMAP24XX_ offset and OMAP4_ offset. - -Bug introduced in commit: - - commit 3f1686a9bfe74979c6ad538c78039730f665f77e - Author: Tony Lindgren <tony@atomide.com> - Date: Mon Feb 15 09:27:25 2010 -0800 - - omap: Fix gpio.c for multi-omap for omap4 - -Signed-off-by: Sergio Aguirre <saaguirre@ti.com> -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c -index 337199e..76a347b 100644 ---- a/arch/arm/plat-omap/gpio.c -+++ b/arch/arm/plat-omap/gpio.c -@@ -2140,18 +2140,18 @@ void omap2_gpio_resume_after_retention(void) - if (gen) { - u32 old0, old1; - -- if (cpu_is_omap24xx() || cpu_is_omap44xx()) { -+ if (cpu_is_omap24xx() || cpu_is_omap34xx()) { - old0 = __raw_readl(bank->base + - OMAP24XX_GPIO_LEVELDETECT0); - old1 = __raw_readl(bank->base + - OMAP24XX_GPIO_LEVELDETECT1); -- __raw_writel(old0 | gen, bank->base + -+ __raw_writel(old0 | gen, bank->base + - OMAP24XX_GPIO_LEVELDETECT0); -- __raw_writel(old1 | gen, bank->base + -+ __raw_writel(old1 | gen, bank->base + - OMAP24XX_GPIO_LEVELDETECT1); -- __raw_writel(old0, bank->base + -+ __raw_writel(old0, bank->base + - OMAP24XX_GPIO_LEVELDETECT0); -- __raw_writel(old1, bank->base + -+ __raw_writel(old1, bank->base + - OMAP24XX_GPIO_LEVELDETECT1); - } diff --git a/a/content_digest b/N1/content_digest index c41e246..f9d05da 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,20 @@ "ref\020100311234404.4500.82861.stgit@baageli.muru.com\0" "ref\020100311234834.4500.12726.stgit@baageli.muru.com\0" "ref\0A24693684029E5489D1D202277BE894453FB11F8@dlee02.ent.ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 12/19] omap: Fix gpio_resume_after_retention\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 12/19] omap: Fix gpio_resume_after_retention\0" "Date\0Thu, 11 Mar 2010 15:56:40 -0800\0" - "To\0Aguirre" - " Sergio <saaguirre@ti.com>\0" - "Cc\0linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>" - " linux-omap@vger.kernel.org <linux-omap@vger.kernel.org>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "* Aguirre, Sergio <saaguirre@ti.com> [100311 15:47]:\n" "> Hi Tony,\n" "> \n" "> > -----Original Message-----\n" - "> > From: Tony Lindgren [mailto:tony@atomide.com]\n" + "> > From: Tony Lindgren [mailto:tony at atomide.com]\n" "> > Sent: Thursday, March 11, 2010 5:49 PM\n" - "> > To: linux-arm-kernel@lists.infradead.org\n" - "> > Cc: Aguirre, Sergio; linux-omap@vger.kernel.org\n" + "> > To: linux-arm-kernel at lists.infradead.org\n" + "> > Cc: Aguirre, Sergio; linux-omap at vger.kernel.org\n" "> > Subject: [PATCH 12/19] omap: Fix gpio_resume_after_retention\n" "> > \n" "> > From: Tony Lindgren <Aguirre>\n" @@ -35,54 +32,5 @@ "format..\n" "\n" Tony - "\01:2\0" - "fn\0gpio-fix.patch\0" - "b\0" - ">From f00d649703fbedbdeb33d63c4c4731656e11297c Mon Sep 17 00:00:00 2001\n" - "From: Sergio Aguirre <saaguirre@ti.com>\n" - "Date: Wed, 3 Mar 2010 16:21:08 +0000\n" - "Subject: [PATCH] omap: Fix gpio_resume_after_retention\n" - "\n" - "For omap4 case, this was wrongly writing GPIO_LEVELDETECTx\n" - "registers with OMAP24XX_ offset and OMAP4_ offset.\n" - "\n" - "Bug introduced in commit:\n" - "\n" - " commit 3f1686a9bfe74979c6ad538c78039730f665f77e\n" - " Author: Tony Lindgren <tony@atomide.com>\n" - " Date: Mon Feb 15 09:27:25 2010 -0800\n" - "\n" - " omap: Fix gpio.c for multi-omap for omap4\n" - "\n" - "Signed-off-by: Sergio Aguirre <saaguirre@ti.com>\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c\n" - "index 337199e..76a347b 100644\n" - "--- a/arch/arm/plat-omap/gpio.c\n" - "+++ b/arch/arm/plat-omap/gpio.c\n" - "@@ -2140,18 +2140,18 @@ void omap2_gpio_resume_after_retention(void)\n" - " \t\tif (gen) {\n" - " \t\t\tu32 old0, old1;\n" - " \n" - "-\t\t\tif (cpu_is_omap24xx() || cpu_is_omap44xx()) {\n" - "+\t\t\tif (cpu_is_omap24xx() || cpu_is_omap34xx()) {\n" - " \t\t\t\told0 = __raw_readl(bank->base +\n" - " \t\t\t\t\tOMAP24XX_GPIO_LEVELDETECT0);\n" - " \t\t\t\told1 = __raw_readl(bank->base +\n" - " \t\t\t\t\tOMAP24XX_GPIO_LEVELDETECT1);\n" - "-\t\t\t__raw_writel(old0 | gen, bank->base +\n" - "+\t\t\t\t__raw_writel(old0 | gen, bank->base +\n" - " \t\t\t\t\tOMAP24XX_GPIO_LEVELDETECT0);\n" - "-\t\t\t__raw_writel(old1 | gen, bank->base +\n" - "+\t\t\t\t__raw_writel(old1 | gen, bank->base +\n" - " \t\t\t\t\tOMAP24XX_GPIO_LEVELDETECT1);\n" - "-\t\t\t__raw_writel(old0, bank->base +\n" - "+\t\t\t\t__raw_writel(old0, bank->base +\n" - " \t\t\t\t\tOMAP24XX_GPIO_LEVELDETECT0);\n" - "-\t\t\t__raw_writel(old1, bank->base +\n" - "+\t\t\t\t__raw_writel(old1, bank->base +\n" - " \t\t\t\t\tOMAP24XX_GPIO_LEVELDETECT1);\n" - " \t\t\t}" -cdb9c10cf12c12442853adc09fd5b39ea1dc35eb4fe9386fbc13d675d8947144 +6f52ab87cbf844984be7af981582d7cd7bccb13b29d937b1e349b5c534ff404c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.