redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

arm: plat-orion: use void __iomem pointers for time functions

Browse source 
The functions for time management now take void __iomem pointers, so
we remove the temporary "unsigned long" casts from the mach-*/common.c
files.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Thomas Petazzoni 2012-09-11 14:27:25 +02:00 committed by Jason Cooper
parent 5a2f550193
commit e96a0309f8
6 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/mach-dove/common.c
View file

@ -185,7 +185,7 @@ void __init dove_i2c_init(void)
****************************************************************************/ ****************************************************************************/
void __init dove_init_early(void) void __init dove_init_early(void)
{ {
orion_time_set_base((unsigned long) TIMER_VIRT_BASE); orion_time_set_base(TIMER_VIRT_BASE);
} }
static int get_tclk(void) static int get_tclk(void)
@ -196,8 +196,7 @@ static int get_tclk(void)
static void __init dove_timer_init(void) static void __init dove_timer_init(void)
{ {
orion_time_init((unsigned long) BRIDGE_VIRT_BASE, orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
BRIDGE_INT_TIMER1_CLR,
IRQ_DOVE_BRIDGE, get_tclk()); IRQ_DOVE_BRIDGE, get_tclk());
} }

5
arch/arm/mach-kirkwood/common.c
View file

@ -514,7 +514,7 @@ void __init kirkwood_wdt_init(void)
****************************************************************************/ ****************************************************************************/
void __init kirkwood_init_early(void) void __init kirkwood_init_early(void)
{ {
orion_time_set_base((unsigned long) TIMER_VIRT_BASE); orion_time_set_base(TIMER_VIRT_BASE);
/* /*
* Some Kirkwood devices allocate their coherent buffers from atomic * Some Kirkwood devices allocate their coherent buffers from atomic
@ -543,8 +543,7 @@ static void __init kirkwood_timer_init(void)
{ {
kirkwood_tclk = kirkwood_find_tclk(); kirkwood_tclk = kirkwood_find_tclk();
orion_time_init((unsigned long) BRIDGE_VIRT_BASE, orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
BRIDGE_INT_TIMER1_CLR,
IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk); IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);
} }

5
arch/arm/mach-mv78xx0/common.c
View file

@ -338,13 +338,12 @@ void __init mv78xx0_uart3_init(void)
****************************************************************************/ ****************************************************************************/
void __init mv78xx0_init_early(void) void __init mv78xx0_init_early(void)
{ {
orion_time_set_base((unsigned long) TIMER_VIRT_BASE); orion_time_set_base(TIMER_VIRT_BASE);
} }
static void mv78xx0_timer_init(void) static void mv78xx0_timer_init(void)
{ {
orion_time_init((unsigned long) BRIDGE_VIRT_BASE, orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
BRIDGE_INT_TIMER1_CLR,
IRQ_MV78XX0_TIMER_1, get_tclk()); IRQ_MV78XX0_TIMER_1, get_tclk());
} }

5
arch/arm/mach-orion5x/common.c
View file

@ -203,7 +203,7 @@ void __init orion5x_wdt_init(void)
****************************************************************************/ ****************************************************************************/
void __init orion5x_init_early(void) void __init orion5x_init_early(void)
{ {
orion_time_set_base((unsigned long) TIMER_VIRT_BASE); orion_time_set_base(TIMER_VIRT_BASE);
} }
int orion5x_tclk; int orion5x_tclk;
@ -224,8 +224,7 @@ static void __init orion5x_timer_init(void)
{ {
orion5x_tclk = orion5x_find_tclk(); orion5x_tclk = orion5x_find_tclk();
orion_time_init((unsigned long) ORION5X_BRIDGE_VIRT_BASE, orion_time_init(ORION5X_BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
BRIDGE_INT_TIMER1_CLR,
IRQ_ORION5X_BRIDGE, orion5x_tclk); IRQ_ORION5X_BRIDGE, orion5x_tclk);
} }

4
arch/arm/plat-orion/include/plat/time.h
View file

@ -11,9 +11,9 @@
#ifndef __PLAT_TIME_H #ifndef __PLAT_TIME_H
#define __PLAT_TIME_H #define __PLAT_TIME_H
void orion_time_set_base(u32 timer_base); void orion_time_set_base(void __iomem *timer_base);
void orion_time_init(u32 bridge_base, u32 bridge_timer1_clr_mask, void orion_time_init(void __iomem *bridge_base, u32 bridge_timer1_clr_mask,
unsigned int irq, unsigned int tclk); unsigned int irq, unsigned int tclk);

8
arch/arm/plat-orion/time.c
View file

@ -180,13 +180,13 @@ static struct irqaction orion_timer_irq = {
}; };
void __init void __init
orion_time_set_base(u32 _timer_base) orion_time_set_base(void __iomem *_timer_base)
{ {
timer_base = (void __iomem *)_timer_base; timer_base = _timer_base;
} }
void __init void __init
orion_time_init(u32 _bridge_base, u32 _bridge_timer1_clr_mask, orion_time_init(void __iomem *_bridge_base, u32 _bridge_timer1_clr_mask,
unsigned int irq, unsigned int tclk) unsigned int irq, unsigned int tclk)
{ {
u32 u; u32 u;
@ -194,7 +194,7 @@ orion_time_init(u32 _bridge_base, u32 _bridge_timer1_clr_mask,
/* /*
* Set SoC-specific data. * Set SoC-specific data.
*/ */
bridge_base = (void __iomem *)_bridge_base; bridge_base = _bridge_base;
bridge_timer1_clr_mask = _bridge_timer1_clr_mask; bridge_timer1_clr_mask = _bridge_timer1_clr_mask;
ticks_per_jiffy = (tclk + HZ/2) / HZ; ticks_per_jiffy = (tclk + HZ/2) / HZ;