introduce io.h

To allow for some generic io accessors introduce io.h and use
this instead of asm/io.h throughout the tree.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

arch/arm/boards/a9m2410/a9m2410.c

@@ -31,7 +31,7 @@
 #include <generated/mach-types.h>
 #include <partition.h>
 #include <nand.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/s3c24x0-iomap.h>
 #include <mach/s3c24x0-nand.h>
 

arch/arm/boards/a9m2440/a9m2410dev.c

@@ -27,7 +27,7 @@
 #include <common.h>
 #include <driver.h>
 #include <init.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/s3c24x0-iomap.h>
 
 /**

arch/arm/boards/a9m2440/a9m2440.c

@@ -31,7 +31,7 @@
 #include <generated/mach-types.h>
 #include <partition.h>
 #include <nand.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/s3c24x0-iomap.h>
 #include <mach/s3c24x0-nand.h>
 #include <mach/s3c24xx-generic.h>

arch/arm/boards/at91rm9200ek/init.c

@@ -27,7 +27,7 @@
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/hardware.h>
 #include <mach/at91_pmc.h>
 #include <mach/board.h>

arch/arm/boards/at91sam9260ek/init.c

@@ -28,7 +28,7 @@
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>

arch/arm/boards/at91sam9261ek/init.c

@@ -27,7 +27,7 @@
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>

arch/arm/boards/at91sam9263ek/init.c

@@ -29,7 +29,7 @@
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>

arch/arm/boards/at91sam9m10g45ek/init.c

@@ -30,7 +30,7 @@
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>

arch/arm/boards/chumby_falconwing/falconwing.c

@@ -25,7 +25,7 @@
 #include <sizes.h>
 #include <usb/ehci.h>
 #include <asm/armlinux.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/mmu.h>
 #include <generated/mach-types.h>
 #include <mach/imx-regs.h>

arch/arm/boards/edb93xx/edb93xx.c

@@ -27,7 +27,7 @@
 #include <init.h>
 #include <partition.h>
 #include <asm/armlinux.h>
-#include <asm/io.h>
+#include <io.h>
 #include <generated/mach-types.h>
 #include <mach/ep93xx-regs.h>
 #include "edb93xx.h"

arch/arm/boards/edb93xx/flash_cfg.c

@@ -24,7 +24,7 @@
 
 #include <common.h>
 #include <mach/ep93xx-regs.h>
-#include <asm/io.h>
+#include <io.h>
 
 #define SMC_BCR6_VALUE	(2 << SMC_BCR_IDCY_SHIFT | 5 << SMC_BCR_WST1_SHIFT | \
 				SMC_BCR_BLE | 2 << SMC_BCR_WST2_SHIFT | \

arch/arm/boards/edb93xx/pll_cfg.c

@@ -25,7 +25,7 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include "pll_cfg.h"
 #include "early_udelay.h"
 

arch/arm/boards/edb93xx/sdram_cfg.c

@@ -23,7 +23,7 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include "sdram_cfg.h"
 #include "early_udelay.h"
 

arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c

@@ -29,7 +29,7 @@
 #include <mach/imx-regs.h>
 #include <asm/armlinux.h>
 #include <mach/gpio.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/mmu.h>
 #include <led.h>
 

arch/arm/boards/eukrea_cpuimx25/lowlevel.c

@@ -26,7 +26,7 @@
 #include <mach/imx-regs.h>
 #include <mach/imx-pll.h>
 #include <mach/esdctl.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-nand.h>
 #include <asm/barebox-arm.h>
 #include <asm-generic/memory_layout.h>

arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c

@@ -37,7 +37,7 @@
 #include <fcntl.h>
 #include <nand.h>
 #include <command.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-nand.h>
 #include <mach/imx-pll.h>
 #include <mach/imxfb.h>

arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c

@@ -39,7 +39,7 @@
 #include <partition.h>
 
 #include <asm/armlinux.h>
-#include <asm/io.h>
+#include <io.h>
 #include <generated/mach-types.h>
 #include <asm/mmu.h>
 

arch/arm/boards/eukrea_cpuimx35/lowlevel.c

@@ -26,7 +26,7 @@
 #include <mach/imx-pll.h>
 #include <mach/esdctl.h>
 #include <asm/cache-l2x0.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-nand.h>
 #include <asm/barebox-arm.h>
 #include <asm-generic/memory_layout.h>

arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c

@@ -34,7 +34,7 @@
 #include <nand.h>
 #include <spi/spi.h>
 #include <mfd/mc13892.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/mmu.h>
 #include <mach/imx-nand.h>
 #include <mach/spi.h>

arch/arm/boards/freescale-mx25-3-stack/3stack.c

@@ -28,7 +28,7 @@
 #include <mach/imx-regs.h>
 #include <asm/armlinux.h>
 #include <mach/gpio.h>
-#include <asm/io.h>
+#include <io.h>
 #include <partition.h>
 #include <generated/mach-types.h>
 #include <mach/imx-nand.h>

arch/arm/boards/freescale-mx35-3-stack/3stack.c

@@ -37,7 +37,7 @@
 #include <partition.h>
 
 #include <asm/armlinux.h>
-#include <asm/io.h>
+#include <io.h>
 #include <generated/mach-types.h>
 
 #include <mach/gpio.h>

arch/arm/boards/freescale-mx51-pdk/board.c

@@ -32,7 +32,7 @@
 #include <nand.h>
 #include <spi/spi.h>
 #include <mfd/mc13892.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/mmu.h>
 #include <mach/imx-nand.h>
 #include <mach/spi.h>

arch/arm/boards/freescale-mx53-loco/board.c

@@ -36,7 +36,7 @@
 #include <mach/iim.h>
 
 #include <asm/armlinux.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/mmu.h>
 
 static struct fec_platform_data fec_info = {

arch/arm/boards/guf-cupid/board.c

@@ -32,7 +32,7 @@
 #include <mach/imx-regs.h>
 #include <asm/armlinux.h>
 #include <mach/gpio.h>
-#include <asm/io.h>
+#include <io.h>
 #include <partition.h>
 #include <nand.h>
 #include <generated/mach-types.h>

arch/arm/boards/guf-cupid/lowlevel.c

@@ -26,7 +26,7 @@
 #include <mach/imx-pll.h>
 #include <mach/esdctl.h>
 #include <asm/cache-l2x0.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-nand.h>
 #include <asm/barebox-arm.h>
 #include <asm-generic/memory_layout.h>

arch/arm/boards/guf-neso/board.c

@@ -32,7 +32,7 @@
 #include <spi/spi.h>
 #include <usb/isp1504.h>
 
-#include <asm/io.h>
+#include <io.h>
 #include <asm/mmu.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>

arch/arm/boards/guf-neso/lowlevel.c

@@ -26,7 +26,7 @@
 #include <mach/imx-pll.h>
 #include <mach/esdctl.h>
 #include <asm/cache-l2x0.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-nand.h>
 #include <asm/barebox-arm.h>
 #include <asm/system.h>

arch/arm/boards/imx21ads/imx21ads.c

@@ -27,7 +27,7 @@
 #include <environment.h>
 #include <mach/imx-regs.h>
 #include <asm/armlinux.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/gpio.h>
 #include <partition.h>
 #include <fs.h>

arch/arm/boards/imx27ads/imx27ads.c

@@ -24,7 +24,7 @@
 #include <environment.h>
 #include <mach/imx-regs.h>
 #include <asm/armlinux.h>
-#include <asm/io.h>
+#include <io.h>
 #include <fec.h>
 #include <mach/gpio.h>
 #include <partition.h>

arch/arm/boards/karo-tx25/board.c

@@ -28,7 +28,7 @@
 #include <mach/imx-regs.h>
 #include <asm/armlinux.h>
 #include <mach/gpio.h>
-#include <asm/io.h>
+#include <io.h>
 #include <partition.h>
 #include <generated/mach-types.h>
 #include <mach/imx-nand.h>

arch/arm/boards/karo-tx25/lowlevel.c

@@ -24,7 +24,7 @@
 #include <init.h>
 #include <mach/imx-regs.h>
 #include <mach/esdctl.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-nand.h>
 #include <asm/barebox-arm.h>
 #include <asm/system.h>

arch/arm/boards/karo-tx28/tx28-stk5.c

@@ -21,7 +21,7 @@
 #include <fec.h>
 #include <sizes.h>
 #include <reloc.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/sections.h>
 #include <mach/imx-regs.h>
 #include <mach/clock.h>

arch/arm/boards/karo-tx28/tx28.c

@@ -18,7 +18,7 @@
 #include <environment.h>
 #include <errno.h>
 #include <asm/armlinux.h>
-#include <asm/io.h>
+#include <io.h>
 #include <generated/mach-types.h>
 #include <mach/imx-regs.h>
 #include <asm/mmu.h>

arch/arm/boards/mini2440/mini2440.c

@@ -36,7 +36,7 @@
 #include <mci.h>
 #include <fb.h>
 #include <asm/armlinux.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/gpio.h>
 #include <mach/s3c24x0-iomap.h>
 #include <mach/s3c24x0-nand.h>

arch/arm/boards/mmccpu/init.c

@@ -28,7 +28,7 @@
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>

arch/arm/boards/nhk8815/setup.c

@@ -26,7 +26,7 @@
 #include <nand.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
-#include <asm/io.h>
+#include <io.h>
 
 #include <mach/hardware.h>
 #include <mach/board.h>

arch/arm/boards/omap/board-beagle.c

@@ -57,7 +57,7 @@
 #include <init.h>
 #include <driver.h>
 #include <sizes.h>
-#include <asm/io.h>
+#include <io.h>
 #include <ns16550.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>

arch/arm/boards/omap/board-omap3evm.c

@@ -48,7 +48,7 @@
 #include <console.h>
 #include <init.h>
 #include <driver.h>
-#include <asm/io.h>
+#include <io.h>
 #include <ns16550.h>
 #include <asm/armlinux.h>
 #include <mach/silicon.h>

arch/arm/boards/omap/board-sdp343x.c

@@ -51,7 +51,7 @@
 #include <console.h>
 #include <init.h>
 #include <driver.h>
-#include <asm/io.h>
+#include <io.h>
 #include <ns16550.h>
 #include <asm/armlinux.h>
 #include <mach/silicon.h>

arch/arm/boards/panda/board.c

@@ -3,7 +3,7 @@
 #include <init.h>
 #include <fs.h>
 #include <driver.h>
-#include <asm/io.h>
+#include <io.h>
 #include <ns16550.h>
 #include <asm/armlinux.h>
 #include <linux/stat.h>

arch/arm/boards/panda/lowlevel.c

@@ -21,7 +21,7 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/omap4-mux.h>
 #include <mach/omap4-silicon.h>
 #include <mach/omap4-clock.h>

arch/arm/boards/panda/mux.c

@@ -1,6 +1,6 @@
 #include <common.h>
 #include <init.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/omap4-silicon.h>
 #include <mach/omap4-mux.h>
 

arch/arm/boards/pcm037/pcm037.c

@@ -32,7 +32,7 @@
 #include <mach/iomux-mx31.h>
 #include <asm/armlinux.h>
 #include <mach/gpio.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/mmu.h>
 #include <partition.h>
 #include <generated/mach-types.h>

arch/arm/boards/pcm038/lowlevel.c

@@ -25,7 +25,7 @@
 #include <mach/imx-regs.h>
 #include <mach/imx-pll.h>
 #include <mach/esdctl.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-nand.h>
 #include <asm/barebox-arm.h>
 #include <asm/system.h>

arch/arm/boards/pcm038/pcm038.c

@@ -35,7 +35,7 @@
 #include <nand.h>
 #include <command.h>
 #include <spi/spi.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-nand.h>
 #include <mach/imx-pll.h>
 #include <mach/imxfb.h>

arch/arm/boards/pcm043/lowlevel.c

@@ -26,7 +26,7 @@
 #include <mach/imx-pll.h>
 #include <mach/esdctl.h>
 #include <asm/cache-l2x0.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-nand.h>
 #include <asm/barebox-arm.h>
 #include <asm-generic/memory_layout.h>

arch/arm/boards/pcm043/pcm043.c

@@ -32,7 +32,7 @@
 #include <mach/imx-regs.h>
 #include <asm/armlinux.h>
 #include <mach/gpio.h>
-#include <asm/io.h>
+#include <io.h>
 #include <partition.h>
 #include <nand.h>
 #include <generated/mach-types.h>

arch/arm/boards/pcm049/board.c

@@ -22,7 +22,7 @@
 #include <console.h>
 #include <init.h>
 #include <driver.h>
-#include <asm/io.h>
+#include <io.h>
 #include <ns16550.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>

arch/arm/boards/pcm049/lowlevel.c

@@ -21,7 +21,7 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/omap4-mux.h>
 #include <mach/omap4-silicon.h>
 #include <mach/omap4-clock.h>

arch/arm/boards/pcm049/mux.c

@@ -1,6 +1,6 @@
 #include <common.h>
 #include <init.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/omap4-silicon.h>
 #include <mach/omap4-mux.h>
 

arch/arm/boards/phycard-i.MX27/pca100.c

@@ -32,7 +32,7 @@
 #include <fcntl.h>
 #include <nand.h>
 #include <spi/spi.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-nand.h>
 #include <mach/imx-pll.h>
 #include <gpio.h>

arch/arm/boards/pm9261/init.c

@@ -27,7 +27,7 @@
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>

arch/arm/boards/pm9263/init.c

@@ -28,7 +28,7 @@
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>

arch/arm/boards/pm9g45/init.c

@@ -29,7 +29,7 @@
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>

arch/arm/boards/scb9328/scb9328.c

@@ -26,7 +26,7 @@
 #include <mach/imx-regs.h>
 #include <asm/armlinux.h>
 #include <mach/gpio.h>
-#include <asm/io.h>
+#include <io.h>
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>

arch/arm/boards/usb-a926x/init.c

@@ -27,7 +27,7 @@
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/hardware.h>
 #include <nand.h>
 #include <sizes.h>

arch/arm/cpu/cache-l2x0.c

@@ -1,6 +1,6 @@
 #include <common.h>
 #include <init.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm/mmu.h>
 
 #define CACHE_LINE_SIZE		32

arch/arm/mach-at91/at91rm9200_time.c

@@ -37,7 +37,7 @@
 #include <mach/at91_st.h>
 #include <mach/at91_pmc.h>
 #include <mach/io.h>
-#include <asm/io.h>
+#include <io.h>
 
 /*
  * The ST_CRTR is updated asynchronously to the master clock ... but

arch/arm/mach-at91/at91sam926x_time.c

@@ -37,7 +37,7 @@
 #include <mach/at91_pmc.h>
 #include <mach/at91_rstc.h>
 #include <mach/io.h>
-#include <asm/io.h>
+#include <io.h>
 
 uint64_t at91sam9_clocksource_read(void)
 {

arch/arm/mach-at91/gpio.c

@@ -24,7 +24,7 @@
 #include <common.h>
 #include <linux/clk.h>
 #include <errno.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/gpio.h>
 #include <gpio.h>
 

arch/arm/mach-at91/include/mach/gpio.h

@@ -13,7 +13,7 @@
 #ifndef __ASM_ARCH_AT91_GPIO_H
 #define __ASM_ARCH_AT91_GPIO_H
 
-#include <asm/io.h>
+#include <io.h>
 #include <asm-generic/errno.h>
 #include <mach/at91_pio.h>
 #include <mach/hardware.h>

arch/arm/mach-at91/include/mach/io.h

@@ -21,7 +21,7 @@
 #ifndef __ASM_ARCH_IO_H
 #define __ASM_ARCH_IO_H
 
-#include <asm/io.h>
+#include <io.h>
 
 static inline unsigned int at91_sys_read(unsigned int reg_offset)
 {

arch/arm/mach-at91/sam9_smc.c

@@ -9,7 +9,7 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/hardware.h>
 #include <mach/io.h>
 

arch/arm/mach-ep93xx/clocksource.c

@@ -23,7 +23,7 @@
 #include <common.h>
 #include <init.h>
 #include <clock.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/ep93xx-regs.h>
 
 #define TIMER_CLKSEL		(1 << 3)

arch/arm/mach-ep93xx/gpio.c

@@ -20,7 +20,7 @@
 #include <common.h>
 #include <errno.h>
 #include <init.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/ep93xx-regs.h>
 
 #define EP93XX_GPIO_NUM_PORTS	8

arch/arm/mach-ep93xx/led.c

@@ -21,7 +21,7 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/ep93xx-regs.h>
 
 #define GREEN_LED_POS		0x01

arch/arm/mach-imx/boot.c

@@ -19,7 +19,7 @@
 #include <environment.h>
 #include <init.h>
 
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-regs.h>
 
 #if defined(CONFIG_ARCH_IMX25) || defined(CONFIG_ARCH_IMX35)

arch/arm/mach-imx/clocksource.c

@@ -35,7 +35,7 @@
 #include <notifier.h>
 #include <mach/imx-regs.h>
 #include <mach/clock.h>
-#include <asm/io.h>
+#include <io.h>
 
 #define GPT(x) __REG(IMX_TIM1_BASE + (x))
 #define timer_base (IMX_TIM1_BASE)

arch/arm/mach-imx/gpio.c

@@ -25,7 +25,7 @@
 
 #include <common.h>
 #include <errno.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-regs.h>
 #include <mach/gpio.h>
 

arch/arm/mach-imx/iim.c

@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #include <malloc.h>
 
-#include <asm/io.h>
+#include <io.h>
 
 #include <mach/iim.h>
 

arch/arm/mach-imx/imx25.c

@@ -19,7 +19,7 @@
 #include <init.h>
 #include <mach/imx-regs.h>
 #include <mach/iim.h>
-#include <asm/io.h>
+#include <io.h>
 #include <sizes.h>
 
 #include "gpio.h"

arch/arm/mach-imx/imx35.c

@@ -18,7 +18,7 @@
 #include <common.h>
 #include <sizes.h>
 #include <init.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-regs.h>
 #include <mach/iim.h>
 #include <mach/generic.h>

arch/arm/mach-imx/imx51.c

@@ -19,7 +19,7 @@
 #include <common.h>
 #include <sizes.h>
 #include <environment.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx51-regs.h>
 
 #include "gpio.h"

arch/arm/mach-imx/imx53.c

@@ -17,7 +17,7 @@
 
 #include <init.h>
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <sizes.h>
 #include <mach/imx53-regs.h>
 

arch/arm/mach-imx/internal-nand-boot.c

@@ -17,7 +17,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <asm/io.h>
+#include <io.h>
 #include <linux/mtd/nand.h>
 #include <mach/imx-nand.h>
 #include <mach/generic.h>

arch/arm/mach-imx/iomux-v2.c

@@ -18,7 +18,7 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-regs.h>
 #include <mach/iomux-mx31.h>
 

arch/arm/mach-imx/iomux-v3.c

@@ -19,7 +19,7 @@
  * MA 02110-1301, USA.
  */
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/iomux-v3.h>
 #include <mach/imx-regs.h>
 

