Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751284Ab3HTMuP (ORCPT ); Tue, 20 Aug 2013 08:50:15 -0400 Received: from top.free-electrons.com ([176.31.233.9]:60854 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751004Ab3HTMuN (ORCPT ); Tue, 20 Aug 2013 08:50:13 -0400 Date: Tue, 20 Aug 2013 09:50:14 -0300 From: Ezequiel Garcia To: Sebastian Hesselbarth Cc: Russell King , Arnd Bergmann , Gregory Clement , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [RFC 08/17] ARM: mvebu: remove custom .init_time hook Message-ID: <20130820125012.GA4272@localhost> References: <1376964271-22715-1-git-send-email-sebastian.hesselbarth@gmail.com> <1376964271-22715-9-git-send-email-sebastian.hesselbarth@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1376964271-22715-9-git-send-email-sebastian.hesselbarth@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5450 Lines: 162 Hi Sebastian, I've only received a few patches of this series. I *think* using "RFC" alone is not correct in LAKML and for some reason you're required to use RFC/PATCH. Maybe that's why I'm getting only the patches where I'm Cced? Could you please re-send this? The series looks promising and I'd like to take a peep :-) BTW, some of this (but not all) has already been posted [1, 2] and is on its way to v3.12 through Daniel Lezcano. (Maybe you already noticed, but just in case...) [1] http://www.spinics.net/lists/arm-kernel/msg265509.html [2] http://comments.gmane.org/gmane.linux.ports.arm.kernel/260179 Regards, Ezequiel On Tue, Aug 20, 2013 at 04:04:22AM +0200, Sebastian Hesselbarth wrote: > With arch/arm calling of_clk_init(NULL) from time_init(), we can now > remove custom .init_time hooks. > > Signed-off-by: Sebastian Hesselbarth > --- > Notes: > - coherency, mbus, and cache init are moved to .init_machine hook > - time-armada-370-xp is converted to clocksource_of_init compatible init > > Cc: Russell King > Cc: Arnd Bergmann > Cc: Gregory Clement > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > arch/arm/mach-mvebu/armada-370-xp.c | 11 +---------- > drivers/clocksource/time-armada-370-xp.c | 7 +++---- > include/linux/time-armada-370-xp.h | 16 ---------------- > 3 files changed, 4 insertions(+), 30 deletions(-) > delete mode 100644 include/linux/time-armada-370-xp.h > > diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c > index 829b573..139f572 100644 > --- a/arch/arm/mach-mvebu/armada-370-xp.c > +++ b/arch/arm/mach-mvebu/armada-370-xp.c > @@ -14,11 +14,9 @@ > > #include > #include > -#include > #include > #include > #include > -#include > #include > #include > #include > @@ -34,19 +32,13 @@ static void __init armada_370_xp_map_io(void) > debug_ll_io_init(); > } > > -static void __init armada_370_xp_timer_and_clk_init(void) > +static void __init armada_370_xp_dt_init(void) > { > - of_clk_init(NULL); > - armada_370_xp_timer_init(); > coherency_init(); > BUG_ON(mvebu_mbus_dt_init()); > #ifdef CONFIG_CACHE_L2X0 > l2x0_of_init(0, ~0UL); > #endif > -} > - > -static void __init armada_370_xp_dt_init(void) > -{ > of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); > } > > @@ -59,7 +51,6 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") > .smp = smp_ops(armada_xp_smp_ops), > .init_machine = armada_370_xp_dt_init, > .map_io = armada_370_xp_map_io, > - .init_time = armada_370_xp_timer_and_clk_init, > .restart = mvebu_restart, > .dt_compat = armada_370_xp_dt_compat, > MACHINE_END > diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c > index 847cab6..67904cf 100644 > --- a/drivers/clocksource/time-armada-370-xp.c > +++ b/drivers/clocksource/time-armada-370-xp.c > @@ -30,7 +30,6 @@ > #include > #include > #include > -#include > > /* > * Timer block registers. > @@ -217,13 +216,11 @@ static struct notifier_block armada_370_xp_timer_cpu_nb = { > .notifier_call = armada_370_xp_timer_cpu_notify, > }; > > -void __init armada_370_xp_timer_init(void) > +void __init armada_370_xp_timer_init(struct device_node *np) > { > u32 u; > - struct device_node *np; > int res; > > - np = of_find_compatible_node(NULL, NULL, "marvell,armada-370-xp-timer"); > timer_base = of_iomap(np, 0); > WARN_ON(!timer_base); > local_base = of_iomap(np, 1); > @@ -293,3 +290,5 @@ void __init armada_370_xp_timer_init(void) > if (!res) > armada_370_xp_timer_setup(this_cpu_ptr(armada_370_xp_evt)); > } > +CLOCKSOURCE_OF_DECLARE(armada_370_xp_timer, "marvell,armada-370-xp-timer", > + armada_370_xp_timer_init); > diff --git a/include/linux/time-armada-370-xp.h b/include/linux/time-armada-370-xp.h > deleted file mode 100644 > index 6fb0856..0000000 > --- a/include/linux/time-armada-370-xp.h > +++ /dev/null > @@ -1,16 +0,0 @@ > -/* > - * Marvell Armada 370/XP SoC timer handling. > - * > - * Copyright (C) 2012 Marvell > - * > - * Lior Amsalem > - * Gregory CLEMENT > - * Thomas Petazzoni > - * > - */ > -#ifndef __TIME_ARMADA_370_XPPRCMU_H > -#define __TIME_ARMADA_370_XPPRCMU_H > - > -void armada_370_xp_timer_init(void); > - > -#endif > -- > 1.7.10.4 > > -- > 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/ -- Ezequiel García, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com -- 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/