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

Commit e96a0309 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

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



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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 5a2f5501

arch/arm/mach-dove/common.c

+2 −3
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ void __init dove_i2c_init(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)
@@ -196,8 +196,7 @@ static int get_tclk(void) 


static void __init dove_timer_init(void)

{

	orion_time_init((unsigned long) BRIDGE_VIRT_BASE,

			BRIDGE_INT_TIMER1_CLR,

	orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,

			IRQ_DOVE_BRIDGE, get_tclk());

}

arch/arm/mach-kirkwood/common.c

+2 −3
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ void __init kirkwood_wdt_init(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
@@ -543,8 +543,7 @@ static void __init kirkwood_timer_init(void) 
{

	kirkwood_tclk = kirkwood_find_tclk();



	orion_time_init((unsigned long) BRIDGE_VIRT_BASE,

			BRIDGE_INT_TIMER1_CLR,

	orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,

			IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);

}

arch/arm/mach-mv78xx0/common.c

+2 −3
Original line number Diff line number Diff line
@@ -338,13 +338,12 @@ void __init mv78xx0_uart3_init(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)

{

	orion_time_init((unsigned long) BRIDGE_VIRT_BASE,

			BRIDGE_INT_TIMER1_CLR,

	orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,

			IRQ_MV78XX0_TIMER_1, get_tclk());

}

arch/arm/mach-orion5x/common.c

+2 −3
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ void __init orion5x_wdt_init(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;
@@ -224,8 +224,7 @@ static void __init orion5x_timer_init(void) 
{

	orion5x_tclk = orion5x_find_tclk();



	orion_time_init((unsigned long) ORION5X_BRIDGE_VIRT_BASE,

			BRIDGE_INT_TIMER1_CLR,

	orion_time_init(ORION5X_BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,

			IRQ_ORION5X_BRIDGE, orion5x_tclk);

}

arch/arm/plat-orion/include/plat/time.h

+2 −2
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 
#ifndef __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);