OMAP2+: hwmod/clockevent: allow late-init of individual hwmods
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest0 of 8 patches 0 repliesNew
Patches in v1 No applies recorded yet
None of the 8 patches the cover letter announces are in this archive.
Reviews trailers per patch
| Patch | Santosh Shilimkar | Paul Walmsley |
|---|---|---|
| Series | A-b | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH 0/8] OMAP2+: hwmod/clockevent: allow late-init of individual hwmods
Quoted 7 lines · Tony Lindgren
Quoted 3 lines · Paul Walmsley
Quoted 2 lines
Tony, I guess the omap-for-linus branch will probably need to get rebuilt to drop that patch, once this series is merged...
Let's rather apply a fix or revert instead than start messing with omap-for-linus. That branch is supposed to be a stable base for others to base their branches on.
Paul,
It is probably better to add the fix in that series at the same time you setup the timer hwmod in the following commit 38698bef5454. It will avoid breaking bisect.
Regards,
Benoit
---
From 35e0aff709a7ea27c65e08c7bd5d904d3193ec75 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <[email protected]>
Date: Wed, 23 Feb 2011 00:14:08 -0700
Subject: [PATCH] OMAP2+: clockevent: set up GPTIMER clockevent hwmod right before timer init
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Set up the GPTIMER hwmod used for the clockevent source immediately before it is used. This avoids the need to set up all of the hwmods until the boot process is further along. (In general, we want to defer as much as possible until late in the boot process.)
This second version fixes a bug pointed out by Santosh Shilimkar <[email protected]>, that would cause the kernel to use an incorrect timer hwmod name if the selected GPTIMER was not 1 or 12 - thanks Santosh. Also, Tarun Kanti DebBarma <[email protected]> pointed out that the original patch did not apply cleanly; this has now been fixed.
Revert as well commit 3b03b58dab847883e6b9a431558c7d8e43fa94c6:
"OMAP4: hwmod data: Prevent timer1 to be reset and idle during init", that is not longer needed since hwmod is setup before timer used it.
--- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1 - arch/arm/mach-omap2/timer-gp.c | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-)
(quoted diff) +0 -0
b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 2c58827..b4d3b3c 100644
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -0
@@ -3989,7 +3989,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",
arch/arm/mach-omap2/timer-gp.c +6 -1
@@ -39,10 +39,11 @@#include <asm/mach/time.h> #include <plat/dmtimer.h> #include <asm/localtimer.h> +#include <plat/common.h> +#include <plat/omap_hwmod.h> #include "timer-gp.h" -#include <plat/common.h> /* MAX_GPTIMER_ID: number of GPTIMERs on the chip */ #define MAX_GPTIMER_ID 12
@@ -132,9 +133,13 @@ static void __init omap2_gp_clockevent_init(void) {u32 tick_rate;int src; +char clockevent_hwmod_name[8 ];/* 8 = sizeof("timerXX0") */ inited =1 ; +sprintf (clockevent_hwmod_name,"timer%d" , gptimer_id); +omap_hwmod_setup_one (clockevent_hwmod_name); + gptimer =omap_dm_timer_request_specific (gptimer_id);BUG_ON (gptimer ==NULL ); gptimer_wakeup = gptimer;
Signature · 1 line
1.7.0.4