From mboxrd@z Thu Jan 1 00:00:00 1970 From: linux@arm.linux.org.uk (Russell King - ARM Linux) Date: Sun, 25 Mar 2012 08:47:44 +0100 Subject: [PATCH v2] ARM: pxa: use common IOMEM definition In-Reply-To: <1332423761-27205-1-git-send-email-robherring2@gmail.com> References: <1332296149-28110-2-git-send-email-robherring2@gmail.com> <1332423761-27205-1-git-send-email-robherring2@gmail.com> Message-ID: <20120325074744.GB5611@n2100.arm.linux.org.uk> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org What's happening about this and your other patch for PXA? PXA is currently broken in arm-soc, and has been for the past week. See http://www.arm.linux.org.uk/developer/build/ On Thu, Mar 22, 2012 at 08:42:41AM -0500, Rob Herring wrote: > From: Rob Herring > > 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: Paul Gortmaker > Signed-off-by: Rob Herring > Cc: Eric Miao > Cc: Russell King > Cc: Haojian Zhuang > Cc: Alessandro Zummo > Cc: Jaroslav Kysela > Cc: Takashi Iwai > Cc: rtc-linux at googlegroups.com > Cc: alsa-devel at alsa-project.org > --- > v2: > - fix my commit msg typos > - add fix for sa1100_wdt.c > > I plan to send this fix thru the arm-soc tree. > > Rob > > arch/arm/mach-pxa/clock-pxa2xx.c | 1 + > arch/arm/mach-pxa/corgi_pm.c | 1 + > arch/arm/mach-pxa/cpufreq-pxa3xx.c | 1 + > arch/arm/mach-pxa/include/mach/hardware.h | 2 -- > arch/arm/mach-pxa/mfp-pxa2xx.c | 1 + > arch/arm/mach-pxa/pxa2xx.c | 1 + > arch/arm/mach-pxa/pxa300.c | 1 + > arch/arm/mach-pxa/pxa320.c | 1 + > arch/arm/mach-pxa/sharpsl_pm.c | 1 + > drivers/rtc/rtc-sa1100.c | 1 + > drivers/watchdog/sa1100_wdt.c | 1 + > sound/arm/pxa2xx-ac97-lib.c | 1 + > sound/arm/pxa2xx-ac97.c | 1 + > sound/soc/pxa/pxa2xx-ac97.c | 1 + > 14 files changed, 13 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-pxa/clock-pxa2xx.c b/arch/arm/mach-pxa/clock-pxa2xx.c > index 1d5859d..9ee2ad6 100644 > --- a/arch/arm/mach-pxa/clock-pxa2xx.c > +++ b/arch/arm/mach-pxa/clock-pxa2xx.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > #include > > #include > diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c > index 39e265c..048c429 100644 > --- a/arch/arm/mach-pxa/corgi_pm.c > +++ b/arch/arm/mach-pxa/corgi_pm.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > > #include > #include > diff --git a/arch/arm/mach-pxa/cpufreq-pxa3xx.c b/arch/arm/mach-pxa/cpufreq-pxa3xx.c > index 88fbec0..b85b4ab 100644 > --- a/arch/arm/mach-pxa/cpufreq-pxa3xx.c > +++ b/arch/arm/mach-pxa/cpufreq-pxa3xx.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > > #include > > diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h > index 54b64ea..56d92e5 100644 > --- a/arch/arm/mach-pxa/include/mach/hardware.h > +++ b/arch/arm/mach-pxa/include/mach/hardware.h > @@ -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) > > diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c > index f147755..b029562 100644 > --- a/arch/arm/mach-pxa/mfp-pxa2xx.c > +++ b/arch/arm/mach-pxa/mfp-pxa2xx.c > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > #include > > #include > diff --git a/arch/arm/mach-pxa/pxa2xx.c b/arch/arm/mach-pxa/pxa2xx.c > index 8682704..f8ec854 100644 > --- a/arch/arm/mach-pxa/pxa2xx.c > +++ b/arch/arm/mach-pxa/pxa2xx.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > > #include > #include > diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c > index 40bb165..17cbc0c 100644 > --- a/arch/arm/mach-pxa/pxa300.c > +++ b/arch/arm/mach-pxa/pxa300.c > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > > #include > > diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c > index 8d614ec..6dc99d4 100644 > --- a/arch/arm/mach-pxa/pxa320.c > +++ b/arch/arm/mach-pxa/pxa320.c > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > > #include > > diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c > index 8d5168d..6d3b39f 100644 > --- a/arch/arm/mach-pxa/sharpsl_pm.c > +++ b/arch/arm/mach-pxa/sharpsl_pm.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > > #include > #include > diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c > index cb9a585..398ab7a 100644 > --- a/drivers/rtc/rtc-sa1100.c > +++ b/drivers/rtc/rtc-sa1100.c > @@ -30,6 +30,7 @@ > #include > #include > #include > +#include > > #include > #include > diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c > index 0162454..a3ff321 100644 > --- a/drivers/watchdog/sa1100_wdt.c > +++ b/drivers/watchdog/sa1100_wdt.c > @@ -25,6 +25,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c > index d1aa421..d760371 100644 > --- a/sound/arm/pxa2xx-ac97-lib.c > +++ b/sound/arm/pxa2xx-ac97-lib.c > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > > #include > #include > diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c > index 3a39626..afef72c 100644 > --- a/sound/arm/pxa2xx-ac97.c > +++ b/sound/arm/pxa2xx-ac97.c > @@ -11,6 +11,7 @@ > */ > > #include > +#include > #include > #include > > diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c > index 837ff34..b4bfd97 100644 > --- a/sound/soc/pxa/pxa2xx-ac97.c > +++ b/sound/soc/pxa/pxa2xx-ac97.c > @@ -11,6 +11,7 @@ > */ > > #include > +#include > #include > #include > > -- > 1.7.5.4 >