From patchwork Fri Nov 16 21:20:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 199754 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 6B1472C0090 for ; Sat, 17 Nov 2012 08:32:34 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 265BC4A1E4; Fri, 16 Nov 2012 22:32:18 +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 xWWMc8BSUGpM; Fri, 16 Nov 2012 22:32:17 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EB6A84A1E7; Fri, 16 Nov 2012 22:30:19 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A95494A1E7 for ; Fri, 16 Nov 2012 22:29:13 +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 AHbNjEWoZzpI for ; Fri, 16 Nov 2012 22:29:13 +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-ye0-f202.google.com (mail-ye0-f202.google.com [209.85.213.202]) by theia.denx.de (Postfix) with ESMTPS id 6F8934A19D for ; Fri, 16 Nov 2012 22:28:52 +0100 (CET) Received: by mail-ye0-f202.google.com with SMTP id r11so352402yen.3 for ; Fri, 16 Nov 2012 13:28:51 -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=vINjlCHgVdwxdr1yRuSd0HV8LbQmLS0FjYm+yFOcOpg=; b=fasVCCz3Gtd+8ozsehwq8/tKpTem2Pk8seT4jS9gB9OfXSOTXyVWdx5QYbiO6LTu8Z UDcfYiBs9CcbHhWtSVpkvi96Ghd2H3ZpFPXReC+NFxQLa1Uq4WFKCL1jTAJGUcX81mpk dib5ysuvSqYqzqQEhq9+M/u9aiKHQWV6r1S8xIqeax22c+4F1wsGu1OqXJFtW5egya21 py5wEX3VSG8ZoYalWQZ10cxR4YggfRZV+xWB07EhiFqUH7FtqAuA1SqViTC7oWd9IPoD LbKnNNzwHYg4XGqFgF6+qPj5tg66lqXnlE57grksL27PgQEhiageL7Z6ThD7Vt8FLF5i oTiw== Received: by 10.236.144.200 with SMTP id n48mr3845156yhj.1.1353101331241; Fri, 16 Nov 2012 13:28:51 -0800 (PST) Received: from wpzn3.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id r10si113525ann.1.2012.11.16.13.28.51 (version=TLSv1/SSLv3 cipher=AES128-SHA); Fri, 16 Nov 2012 13:28:51 -0800 (PST) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by wpzn3.hot.corp.google.com (Postfix) with ESMTP id 12529100048; Fri, 16 Nov 2012 13:28:51 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id E54F01604D2; Fri, 16 Nov 2012 13:28:50 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Fri, 16 Nov 2012 13:20:23 -0800 Message-Id: <1353100842-20126-39-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1353100842-20126-1-git-send-email-sjg@chromium.org> References: <1353100842-20126-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQkxeF6Mqx4VJ+o1+4iGhqOAAaYtiURNhL6EFAOkprYxEu0CJRE97b1McrZVCBs/4i8+KMqliqwgU/N+/kcmaEenGXpUtBDVol7Bw3xmKrRYxEA/Gqhu9GzkSk6IaEjPbrlYFJjguaScxXhgZhJBkaXjdgCZ9uuwmYWgIkF7XW/IZF64dJ7ZCd75tQjvvZp5GMTCYSyz Cc: Tom Rini , Shinya Kuribayashi Subject: [U-Boot] [PATCH 38/57] mips: Move per_clk and dev_clk 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 these field into arch_global_data and tidy up. The other CONFIG_JZSOC fields are used by various architectures, so just remove the #ifdef bracketing for these. Signed-off-by: Simon Glass --- arch/mips/include/asm/global_data.h | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h index 99949e1..fdd099e 100644 --- a/arch/mips/include/asm/global_data.h +++ b/arch/mips/include/asm/global_data.h @@ -28,6 +28,11 @@ /* Architecture-specific global data */ struct arch_global_data { +#ifdef CONFIG_JZSOC + /* There are other clocks in the jz4740 */ + unsigned long per_clk; /* Peripheral bus clock */ + unsigned long dev_clk; /* Device clock */ +#endif }; /* @@ -41,13 +46,9 @@ struct arch_global_data { typedef struct global_data { bd_t *bd; unsigned long flags; -#ifdef CONFIG_JZSOC - /* There are other clocks in the jz4740 */ unsigned long cpu_clk; /* CPU core clock */ unsigned long sys_clk; /* System bus clock */ - unsigned long per_clk; /* Peripheral bus clock */ unsigned long mem_clk; /* Memory bus clock */ - unsigned long dev_clk; /* Device clock */ /* "static data" needed by most of timer.c */ unsigned long tbl; unsigned long lastinc;