From patchwork Thu Feb 12 17:45:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 439303 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 50FAE140082 for ; Fri, 13 Feb 2015 04:49:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751511AbbBLRsm (ORCPT ); Thu, 12 Feb 2015 12:48:42 -0500 Received: from mail-wg0-f66.google.com ([74.125.82.66]:47982 "EHLO mail-wg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752003AbbBLRq2 (ORCPT ); Thu, 12 Feb 2015 12:46:28 -0500 Received: by mail-wg0-f66.google.com with SMTP id l18so3543864wgh.1; Thu, 12 Feb 2015 09:46:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=dUBO7CvPmIwtXFh5pjumHnPf6LvFlLATiaJvsW+bBBA=; b=y52kUgxPPHr47j2hlHIs1ggLKmqWes0HkuKaxrRueD9Tn9XvG1jZTSdeUt+zATRTA+ 2/Gcs1q3JJyVcKTqmRnfrL4L+Iw0hZ14aMeaWcn/xdMFoVicpUwBFV7tffiT4KHRgLDM qMaBCYaZAN/3I2Ct7A982WdttQbFJiRDw2h5bxrkupfEhxLzItrSkeBkOqY3+0b3RoRx n2zUIGTTylu2SQDL+hVR9W129YGlaqVK8zWzQDL3ovZr6TswvAJPG2zd24IWfB7OhkhT YsHiJfzN2xM2yBB1ZECjfRuPBbiPY9EJd2azRFE0ViV+vPTHGnnMaki/Ih4TCJa2WOMI 7hKw== X-Received: by 10.180.35.42 with SMTP id e10mr8513595wij.11.1423763185974; Thu, 12 Feb 2015 09:46:25 -0800 (PST) Received: from lmecul0520.st.com. (157.162.113.78.rev.sfr.net. [78.113.162.157]) by mx.google.com with ESMTPSA id ka1sm6614924wjc.2.2015.02.12.09.46.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Feb 2015 09:46:25 -0800 (PST) From: Maxime Coquelin To: Jonathan Corbet , Maxime Coquelin , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Philipp Zabel , Russell King , Daniel Lezcano , Thomas Gleixner , Linus Walleij , Greg Kroah-Hartman , Jiri Slaby , Arnd Bergmann , Andrew Morton , "David S. Miller" , Mauro Carvalho Chehab , Joe Perches , Antti Palosaari , Tejun Heo , Will Deacon , Nikolay Borisov , Rusty Russell , Kees Cook , Michal Marek , linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, linux-serial@vger.kernel.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org Subject: [PATCH 05/14] ARM: call reset_controller_of_init from default time_init handler Date: Thu, 12 Feb 2015 18:45:55 +0100 Message-Id: <1423763164-5606-6-git-send-email-mcoquelin.stm32@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1423763164-5606-1-git-send-email-mcoquelin.stm32@gmail.com> References: <1423763164-5606-1-git-send-email-mcoquelin.stm32@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Some DT ARM platforms need the reset controllers to be initialized before the timers. This is the case of the stm32 and sunxi platforms. This patch adds a call to reset_controller_of_init() to the default .init_time callback when RESET_CONTROLLER is used by the platform. Signed-off-by: Maxime Coquelin --- arch/arm/kernel/time.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 0cc7e58..4601b1e 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -117,6 +118,9 @@ void __init time_init(void) if (machine_desc->init_time) { machine_desc->init_time(); } else { +#ifdef CONFIG_RESET_CONTROLLER + reset_controller_of_init(); +#endif #ifdef CONFIG_COMMON_CLK of_clk_init(NULL); #endif