From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Lezcano Subject: Re: [PATCH v3 4/4] arm: pxa: add non device-tree timer link to clocksource Date: Mon, 21 Jul 2014 16:37:24 +0200 Message-ID: <53CD25A4.7030606@linaro.org> References: <1405356724-32207-1-git-send-email-robert.jarzmik@free.fr> <1405356724-32207-4-git-send-email-robert.jarzmik@free.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1405356724-32207-4-git-send-email-robert.jarzmik-GANU6spQydw@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Robert Jarzmik , Haojian Zhuang Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Thomas Gleixner List-Id: devicetree@vger.kernel.org On 07/14/2014 06:52 PM, Robert Jarzmik wrote: > As clocksource pxa_timer was moved to clocksource framework, the > pxa_timer initialization needs to be a bit amended, to pass the > necessary informations to clocksource, ie : > - the timer interrupt (mach specific) > - the timer registers base (ditto) > - the timer clockrate > > Signed-off-by: Robert Jarzmik > > --- > Since V2: Arnd's comment : moved extern declaration into .h file > --- Shall I take the patches 4-5 also ? Arnd ? Thanks -- Daniel > arch/arm/mach-pxa/generic.c | 11 +++++++++++ > include/clocksource/pxa.h | 18 ++++++++++++++++++ > 2 files changed, 29 insertions(+) > create mode 100644 include/clocksource/pxa.h > > diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.= c > index 4225417..6f38e1a 100644 > --- a/arch/arm/mach-pxa/generic.c > +++ b/arch/arm/mach-pxa/generic.c > @@ -25,11 +25,13 @@ > #include > #include > > +#include > #include > #include > #include > > #include "generic.h" > +#include > > void clear_reset_status(unsigned int mask) > { > @@ -57,6 +59,15 @@ unsigned long get_clock_tick_rate(void) > EXPORT_SYMBOL(get_clock_tick_rate); > > /* > + * For non device-tree builds, keep legacy timer init > + */ > +void pxa_timer_init(void) > +{ > + pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x40a00000), > + get_clock_tick_rate()); > +} > + > +/* > * Get the clock frequency as reflected by CCCR and the turbo flag. > * We assume these values have been applied via a fcs. > * If info is not 0 we also display the current settings. > diff --git a/include/clocksource/pxa.h b/include/clocksource/pxa.h > new file mode 100644 > index 0000000..1efbe5a > --- /dev/null > +++ b/include/clocksource/pxa.h > @@ -0,0 +1,18 @@ > +/* > + * PXA clocksource, clockevents, and OST interrupt handlers. > + * > + * Copyright (C) 2014 Robert Jarzmik > + * > + * This program is free software; you can redistribute it and/or mod= ify > + * it under the terms of the GNU General Public License as published= by > + * the Free Software Foundation; version 2 of the License. > + * > + */ > + > +#ifndef _CLOCKSOURCE_PXA_H > +#define _CLOCKSOURCE_PXA_H > + > +extern void pxa_timer_nodt_init(int irq, void __iomem *base, > + unsigned long clock_tick_rate); > + > +#endif > --=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