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

Commit 23019a73 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: pxa: use common IOMEM definition 



pxa was missed in the moving of IOMEM to a common definition, so lots of
IOMEM redefined warnings were introduced. So remove pxa IOMEM definition
and fix all the fallout.

Reported-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: rtc-linux@googlegroups.com
Cc: alsa-devel@alsa-project.org
parent 58af4a24

arch/arm/mach-pxa/clock-pxa2xx.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/syscore_ops.h>



#include <mach/pxa2xx-regs.h>

arch/arm/mach-pxa/corgi_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/apm-emulation.h>

#include <linux/io.h>



#include <asm/irq.h>

#include <asm/mach-types.h>

arch/arm/mach-pxa/cpufreq-pxa3xx.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/init.h>

#include <linux/cpufreq.h>

#include <linux/slab.h>

#include <linux/io.h>



#include <mach/pxa3xx-regs.h>

arch/arm/mach-pxa/include/mach/hardware.h

+0 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#define io_p2v(x) IOMEM(0xf2000000 + ((x) & 0x01ffffff) + (((x) & 0x1c000000) >> 1))



#ifndef __ASSEMBLY__

# define IOMEM(x) ((void __iomem *)(x))

# define __REG(x)	(*((volatile u32 __iomem *)io_p2v(x)))



/* With indexed regs we don't want to feed the index through io_p2v()
@@ -52,7 +51,6 @@ 


#else



# define IOMEM(x)	x 

# define __REG(x)	io_p2v(x)

# define __PREG(x)	io_v2p(x)

arch/arm/mach-pxa/mfp-pxa2xx.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/syscore_ops.h>



#include <mach/pxa2xx-regs.h>