arch/arm/mach-imx/nand.c

@@ -17,7 +17,7 @@
 
 #include <common.h>
 #include <mach/imx-regs.h>
-#include <asm/io.h>
+#include <io.h>
 
 #if defined(CONFIG_ARCH_IMX35) || defined (CONFIG_ARCH_IMX25)
 

arch/arm/mach-imx/speed-imx25.c

@@ -1,6 +1,6 @@
 #include <common.h>
 #include <mach/imx-regs.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/clock.h>
 #include <init.h>
 

arch/arm/mach-imx/speed-imx31.c

@@ -16,7 +16,7 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-regs.h>
 #include <mach/clock.h>
 #include <init.h>

arch/arm/mach-imx/speed-imx35.c

@@ -17,7 +17,7 @@
 
 #include <common.h>
 #include <mach/imx-regs.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/clock.h>
 #include <mach/generic.h>
 #include <init.h>

arch/arm/mach-imx/speed-imx51.c

@@ -1,5 +1,5 @@
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm-generic/div64.h>
 #include <mach/imx51-regs.h>
 #include <mach/clock-imx51_53.h>

arch/arm/mach-imx/speed-imx53.c

@@ -1,5 +1,5 @@
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <asm-generic/div64.h>
 #include <mach/imx-regs.h>
 #include "mach/clock-imx51_53.h"

