From patchwork Fri Dec 14 06:49:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 206335 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id E140C2C008E for ; Fri, 14 Dec 2012 18:00:51 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9AF8C4A210; Fri, 14 Dec 2012 08:00:20 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z6zl2A+JyaHW; Fri, 14 Dec 2012 08:00:20 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DAE054A212; Fri, 14 Dec 2012 07:55:32 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D0B6F4A146 for ; Fri, 14 Dec 2012 07:53:28 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kTS+JyiTxXRi for ; Fri, 14 Dec 2012 07:53:26 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-gg0-f202.google.com (mail-gg0-f202.google.com [209.85.161.202]) by theia.denx.de (Postfix) with ESMTPS id C5C9B4A116 for ; Fri, 14 Dec 2012 07:50:23 +0100 (CET) Received: by mail-gg0-f202.google.com with SMTP id k1so309973ggn.3 for ; Thu, 13 Dec 2012 22:50:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=zulvYOwcPyhSJ36GdJLPUv3jBmOUq0Hl5Rjb2t7NRLE=; b=nWGdIcVyjM7J81/G94ZvBeWDlLJf1Ef3VPPkpST9CT1EUDn9b/1hEgQPSFw7rGIjp4 5XbCvhw5aosq0RLnBo2BmkN1kK2lnqFDDr6LQMc76381ZguAABtYlGYR4LWAmymyIzdC OY4Xdc8CebENs4VO7qUW4fLCUPkmjSxDVVrLcmQam83ToeFeVjq5AQbbA/fCForS4oKv 1rLv64TJzcBNg6T6uFS7JRYb/BFZtPvzVQI7vywKV/zYCdE6bF5ZpSjyRSAYMcE4IoKh v7di/UnDxJRDLqMXCJ877LNQ60w/XFU2TafK63tbVBTVtDDqZnT1uBb/ZqvZr4f2u/Ce zX4A== Received: by 10.236.150.97 with SMTP id y61mr2289625yhj.25.1355467821737; Thu, 13 Dec 2012 22:50:21 -0800 (PST) Received: from wpzn4.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id l20si348690yhi.2.2012.12.13.22.50.21 (version=TLSv1/SSLv3 cipher=AES128-SHA); Thu, 13 Dec 2012 22:50:21 -0800 (PST) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by wpzn4.hot.corp.google.com (Postfix) with ESMTP id 9FA6282004A; Thu, 13 Dec 2012 22:50:21 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id 808F2160878; Thu, 13 Dec 2012 22:50:21 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 13 Dec 2012 22:49:00 -0800 Message-Id: <1355467767-29575-32-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1355467767-29575-1-git-send-email-sjg@chromium.org> References: <1355467767-29575-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQmB3zlo9SydW7ktwOEBkBSzChQEwxXa1tOHcVYIcTvanSPNjXSQKiHPZQ38Ki161ZLWJ48pd1IlEwqb1twq+t2LB2hP6UNtiUP96Ha9ByzFPjMPKWmkuUGR7TrQTPLRqFVJG1FrQNnX8mUIk/AFbNju18BzTBebEes9628LbfoiePBd+942PBXElr8gD0JdKQZPXpmp Cc: Kim Phillips , Kumar Gala , Andy Fleming , Tom Rini , Stefan Roese Subject: [U-Boot] [PATCH v2 31/58] ppc: Move mirror_hack to arch_global_data X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass --- Changes in v2: None arch/powerpc/include/asm/global_data.h | 6 +++--- board/evb64260/mpsc.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index 2d7be45..b9037c4 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -119,6 +119,9 @@ struct arch_global_data { #if defined(CONFIG_4xx) u32 uart_clk; #endif /* CONFIG_4xx */ +#if defined(CONFIG_SYS_GT_6426x) + unsigned int mirror_hack[16]; +#endif }; /* @@ -148,9 +151,6 @@ typedef struct global_data { #ifdef CONFIG_PRE_CONSOLE_BUFFER unsigned long precon_buf_idx; /* Pre-Console buffer index */ #endif -#if defined(CONFIG_SYS_GT_6426x) - unsigned int mirror_hack[16]; -#endif #if defined(CONFIG_A3000) || \ defined(CONFIG_HIDDEN_DRAGON) || \ defined(CONFIG_MUSENKI) || \ diff --git a/board/evb64260/mpsc.c b/board/evb64260/mpsc.c index f3dc20b..9c211ac 100644 --- a/board/evb64260/mpsc.c +++ b/board/evb64260/mpsc.c @@ -88,7 +88,7 @@ static void galsdma_enable_rx(void); /* GT64240A errata: cant read MPSC/BRG registers... so make mirrors in ram for read/modify write */ -#define MIRROR_HACK ((struct _tag_mirror_hack *)&(gd->mirror_hack[0])) +#define MIRROR_HACK ((struct _tag_mirror_hack *)&(gd->arch.mirror_hack[0])) #define GT_REG_WRITE_MIRROR_G(a,d) {MIRROR_HACK->a ## _M = d; GT_REG_WRITE(a,d);} #define GTREGREAD_MIRROR_G(a) (MIRROR_HACK->a ## _M)