Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755569Ab3H2QrX (ORCPT ); Thu, 29 Aug 2013 12:47:23 -0400 Received: from eu1sys200aog120.obsmtp.com ([207.126.144.149]:37154 "EHLO eu1sys200aog120.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754018Ab3H2QrX (ORCPT ); Thu, 29 Aug 2013 12:47:23 -0400 Message-ID: <521F76DE.6080709@st.com> Date: Thu, 29 Aug 2013 17:29:18 +0100 From: Srinivas KANDAGATLA Reply-To: srinivas.kandagatla@st.com Organization: STMicroelectronics User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: Sebastian Hesselbarth Cc: Russell King , kernel@stlinux.com, Arnd Bergmann , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [STLinux Kernel] [PATCH RFC v2 12/16] ARM: sti: remove custom .init_time hook References: <1376964271-22715-1-git-send-email-sebastian.hesselbarth@gmail.com> <1377638890-371-13-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1377638890-371-13-git-send-email-sebastian.hesselbarth@gmail.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2211 Lines: 67 On 27/08/13 22:28, Sebastian Hesselbarth wrote: > With arch/arm calling of_clk_init(NULL) from time_init(), we can now > remove custom .init_time hooks. To get rid of it, move l2cc init to > .init_machine hook instead. > > Signed-off-by: Sebastian Hesselbarth Acked-by: Srinivas Kandagatla > --- > Cc: Srinivas Kandagatla > Cc: Stuart Menefy > Cc: Russell King > Cc: Arnd Bergmann > Cc: kernel@stlinux.com > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > arch/arm/mach-sti/board-dt.c | 10 ++++------ > 1 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mach-sti/board-dt.c b/arch/arm/mach-sti/board-dt.c > index 8fe6f0c..1217fb5 100644 > --- a/arch/arm/mach-sti/board-dt.c > +++ b/arch/arm/mach-sti/board-dt.c > @@ -7,9 +7,8 @@ > * published by the Free Software Foundation. > */ > > -#include > -#include > #include > +#include > #include > #include > > @@ -28,11 +27,10 @@ void __init stih41x_l2x0_init(void) > l2x0_of_init(aux_ctrl, L2X0_AUX_CTRL_MASK); > } > > -static void __init stih41x_timer_init(void) > +static void __init stih41x_machine_init(void) > { > - of_clk_init(NULL); > - clocksource_of_init(); > stih41x_l2x0_init(); > + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); > } > > static const char *stih41x_dt_match[] __initdata = { > @@ -42,7 +40,7 @@ static const char *stih41x_dt_match[] __initdata = { > }; > > DT_MACHINE_START(STM, "STiH415/416 SoC with Flattened Device Tree") > - .init_time = stih41x_timer_init, > + .init_machine = stih41x_machine_init, > .smp = smp_ops(sti_smp_ops), > .dt_compat = stih41x_dt_match, > MACHINE_END > -- 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/