From patchwork Thu Nov 17 10:54:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5179 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 1F41423E0E for ; Thu, 17 Nov 2011 10:54:42 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id F35D6A185AD for ; Thu, 17 Nov 2011 10:54:41 +0000 (UTC) Received: by faaa26 with SMTP id a26so4716404faa.11 for ; Thu, 17 Nov 2011 02:54:41 -0800 (PST) Received: by 10.152.134.116 with SMTP id pj20mr23100125lab.5.1321527281671; Thu, 17 Nov 2011 02:54:41 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs128301lal; Thu, 17 Nov 2011 02:54:39 -0800 (PST) Received: by 10.42.161.70 with SMTP id s6mr41169558icx.40.1321527277235; Thu, 17 Nov 2011 02:54:37 -0800 (PST) Received: from VA3EHSOBE007.bigfish.com (mail-va3.bigfish.com. [216.32.180.10]) by mx.google.com with ESMTPS id l2si2156539pbj.84.2011.11.17.02.54.36 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 17 Nov 2011 02:54:37 -0800 (PST) Received-SPF: neutral (google.com: 216.32.180.10 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=216.32.180.10; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.180.10 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail189-va3-R.bigfish.com (10.7.14.251) by VA3EHSOBE007.bigfish.com (10.7.40.11) with Microsoft SMTP Server id 14.1.225.22; Thu, 17 Nov 2011 10:54:02 +0000 Received: from mail189-va3 (localhost [127.0.0.1]) by mail189-va3-R.bigfish.com (Postfix) with ESMTP id 2B11D48055A; Thu, 17 Nov 2011 10:55:03 +0000 (UTC) X-SpamScore: 3 X-BigFish: VS3(zcb8kzzz1202hzz8275dhz2dh87h2a8h668h839h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail189-va3 (localhost.localdomain [127.0.0.1]) by mail189-va3 (MessageSwitch) id 1321527302963570_23306; Thu, 17 Nov 2011 10:55:02 +0000 (UTC) Received: from VA3EHSMHS023.bigfish.com (unknown [10.7.14.247]) by mail189-va3.bigfish.com (Postfix) with ESMTP id E43D31E0044; Thu, 17 Nov 2011 10:55:02 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS023.bigfish.com (10.7.99.33) with Microsoft SMTP Server (TLS) id 14.1.225.22; Thu, 17 Nov 2011 10:54:01 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server id 14.1.339.2; Thu, 17 Nov 2011 04:54:33 -0600 Received: from b20223-02.ap.freescale.net (b20223-02.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id pAHAsUpC006523; Thu, 17 Nov 2011 04:54:31 -0600 (CST) From: Richard Zhao To: CC: , , , , Richard Zhao Subject: [PATCH 1/1] ARM: imx6q: move clock register map to machine_desc.map_io Date: Thu, 17 Nov 2011 18:54:29 +0800 Message-ID: <1321527269-26784-1-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com map_io is the only place to call iotable_init. Signed-off-by: Richard Zhao --- arch/arm/mach-imx/clock-imx6q.c | 7 +++++-- arch/arm/mach-imx/mach-imx6q.c | 1 + arch/arm/plat-mxc/include/mach/common.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/clock-imx6q.c b/arch/arm/mach-imx/clock-imx6q.c index 613a1b9..d3b0a8e 100644 --- a/arch/arm/mach-imx/clock-imx6q.c +++ b/arch/arm/mach-imx/clock-imx6q.c @@ -1953,14 +1953,17 @@ static struct map_desc imx6q_clock_desc[] = { imx_map_entry(MX6Q, ANATOP, MT_DEVICE), }; +void __init imx_clock_map_io(void) +{ + iotable_init(imx6q_clock_desc, ARRAY_SIZE(imx6q_clock_desc)); +} + int __init mx6q_clocks_init(void) { struct device_node *np; void __iomem *base; int i, irq; - iotable_init(imx6q_clock_desc, ARRAY_SIZE(imx6q_clock_desc)); - /* retrieve the freqency of fixed clocks from device tree */ for_each_compatible_node(np, NULL, "fixed-clock") { u32 rate; diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 8bf5fa3..7f35a82 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -34,6 +34,7 @@ static void __init imx6q_map_io(void) { imx_lluart_map_io(); imx_scu_map_io(); + imx_clock_map_io(); } static void __init imx6q_gpio_add_irq_domain(struct device_node *np, diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h index 83b745a..f27ae54 100644 --- a/arch/arm/plat-mxc/include/mach/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h @@ -120,6 +120,7 @@ extern void imx_smp_prepare(void); static inline void imx_scu_map_io(void) {} static inline void imx_smp_prepare(void) {} #endif +void imx_clock_map_io(void); extern void imx_enable_cpu(int cpu, bool enable); extern void imx_set_cpu_jump(int cpu, void *jump_addr); extern void imx_src_init(void);