diff for duplicates of <4D7115BF.7000009@ti.com> diff --git a/a/1.txt b/N1/1.txt index f3b9d91..ed26bd4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,36 +18,3 @@ Meanwhile, here is the revert. Benoit --- ->From aa22c44486c12c388eb96e9fe9b1476267856006 Mon Sep 17 00:00:00 2001 -From: Benoit Cousson <b-cousson@ti.com> -Date: Fri, 4 Mar 2011 16:01:43 +0100 -Subject: [PATCH 1/2] Revert "OMAP4: hwmod data: Prevent timer1 to be reset and idle during init" - -The following commit: 38698be: -OMAP2+: clockevent: set up GPTIMER clockevent hwmod right before timer init - -Fixed properly the issue with early init for the timer1 - -So reverts commit 3b03b58dab847883e6b9a431558c7d8e43fa94c6 that is now -generated a warning at boot time. - -Signed-off-by: Benoit Cousson <b-cousson@ti.com> -Cc: Paul Walmsley <paul@pwsan.com> ---- - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c -index 7dbcdf7..7b72316 100644 ---- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c -+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c -@@ -4005,7 +4005,6 @@ static struct omap_hwmod_ocp_if *omap44xx_timer1_slaves[] = { - static struct omap_hwmod omap44xx_timer1_hwmod = { - .name = "timer1", - .class = &omap44xx_timer_1ms_hwmod_class, -- .flags = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET, - .mpu_irqs = omap44xx_timer1_irqs, - .mpu_irqs_cnt = ARRAY_SIZE(omap44xx_timer1_irqs), - .main_clk = "timer1_fck", --- -1.7.0.4 diff --git a/a/content_digest b/N1/content_digest index b290908..3ebd9ab 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,23 +6,10 @@ "ref\04D6F7723.5040001@ti.com\0" "ref\04D70FC5B.9040701@ti.com\0" "ref\020110304161933.GV20560@atomide.com\0" - "From\0Cousson, Benoit <b-cousson@ti.com>\0" - "Subject\0Re: [PATCH 0/8] OMAP2+: hwmod/clockevent: allow late-init of individual hwmods\0" + "From\0b-cousson@ti.com (Cousson, Benoit)\0" + "Subject\0[PATCH 0/8] OMAP2+: hwmod/clockevent: allow late-init of individual hwmods\0" "Date\0Fri, 4 Mar 2011 17:39:27 +0100\0" - "To\0Tony Lindgren <tony@atomide.com>\0" - "Cc\0Paul Walmsley <paul@pwsan.com>" - linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - Hilman - Kevin <khilman@ti.com> - Shilimkar - Santosh <santosh.shilimkar@ti.com> - Gopinath - Thara <thara@ti.com> - DebBarma - Tarun Kanti <tarun.kanti@ti.com> - Nayak - " Rajendra <rnayak@ti.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 3/4/2011 5:19 PM, Tony Lindgren wrote:\n" @@ -44,39 +31,6 @@ "\n" "Benoit\n" "\n" - "---\n" - ">From aa22c44486c12c388eb96e9fe9b1476267856006 Mon Sep 17 00:00:00 2001\n" - "From: Benoit Cousson <b-cousson@ti.com>\n" - "Date: Fri, 4 Mar 2011 16:01:43 +0100\n" - "Subject: [PATCH 1/2] Revert \"OMAP4: hwmod data: Prevent timer1 to be reset and idle during init\"\n" - "\n" - "The following commit: 38698be:\n" - "OMAP2+: clockevent: set up GPTIMER clockevent hwmod right before timer init\n" - "\n" - "Fixed properly the issue with early init for the timer1\n" - "\n" - "So reverts commit 3b03b58dab847883e6b9a431558c7d8e43fa94c6 that is now\n" - "generated a warning at boot time.\n" - "\n" - "Signed-off-by: Benoit Cousson <b-cousson@ti.com>\n" - "Cc: Paul Walmsley <paul@pwsan.com>\n" - "---\n" - " arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1 -\n" - " 1 files changed, 0 insertions(+), 1 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" - "index 7dbcdf7..7b72316 100644\n" - "--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" - "+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" - "@@ -4005,7 +4005,6 @@ static struct omap_hwmod_ocp_if *omap44xx_timer1_slaves[] = {\n" - " static struct omap_hwmod omap44xx_timer1_hwmod = {\n" - " \t.name\t\t= \"timer1\",\n" - " \t.class\t\t= &omap44xx_timer_1ms_hwmod_class,\n" - "-\t.flags\t\t= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,\n" - " \t.mpu_irqs\t= omap44xx_timer1_irqs,\n" - " \t.mpu_irqs_cnt\t= ARRAY_SIZE(omap44xx_timer1_irqs),\n" - " \t.main_clk\t= \"timer1_fck\",\n" - "-- \n" - 1.7.0.4 + --- -337fc4d90cfbaf43ae531e66a354026a0992bcc7febf38317b68af76b5294559 +d6722bfd2d461b6230788e2aa2456c14cd5757ec0c87820e63c7ddd2a9ee31f9
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.