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

Commit fbeeea53 authored by Ryan Mallon's avatar Ryan Mallon Committed by Russell King
Browse files

[ARM] 5607/1: ep93xx: Use __iomem pointer on syscon write function 



Change the reg argument of the ep93xx_syscon_swlocked_write function
to be an __iomem pointer. Fixes a number of build warnings.

Signed-off-by: default avatarRyan Mallon <ryan@bluewatersys.com>
Acked-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 595c050d

arch/arm/mach-ep93xx/core.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ void __init ep93xx_init_irq(void) 
 */

static DEFINE_SPINLOCK(syscon_swlock);



void ep93xx_syscon_swlocked_write(unsigned int val, unsigned int reg)

void ep93xx_syscon_swlocked_write(unsigned int val, void __iomem *reg)

{

	unsigned long flags;

arch/arm/mach-ep93xx/include/mach/platform.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ void ep93xx_init_irq(void); 
void ep93xx_init_time(unsigned long);



/* EP93xx System Controller software locked register write */

void ep93xx_syscon_swlocked_write(unsigned int val, unsigned int reg);

void ep93xx_syscon_swlocked_write(unsigned int val, void __iomem *reg);

void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits);



static inline void ep93xx_devcfg_set_bits(unsigned int bits)