From patchwork Mon Apr 1 22:21:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 2373111 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 2BDEADFB7B for ; Mon, 1 Apr 2013 22:24:28 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UMn6h-0003PA-Bo; Mon, 01 Apr 2013 22:21:39 +0000 Received: from mail-qa0-f41.google.com ([209.85.216.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UMn6e-0003OC-9L for linux-arm-kernel@lists.infradead.org; Mon, 01 Apr 2013 22:21:37 +0000 Received: by mail-qa0-f41.google.com with SMTP id bs12so1120281qab.7 for ; Mon, 01 Apr 2013 15:21:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=24+eAng/q/vbDlT2XKhQ5fobXZ+NRiyqxifYY3KTPRY=; b=rUL5RZ3z55sjPGdkCXTP6dvNVSUrQTHuKPQP0XyW0V/gomzwLWQ5Us9WS7uRqRGW88 3WBFm8Qu9MdR++VFNkA3QwdrOaasxh6jas5/xYRQfgmbVZNOpHclg/pFiO5qqEv7bNXb LcrMMKKX4APUU5Xvvh3gKM9WI6f38EL05jh9N82czaClneuu8zVJeDDAfnFpNBTzc7cH BhhMlTtDrZN4aZ+jl0CNEJxuM4uPoCQL+Q90UYKycAqHiNeb05DmbEdi53DYgsGaY/nF nGLvQvZQ7OFe9mOeBOFxz6C2kw3hfL9usKe318chAVvUls1Rlj3ysmYwLCqLpSvwN18g hJhw== X-Received: by 10.224.39.80 with SMTP id f16mr12311107qae.11.1364854894450; Mon, 01 Apr 2013 15:21:34 -0700 (PDT) Received: from rob-laptop.calxeda.com ([173.226.190.126]) by mx.google.com with ESMTPS id eb7sm24361064qab.11.2013.04.01.15.21.33 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Apr 2013 15:21:33 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 01/13] ARM: make machine_desc->init_time default to clocksource_of_init Date: Mon, 1 Apr 2013 17:21:11 -0500 Message-Id: <1364854883-5961-2-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364854883-5961-1-git-send-email-robherring2@gmail.com> References: <1364854883-5961-1-git-send-email-robherring2@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130401_182136_355644_5F5C653E X-CRM114-Status: GOOD ( 12.42 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.216.41 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Mark Rutland , Russell King , Arnd Bergmann , Marc Zyngier , Linus Walleij , Rob Herring , arm@kernel.org, John Stultz , Thomas Gleixner X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Arnd Bergmann Originally from a default machine descriptor patch from Arnd, pull out just the default call to clocksource_of_init part. This is needed so that platforms can simply remove .init_time calls as they are converted to use clocksource_of_init. Signed-off-by: Arnd Bergmann Acked-by: Nicolas Pitre Acked-by: Olof Johansson Signed-off-by: Rob Herring --- arch/arm/kernel/time.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 955d92d..abff4e9 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -115,6 +116,10 @@ int __init register_persistent_clock(clock_access_fn read_boot, void __init time_init(void) { - machine_desc->init_time(); + if (machine_desc->init_time) + machine_desc->init_time(); + else + clocksource_of_init(); + sched_clock_postinit(); }