From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Lezcano Subject: Re: [PATCH 1/2] ARM: ux500: decomission the non-DT MTU init sequence Date: Tue, 19 Nov 2013 23:40:50 +0100 Message-ID: <528BE8F2.3030507@linaro.org> References: <1384896471-9384-1-git-send-email-linus.walleij@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1384896471-9384-1-git-send-email-linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Linus Walleij , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Lee Jones Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Thomas Gleixner List-Id: devicetree@vger.kernel.org On 11/19/2013 10:27 PM, Linus Walleij wrote: > The MTU is now only initialized using the native clocksource > device tree matching. > > Signed-off-by: Linus Walleij > --- > arch/arm/mach-ux500/timer.c | 28 ++-------------------------- > 1 file changed, 2 insertions(+), 26 deletions(-) > > diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.= c > index ca60bbd9361b..1a9051b6f932 100644 > --- a/arch/arm/mach-ux500/timer.c > +++ b/arch/arm/mach-ux500/timer.c > @@ -10,7 +10,6 @@ > #include > #include > #include > -#include > > #include > > @@ -44,17 +43,14 @@ const static struct of_device_id prcmu_timer_of_m= atch[] __initconst =3D { > > void __init ux500_timer_init(void) > { > - void __iomem *mtu_timer_base; > void __iomem *prcmu_timer_base; > void __iomem *tmp_base; > struct device_node *np; > > - if (cpu_is_u8500_family() || cpu_is_ux540_family()) { > - mtu_timer_base =3D __io_address(U8500_MTU0_BASE); > + if (cpu_is_u8500_family() || cpu_is_ux540_family()) > prcmu_timer_base =3D __io_address(U8500_PRCMU_TIMER_4_BASE); > - } else { > + else > ux500_unknown_soc(); > - } > > np =3D of_find_matching_node(NULL, prcmu_timer_of_match); > if (!np) > @@ -67,26 +63,6 @@ void __init ux500_timer_init(void) > prcmu_timer_base =3D tmp_base; > > dt_fail: > - /* Doing it the old fashioned way. */ > - > - /* > - * Here we register the timerblocks active in the system. > - * Localtimers (twd) is started when both cpu is up and running. > - * MTU register a clocksource, clockevent and sched_clock. > - * Since the MTU is located in the VAPE power domain > - * it will be cleared in sleep which makes it unsuitable. > - * We however need it as a timer tick (clockevent) > - * during boot to calibrate delay until twd is started. > - * RTC-RTT have problems as timer tick during boot since it is > - * depending on delay which is not yet calibrated. RTC-RTT is in th= e > - * always-on powerdomain and is used as clockevent instead of twd w= hen > - * sleeping. > - * The PRCMU timer 4 register a clocksource and > - * sched_clock with higher rating then MTU since is always-on. > - * > - */ > - if (!of_have_populated_dt()) > - nmdk_timer_init(mtu_timer_base, IRQ_MTU0); If no timer have been defined in the dt [or wrongly defined], is there = a=20 message to tell the user what is wrong ? > clksrc_dbx500_prcmu_init(prcmu_timer_base); > ux500_twd_init(); > } > --=20 Linaro.org =E2=94=82 Open source software fo= r ARM SoCs =46ollow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe devicetree" i= n the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html