From patchwork Sun Oct 19 06:11:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 400741 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 941B514008E for ; Sun, 19 Oct 2014 17:14:36 +1100 (AEDT) Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by lists.ozlabs.org (Postfix) with ESMTP id 8268A1A1B5B for ; Sun, 19 Oct 2014 17:14:36 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pd0-x236.google.com (mail-pd0-x236.google.com [IPv6:2607:f8b0:400e:c02::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 760C81A1956 for ; Sun, 19 Oct 2014 17:12:49 +1100 (AEDT) Received: by mail-pd0-f182.google.com with SMTP id y10so3057456pdj.13 for ; Sat, 18 Oct 2014 23:12:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3XRehSfxBtRMX8IqWGLA34eL6lOU77GI5uB0MQX6Hz4=; b=UffbRVvZjribyNtZSO84E6NifjqjBlsnVS2x0goan1qZoCcoWxHAWpcL48ZxGd+IaB aH0c0/TjKEZ389crjzViFNcvi9nVF0KxTJxQOd3mqymQEowPuL+pKV3VDmfew2Xmqj7O 8HUTJPD5fh5wErYuNIJski2c30gUnF0GgMmr9GYXyjaP4771eir8aLDssEsriZLz4dBV Tzwi8FeRJLTc9lqyQNtpgyDs+sal3SMo3PzDKXQgecqmp5jVZi4PLY13+wm+AtgJ48so ZN2f+IJHuZ6QkqukQKaRzM3vJ9FM2R8VPy1vvFevsvGUpB+cPHOut2ddytISaruKw1nE Tz+g== X-Received: by 10.70.95.199 with SMTP id dm7mr19296295pdb.95.1413699167300; Sat, 18 Oct 2014 23:12:47 -0700 (PDT) Received: from pek-khao-d1.corp.ad.wrs.com ([106.120.101.38]) by mx.google.com with ESMTPSA id iv9sm5669224pbc.53.2014.10.18.23.12.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Oct 2014 23:12:46 -0700 (PDT) From: Kevin Hao To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 2/3] powerpc: call of_clk_init() from time_init() Date: Sun, 19 Oct 2014 14:11:38 +0800 Message-Id: <1413699099-25743-3-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1413699099-25743-1-git-send-email-haokexin@gmail.com> References: <1413699099-25743-1-git-send-email-haokexin@gmail.com> Cc: Scott Wood , Gerhard Sittig , Mike Turquette , Jingchang Lu X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" So the boards which has COMMON_CLK enabled don't have to invoke this in its board specific file. Signed-off-by: Kevin Hao --- A new patch in v2. arch/powerpc/kernel/time.c | 5 +++++ arch/powerpc/platforms/512x/clock-commonclk.c | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 7505599c2593..8d3893e7564c 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -943,6 +944,10 @@ void __init time_init(void) init_decrementer_clockevent(); tick_setup_hrtimer_broadcast(); + +#ifdef CONFIG_COMMON_CLK + of_clk_init(NULL); +#endif } diff --git a/arch/powerpc/platforms/512x/clock-commonclk.c b/arch/powerpc/platforms/512x/clock-commonclk.c index 6eb614a271fb..f691bcabd710 100644 --- a/arch/powerpc/platforms/512x/clock-commonclk.c +++ b/arch/powerpc/platforms/512x/clock-commonclk.c @@ -1168,6 +1168,11 @@ static void mpc5121_clk_provide_backwards_compat(void) } } +/* + * The "fixed-clock" nodes (which includes the oscillator node if the board's + * DT provides one) has already been scanned by the of_clk_init() in + * time_init(). + */ int __init mpc5121_clk_init(void) { struct device_node *clk_np; @@ -1187,12 +1192,6 @@ int __init mpc5121_clk_init(void) mpc512x_clk_preset_data(); /* - * have the device tree scanned for "fixed-clock" nodes (which - * includes the oscillator node if the board's DT provides one) - */ - of_clk_init(NULL); - - /* * add a dummy clock for those situations where a clock spec is * required yet no real clock is involved */