From mboxrd@z Thu Jan 1 00:00:00 1970 From: viresh.kumar@st.com (Viresh Kumar) Date: Mon, 12 Mar 2012 09:53:18 +0530 Subject: [PATCH 3/4] ARM: create a common IOMEM definition In-Reply-To: <1331500100-31351-4-git-send-email-robherring2@gmail.com> References: <1331500100-31351-1-git-send-email-robherring2@gmail.com> <1331500100-31351-4-git-send-email-robherring2@gmail.com> Message-ID: <4F5D7A36.8030601@st.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 3/12/2012 2:38 AM, Rob Herring wrote: > From: Rob Herring > > Several platforms create IOMEM defines for casting to 'void __iomem *', > and other platforms are incorrectly using __io() macro for the same > purpose. This creates a common definition and removes all the platform > specific versions. Rather than try to make linux/io.h and asm/io.h > assembly safe, the assembly version of IOMEM is moved into > asm/assembler.h. > > Signed-off-by: Rob Herring > Cc: Russell King > Cc: Sekhar Nori > Cc: Kevin Hilman > Cc: Hartley Sweeten > Cc: Ryan Mallon > Cc: Eric Miao > Cc: Haojian Zhuang > Cc: David Brown > Cc: Daniel Walker > Cc: Bryan Huntsman > Cc: Sascha Hauer > Cc: Shawn Guo > Cc: Tony Lindgren > Cc: Paul Walmsley > Cc: Viresh Kumar > Cc: Rajeev Kumar > Cc: Colin Cross > Cc: Olof Johansson > Cc: Stephen Warren > Cc: Linus Walleij > --- > arch/arm/include/asm/assembler.h | 2 ++ > arch/arm/include/asm/io.h | 2 ++ > arch/arm/kernel/debug.S | 1 + > arch/arm/kernel/entry-armv.S | 1 + > arch/arm/mach-davinci/include/mach/hardware.h | 6 ------ > arch/arm/mach-davinci/include/mach/uncompress.h | 2 ++ > arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 9 --------- > arch/arm/mach-mmp/include/mach/addr-map.h | 6 ------ > arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 6 ------ > arch/arm/mach-msm/include/mach/msm_iomap.h | 6 ------ > arch/arm/mach-mxs/include/mach/hardware.h | 6 ------ > arch/arm/mach-omap1/ams-delta-fiq-handler.S | 1 + > arch/arm/mach-omap1/iomap.h | 6 ------ > arch/arm/mach-omap2/clock3xxx_data.c | 1 + > arch/arm/mach-omap2/clock44xx_data.c | 1 + > arch/arm/mach-omap2/iomap.h | 6 ------ > arch/arm/mach-rpc/include/mach/hardware.h | 6 ------ > arch/arm/mach-spear3xx/clock.c | 1 + > arch/arm/mach-spear6xx/clock.c | 1 + > arch/arm/mach-tegra/include/mach/iomap.h | 6 ------ > arch/arm/mach-u300/include/mach/u300-regs.h | 6 ------ > arch/arm/plat-mxc/include/mach/hardware.h | 6 ------ > arch/arm/plat-omap/include/plat/hardware.h | 6 ------ > arch/arm/plat-omap/include/plat/usb.h | 1 - > arch/arm/plat-spear/include/plat/hardware.h | 6 ------ > 25 files changed, 13 insertions(+), 88 deletions(-) > [For SPEAr] Acked-by: Viresh Kumar -- viresh