From patchwork Thu Jun 29 16:54:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 782376 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 3wz5WB0V7Qz9s3T for ; Fri, 30 Jun 2017 03:00:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A4B9BC21D7E; Thu, 29 Jun 2017 16:59:46 +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 54629C21D6C; Thu, 29 Jun 2017 16:55:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F3723C21D56; Thu, 29 Jun 2017 16:55:30 +0000 (UTC) Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by lists.denx.de (Postfix) with ESMTPS id 42B5EC21CC4 for ; Thu, 29 Jun 2017 16:54:23 +0000 (UTC) Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 3wz5NK0c9Cz9ttBT; Thu, 29 Jun 2017 18:54:09 +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 Jf45QhasArGi; Thu, 29 Jun 2017 18:54:08 +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 3wz5NJ6qbWz9ttBP; Thu, 29 Jun 2017 18:54:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id A82868B8C3; Thu, 29 Jun 2017 18:54:22 +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 x_NgnmAvYByp; Thu, 29 Jun 2017 18:54:22 +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 873238B8C2; Thu, 29 Jun 2017 18:54:22 +0200 (CEST) Received: by pc13941vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 7B82E67501; Thu, 29 Jun 2017 18:54:22 +0200 (CEST) Message-Id: <8947f895b86efe0396b1825998a64a3340fff597.1498751837.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy To: Wolfgang Denk , Heiko Schocher , Tom Rini Date: Thu, 29 Jun 2017 18:54:22 +0200 (CEST) Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 2/7] powerpc, 8xx: Implement GLL2 ERRATA 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" Signed-off-by: Christophe Leroy --- arch/powerpc/cpu/mpc8xx/cpu_init.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c index 0f935aff9e..e8045cc5c6 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c @@ -55,6 +55,16 @@ void cpu_init_f (volatile immap_t * immr) reg |= CONFIG_SYS_SCCR; immr->im_clkrst.car_sccr = reg; + /* BUG MPC866 GLL2 consideration */ + reg = immr->im_clkrst.car_sccr; + /* probably we use the mode 1:2:1 */ + if ((reg & 0x00060000) == 0x00020000) { + reg &= ~0x00060000; + immr->im_clkrst.car_sccr = reg; + reg |= 0x00020000; + immr->im_clkrst.car_sccr = reg; + } + /* PLL (CPU clock) settings (15-30) */ immr->im_clkrstk.cark_plprcrk = KAPWR_KEY;