From patchwork Thu Jul 13 13:09:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 787721 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 3x7bld2LRbz9ryk for ; Thu, 13 Jul 2017 23:10:21 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E7126C21E4E; Thu, 13 Jul 2017 13:10:05 +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 A0FB6C21E10; Thu, 13 Jul 2017 13:09:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3E66EC21DBE; Thu, 13 Jul 2017 13:09:45 +0000 (UTC) Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by lists.denx.de (Postfix) with ESMTPS id E4754C21DAC for ; Thu, 13 Jul 2017 13:09:44 +0000 (UTC) Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 3x7bkg2FkYz9ttCH; Thu, 13 Jul 2017 15:09:31 +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 QpjYOTEaXg4i; Thu, 13 Jul 2017 15:09:31 +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 3x7bkg05YVz9ttC8; Thu, 13 Jul 2017 15:09:31 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 41B5F8B880; Thu, 13 Jul 2017 15:09:44 +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 3S5b2Tr84QWW; Thu, 13 Jul 2017 15:09:44 +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 1FD6F8B7FF; Thu, 13 Jul 2017 15:09:44 +0200 (CEST) Received: by pc13941vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 17775674EB; Thu, 13 Jul 2017 15:09:44 +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:44 +0200 (CEST) Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH v2 01/14] powerpc, 8xx: Simplify brgclk calculation and remove get_brgclk() 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" divider is calculated based on SCCR_DFBRG, with: SCCR_DFBRG 00 => divider 1 = 1 << 0 SCCR_DFBRG 01 => divider 4 = 1 << 2 SCCR_DFBRG 10 => divider 16 = 1 << 4 SCCR_DFBRG 11 => divider 64 = 1 << 6 This can be easily converted to a single shift operation: divider = 1 << (SCCR_DFBRG * 2) Signed-off-by: Christophe Leroy --- arch/powerpc/cpu/mpc8xx/speed.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/arch/powerpc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c index 8d43efff6c..fa8f87cbc5 100644 --- a/arch/powerpc/cpu/mpc8xx/speed.c +++ b/arch/powerpc/cpu/mpc8xx/speed.c @@ -12,27 +12,6 @@ DECLARE_GLOBAL_DATA_PTR; -void get_brgclk(uint sccr) -{ - uint divider = 0; - - switch ((sccr & SCCR_DFBRG11) >> 11) { - case 0: - divider = 1; - break; - case 1: - divider = 4; - break; - case 2: - divider = 16; - break; - case 3: - divider = 64; - break; - } - gd->arch.brg_clk = gd->cpu_clk / divider; -} - /* * get_clocks() fills in gd->cpu_clock depending on CONFIG_8xx_GCLK_FREQ */ @@ -41,6 +20,8 @@ int get_clocks(void) uint immr = get_immr(0); /* Return full IMMR contents */ immap_t __iomem *immap = (immap_t __iomem *)(immr & 0xFFFF0000); uint sccr = in_be32(&immap->im_clkrst.car_sccr); + uint divider = 1 << (((sccr & SCCR_DFBRG11) >> 11) * 2); + /* * If for some reason measuring the gclk frequency won't * work, we return the hardwired value. @@ -57,7 +38,7 @@ int get_clocks(void) gd->bus_clk = gd->cpu_clk / 2; } - get_brgclk(sccr); + gd->arch.brg_clk = gd->cpu_clk / divider; return 0; }