arch/arm/mach-mxs/clocksource-imx23.c

@@ -23,7 +23,7 @@
 #include <notifier.h>
 #include <mach/imx-regs.h>
 #include <mach/clock.h>
-#include <asm/io.h>
+#include <io.h>
 
 #define TIMROTCTRL 0x00
 #define TIMCTRL1 0x40

arch/arm/mach-mxs/clocksource-imx28.c

@@ -18,7 +18,7 @@
 #include <notifier.h>
 #include <mach/imx-regs.h>
 #include <mach/clock.h>
-#include <asm/io.h>
+#include <io.h>
 
 #define TIMROTCTRL 0x00
 # define TIMROTCTRL_SFTRST

arch/arm/mach-mxs/imx_lcd_clk.c

@@ -16,7 +16,7 @@
 #include <init.h>
 #include <mach/imx-regs.h>
 #include <mach/clock.h>
-#include <asm/io.h>
+#include <io.h>
 
 #ifdef CONFIG_ARCH_IMX23
 

arch/arm/mach-mxs/iomux-imx.c

@@ -21,7 +21,7 @@
 #include <init.h>
 #include <gpio.h>
 #include <errno.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-regs.h>
 
 #define HW_PINCTRL_CTRL 0x000

arch/arm/mach-mxs/reset-imx.c

