From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christophe Leroy Date: Wed, 12 Jul 2017 11:43:22 +0200 (CEST) Subject: [U-Boot] [PATCH 03/14] powerpc, timer: Does 8xx specific actions in 8xx cpu_init In-Reply-To: References: Message-ID: <6b0a0000351dbc49db9b84cbd91193472bd081c0.1499629706.git.christophe.leroy@c-s.fr> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Signed-off-by: Christophe Leroy --- arch/powerpc/cpu/mpc8xx/cpu_init.c | 5 ++++- arch/powerpc/lib/time.c | 11 ----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c index 16e7bf5fd5..dc601a1297 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c @@ -38,7 +38,10 @@ void cpu_init_f(immap_t __iomem *immr) /* unlock TBSCRK */ out_be32(&immr->im_sitk.sitk_tbscrk, KAPWR_KEY); - out_be16(&immr->im_sit.sit_tbscr, CONFIG_SYS_TBSCR); + out_be16(&immr->im_sit.sit_tbscr, CONFIG_SYS_TBSCR | TBSCR_TBE); + + /* Unlock timebase register */ + out_be32(&immr->im_sitk.sitk_tbk, KAPWR_KEY); /* initialize the PIT (11-31) */ diff --git a/arch/powerpc/lib/time.c b/arch/powerpc/lib/time.c index 41a271a42d..ff9bb67e28 100644 --- a/arch/powerpc/lib/time.c +++ b/arch/powerpc/lib/time.c @@ -65,21 +65,10 @@ int timer_init(void) { unsigned long temp; -#if defined(CONFIG_8xx) - immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR; - - /* unlock */ - out_be32(&immap->im_sitk.sitk_tbk, KAPWR_KEY); -#endif - /* reset */ asm volatile("li %0,0 ; mttbu %0 ; mttbl %0;" : "=&r"(temp) ); -#if defined(CONFIG_8xx) - /* enable */ - setbits_be16(&immap->im_sit.sit_tbscr, TBSCR_TBE); -#endif return (0); } /* ------------------------------------------------------------------------- */ -- 2.12.0