Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752041Ab3IZGM7 (ORCPT ); Thu, 26 Sep 2013 02:12:59 -0400 Received: from mail-ea0-f176.google.com ([209.85.215.176]:47292 "EHLO mail-ea0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750805Ab3IZGM6 (ORCPT ); Thu, 26 Sep 2013 02:12:58 -0400 Message-ID: <5243D05C.2010509@gmail.com> Date: Thu, 26 Sep 2013 08:12:44 +0200 From: Sebastian Hesselbarth User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 To: Sebastian Hesselbarth , Sebastian Hesselbarth CC: Olof Johansson , Arnd Bergmann , Dinh Nguyen , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 05/26] ARM: socfgpa: prepare for arch-wide .init_time callback References: <1379526839-14798-1-git-send-email-sebastian.hesselbarth@gmail.com> <1379526839-14798-6-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1379526839-14798-6-git-send-email-sebastian.hesselbarth@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2368 Lines: 73 On 09/18/2013 07:53 PM, Sebastian Hesselbarth wrote: > Current socfpga board init calls of_clk_init() from .machine_init. To > allow consolidation of DT driven .time_init, move of_clock_init() to > a temporary .time_init that will be removed when arch-wide callback is > available. > > Signed-off-by: Sebastian Hesselbarth Ping, Dinh can you please comment on this and patch 21/26? Thanks! > --- > Cc: Olof Johansson > Cc: Arnd Bergmann > Cc: Dinh Nguyen > Cc: Russell King > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > arch/arm/mach-socfpga/socfpga.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c > index bfce964..6df7bb9 100644 > --- a/arch/arm/mach-socfpga/socfpga.c > +++ b/arch/arm/mach-socfpga/socfpga.c > @@ -15,6 +15,7 @@ > * along with this program. If not, see . > */ > #include > +#include > #include > #include > #include > @@ -90,6 +91,12 @@ static void __init socfpga_init_irq(void) > socfpga_sysmgr_init(); > } > > +static void __init socfpga_init_time(void) > +{ > + of_clk_init(NULL); > + clocksource_of_init(); > +} > + > static void socfpga_cyclone5_restart(enum reboot_mode mode, const char *cmd) > { > u32 temp; > @@ -107,7 +114,6 @@ static void __init socfpga_cyclone5_init(void) > { > l2x0_of_init(0, ~0UL); > of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); > - of_clk_init(NULL); > socfpga_init_clocks(); > } > > @@ -120,6 +126,7 @@ DT_MACHINE_START(SOCFPGA, "Altera SOCFPGA") > .smp = smp_ops(socfpga_smp_ops), > .map_io = socfpga_map_io, > .init_irq = socfpga_init_irq, > + .init_time = socfpga_init_time, > .init_machine = socfpga_cyclone5_init, > .restart = socfpga_cyclone5_restart, > .dt_compat = altera_dt_match, > -- 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/