@@ -21,7 +21,7 @@
 #include <init.h>
 #include <notifier.h>
 #include <mach/imx-regs.h>
-#include <asm/io.h>
+#include <io.h>
 
 #define HW_RTC_CTRL     0x000
 # define BM_RTC_CTRL_WATCHDOGEN (1 << 4)

arch/arm/mach-mxs/speed-imx23.c

@@ -24,7 +24,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-regs.h>
 #include <mach/generic.h>
 #include <mach/clock.h>

arch/arm/mach-mxs/speed-imx28.c

@@ -18,7 +18,7 @@
  */
 #include <common.h>
 #include <init.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-regs.h>
 #include <mach/generic.h>
 #include <mach/clock.h>

arch/arm/mach-mxs/usb.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/imx-regs.h>
 
 #define POWER_CTRL			(IMX_POWER_BASE + 0x0)

arch/arm/mach-nomadik/reset.c

@@ -18,7 +18,7 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/hardware.h>
 
 void __noreturn reset_cpu(unsigned long addr)

arch/arm/mach-nomadik/timer.c

@@ -11,7 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <clock.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/hardware.h>
 #include <mach/mtu.h>
 #include <mach/timex.h>

arch/arm/mach-omap/devices-gpmc-nand.c

@@ -31,7 +31,7 @@
 #include <init.h>
 #include <driver.h>
 #include <clock.h>
