Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752420AbbBLRsn (ORCPT ); Thu, 12 Feb 2015 12:48:43 -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 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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1274 Lines: 42 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 -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/