Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a38b1f60 authored by Robert Jarzmik's avatar Robert Jarzmik Committed by Daniel Lezcano
Browse files

ARM: pxa: Add non device-tree timer link to clocksource 



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: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 6f6caeaa

arch/arm/mach-pxa/generic.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -25,11 +25,13 @@ 
#include <asm/mach/map.h>

#include <asm/mach/map.h>

#include <asm/mach-types.h>

#include <asm/mach-types.h>





#include <mach/irqs.h>

#include <mach/reset.h>

#include <mach/reset.h>

#include <mach/smemc.h>

#include <mach/smemc.h>

#include <mach/pxa3xx-regs.h>

#include <mach/pxa3xx-regs.h>





#include "generic.h"

#include "generic.h"

#include <clocksource/pxa.h>





void clear_reset_status(unsigned int mask)

void clear_reset_status(unsigned int mask)

{

{
@@ -56,6 +58,15 @@ unsigned long get_clock_tick_rate(void) 
}

}

EXPORT_SYMBOL(get_clock_tick_rate);

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.

 * Get the clock frequency as reflected by CCCR and the turbo flag.

 * We assume these values have been applied via a fcs.

 * We assume these values have been applied via a fcs.

include/clocksource/pxa.h

0 → 100644
+18 −0
Original line number Original line Diff line number Diff line 
/*

 * PXA clocksource, clockevents, and OST interrupt handlers.

 *

 * Copyright (C) 2014 Robert Jarzmik

 *

 * This program is free software; you can redistribute it and/or modify

 * 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