-#include <asm/io.h>
+#include <io.h>
 
 #include <mach/silicon.h>
 #include <mach/gpmc.h>

arch/arm/mach-omap/gpio.c

@@ -37,7 +37,7 @@
  */
 #include <common.h>
 #include <mach/gpio.h>
-#include <asm/io.h>
+#include <io.h>
 #include <errno.h>
 
 #ifdef CONFIG_ARCH_OMAP3

arch/arm/mach-omap/gpmc.c

@@ -29,7 +29,7 @@
  */
 #include <common.h>
 #include <init.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/silicon.h>
 #include <mach/gpmc.h>
 #include <mach/sys_info.h>

arch/arm/mach-omap/include/mach/syslib.h

@@ -30,7 +30,7 @@
  */
 #ifndef __ASM_ARCH_OMAP_SYSLIB_H_
 #define __ASM_ARCH_OMAP_SYSLIB_H_
-#include <asm/io.h>
+#include <io.h>
 
 /** System Independent functions */
 

arch/arm/mach-omap/omap3_clock.c

@@ -39,7 +39,7 @@
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/silicon.h>
 #include <mach/clocks.h>
 #include <mach/timers.h>

arch/arm/mach-omap/omap3_generic.c

@@ -36,7 +36,7 @@
  */
 #include <common.h>
 #include <init.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/silicon.h>
 #include <mach/gpmc.h>
 #include <mach/sdrc.h>

arch/arm/mach-omap/omap4_clock.c

@@ -1,6 +1,6 @@
 #include <common.h>
 #include <mach/syslib.h>
-#include <asm/io.h>
+#include <io.h>
 #include <mach/omap4-clock.h>
 
 #define LDELAY	12000000