From patchwork Thu Jul 13 13:09:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 787723 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3x7bmb31GCz9ryk for ; Thu, 13 Jul 2017 23:11:11 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 30EEFC21E5F; Thu, 13 Jul 2017 13:10:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9ABEBC21E56; Thu, 13 Jul 2017 13:10:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C7ADCC21DFF; Thu, 13 Jul 2017 13:09:52 +0000 (UTC) Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by lists.denx.de (Postfix) with ESMTPS id CF77AC21E3B for ; Thu, 13 Jul 2017 13:09:48 +0000 (UTC) Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 3x7bkl1wTvz9ttCL; Thu, 13 Jul 2017 15:09:35 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id 3AFkBeN7xa2A; Thu, 13 Jul 2017 15:09:35 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 3x7bkl1RyWz9ttC8; Thu, 13 Jul 2017 15:09:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 59B4B8B881; Thu, 13 Jul 2017 15:09:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id HHyrvswT3gQb; Thu, 13 Jul 2017 15:09:48 +0200 (CEST) Received: from pc13941vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.8]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 36A6D8B7FF; Thu, 13 Jul 2017 15:09:48 +0200 (CEST) Received: by pc13941vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 28A3F674EB; Thu, 13 Jul 2017 15:09:48 +0200 (CEST) Message-Id: In-Reply-To: References: From: Christophe Leroy To: Wolfgang Denk , Heiko Schocher , Tom Rini Date: Thu, 13 Jul 2017 15:09:48 +0200 (CEST) Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH v2 03/14] powerpc, timer: Does 8xx specific actions in 8xx cpu_init X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The actions inside #ifdef CONFIG_8xx in arch/powerpc/lib/time.c can be performed before, in a 8xx dedicated function. 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); } /* ------------------------------------------------------------------------- */