From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] ARM: pxa: use common IOMEM definition
Date: Sun, 25 Mar 2012 08:47:44 +0100 [thread overview]
Message-ID: <20120325074744.GB5611@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1332423761-27205-1-git-send-email-robherring2@gmail.com>
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 <rob.herring@calxeda.com>
>
> 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 <paul.gortmaker@windriver.com>
> Signed-off-by: Rob 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 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 <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>
> 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 <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>
> 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 <linux/init.h>
> #include <linux/cpufreq.h>
> #include <linux/slab.h>
> +#include <linux/io.h>
>
> #include <mach/pxa3xx-regs.h>
>
> 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 <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>
> 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 <linux/module.h>
> #include <linux/kernel.h>
> #include <linux/device.h>
> +#include <linux/io.h>
>
> #include <mach/hardware.h>
> #include <mach/pxa2xx-regs.h>
> 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 <linux/module.h>
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
> +#include <linux/io.h>
>
> #include <mach/pxa300.h>
>
> 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 <linux/module.h>
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
> +#include <linux/io.h>
>
> #include <mach/pxa320.h>
>
> 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 <linux/leds.h>
> #include <linux/suspend.h>
> #include <linux/gpio.h>
> +#include <linux/io.h>
>
> #include <asm/mach-types.h>
> #include <mach/pm.h>
> 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 <linux/string.h>
> #include <linux/pm.h>
> #include <linux/bitops.h>
> +#include <linux/io.h>
>
> #include <mach/hardware.h>
> #include <asm/irq.h>
> 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 <linux/miscdevice.h>
> #include <linux/watchdog.h>
> #include <linux/init.h>
> +#include <linux/io.h>
> #include <linux/bitops.h>
> #include <linux/uaccess.h>
> #include <linux/timex.h>
> 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 <linux/clk.h>
> #include <linux/delay.h>
> #include <linux/module.h>
> +#include <linux/io.h>
>
> #include <sound/ac97_codec.h>
> #include <sound/pxa2xx-lib.h>
> 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 <linux/init.h>
> +#include <linux/io.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
>
> 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 <linux/init.h>
> +#include <linux/io.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
>
> --
> 1.7.5.4
>
next prev parent reply other threads:[~2012-03-25 7:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-20 18:34 linux-next: "ARM: make mach/io.h include optional" commit breaks cm_x2xx_defconfig Paul Gortmaker
2012-03-20 21:33 ` Rob Herring
2012-03-21 2:15 ` [PATCH 1/2] ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol Rob Herring
2012-03-21 2:15 ` [PATCH 2/2] ARM: pxa: use commom IOMEM definiton Rob Herring
2012-03-21 2:33 ` Nicolas Pitre
2012-03-22 13:42 ` [PATCH v2] ARM: pxa: use common IOMEM definition Rob Herring
2012-03-25 7:47 ` Russell King - ARM Linux [this message]
2012-03-21 2:30 ` [PATCH 1/2] ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol Nicolas Pitre
2012-03-21 8:15 ` Haojian Zhuang
2012-03-21 20:13 ` Rob Herring
2012-03-21 22:17 ` Haojian Zhuang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120325074744.GB5611@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).