diff options
180 files changed, 185 insertions, 179 deletions
diff --git a/arch/arm/boards/a9m2410/a9m2410.c b/arch/arm/boards/a9m2410/a9m2410.c index 44ac44bcbc..bbe16044ef 100644 --- a/arch/arm/boards/a9m2410/a9m2410.c +++ b/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> diff --git a/arch/arm/boards/a9m2440/a9m2410dev.c b/arch/arm/boards/a9m2440/a9m2410dev.c index 1220bd9777..5f7c53b9f6 100644 --- a/arch/arm/boards/a9m2440/a9m2410dev.c +++ b/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> /** diff --git a/arch/arm/boards/a9m2440/a9m2440.c b/arch/arm/boards/a9m2440/a9m2440.c index 89c9cdf57e..964d376412 100644 --- a/arch/arm/boards/a9m2440/a9m2440.c +++ b/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> diff --git a/arch/arm/boards/at91rm9200ek/init.c b/arch/arm/boards/at91rm9200ek/init.c index cff7ede4d3..b2008a4394 100644 --- a/arch/arm/boards/at91rm9200ek/init.c +++ b/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> diff --git a/arch/arm/boards/at91sam9260ek/init.c b/arch/arm/boards/at91sam9260ek/init.c index 8fab557d79..ea80a1b039 100644 --- a/arch/arm/boards/at91sam9260ek/init.c +++ b/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> diff --git a/arch/arm/boards/at91sam9261ek/init.c b/arch/arm/boards/at91sam9261ek/init.c index 69111a0099..0bef84d132 100644 --- a/arch/arm/boards/at91sam9261ek/init.c +++ b/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> diff --git a/arch/arm/boards/at91sam9263ek/init.c b/arch/arm/boards/at91sam9263ek/init.c index 278e312c6d..40c0b7b6f2 100644 --- a/arch/arm/boards/at91sam9263ek/init.c +++ b/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> diff --git a/arch/arm/boards/at91sam9m10g45ek/init.c b/arch/arm/boards/at91sam9m10g45ek/init.c index ba7c2fff48..073ff42374 100644 --- a/arch/arm/boards/at91sam9m10g45ek/init.c +++ b/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> diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c index 1c66eb231a..38f28be9c5 100644 --- a/arch/arm/boards/chumby_falconwing/falconwing.c +++ b/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> diff --git a/arch/arm/boards/edb93xx/edb93xx.c b/arch/arm/boards/edb93xx/edb93xx.c index 3e4e0b04a0..70fd12c1bf 100644 --- a/arch/arm/boards/edb93xx/edb93xx.c +++ b/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" diff --git a/arch/arm/boards/edb93xx/flash_cfg.c b/arch/arm/boards/edb93xx/flash_cfg.c index 91a6a4ea96..56bf0b57c2 100644 --- a/arch/arm/boards/edb93xx/flash_cfg.c +++ b/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 | \ diff --git a/arch/arm/boards/edb93xx/pll_cfg.c b/arch/arm/boards/edb93xx/pll_cfg.c index a687af0a01..a53efa69c1 100644 --- a/arch/arm/boards/edb93xx/pll_cfg.c +++ b/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" diff --git a/arch/arm/boards/edb93xx/sdram_cfg.c b/arch/arm/boards/edb93xx/sdram_cfg.c index 3d4fe08e19..8342d446b3 100644 --- a/arch/arm/boards/edb93xx/sdram_cfg.c +++ b/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" diff --git a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c index 1c54202dfa..6355e3c205 100644 --- a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c +++ b/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> diff --git a/arch/arm/boards/eukrea_cpuimx25/lowlevel.c b/arch/arm/boards/eukrea_cpuimx25/lowlevel.c index 4ebf247776..12219737c0 100644 --- a/arch/arm/boards/eukrea_cpuimx25/lowlevel.c +++ b/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> diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c index a5aadac0d9..994f45629b 100644 --- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c +++ b/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> diff --git a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c index 426445f59d..5f654d47c1 100644 --- a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c +++ b/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> diff --git a/arch/arm/boards/eukrea_cpuimx35/lowlevel.c b/arch/arm/boards/eukrea_cpuimx35/lowlevel.c index 6c0e106f67..a909a8784e 100644 --- a/arch/arm/boards/eukrea_cpuimx35/lowlevel.c +++ b/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> diff --git a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c index 727db29241..a128d500ad 100644 --- a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c +++ b/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> diff --git a/arch/arm/boards/freescale-mx25-3-stack/3stack.c b/arch/arm/boards/freescale-mx25-3-stack/3stack.c index 979115d927..5aa54e43ff 100644 --- a/arch/arm/boards/freescale-mx25-3-stack/3stack.c +++ b/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> diff --git a/arch/arm/boards/freescale-mx35-3-stack/3stack.c b/arch/arm/boards/freescale-mx35-3-stack/3stack.c index ab702650ab..030a1a7acf 100644 --- a/arch/arm/boards/freescale-mx35-3-stack/3stack.c +++ b/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> diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-pdk/board.c index 646f807c7a..d56effaaf9 100644 --- a/arch/arm/boards/freescale-mx51-pdk/board.c +++ b/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> diff --git a/arch/arm/boards/freescale-mx53-loco/board.c b/arch/arm/boards/freescale-mx53-loco/board.c index b5240f4f3a..24df9ae0b0 100644 --- a/arch/arm/boards/freescale-mx53-loco/board.c +++ b/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 = { diff --git a/arch/arm/boards/guf-cupid/board.c b/arch/arm/boards/guf-cupid/board.c index 706707d0bb..158adfcda4 100644 --- a/arch/arm/boards/guf-cupid/board.c +++ b/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> diff --git a/arch/arm/boards/guf-cupid/lowlevel.c b/arch/arm/boards/guf-cupid/lowlevel.c index 8d403ee821..396604d59f 100644 --- a/arch/arm/boards/guf-cupid/lowlevel.c +++ b/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> diff --git a/arch/arm/boards/guf-neso/board.c b/arch/arm/boards/guf-neso/board.c index 446b333f1f..e524b70aac 100644 --- a/arch/arm/boards/guf-neso/board.c +++ b/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> diff --git a/arch/arm/boards/guf-neso/lowlevel.c b/arch/arm/boards/guf-neso/lowlevel.c index d366d440af..b1ad621e06 100644 --- a/arch/arm/boards/guf-neso/lowlevel.c +++ b/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> diff --git a/arch/arm/boards/imx21ads/imx21ads.c b/arch/arm/boards/imx21ads/imx21ads.c index d58831e748..fc34709630 100644 --- a/arch/arm/boards/imx21ads/imx21ads.c +++ b/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> diff --git a/arch/arm/boards/imx27ads/imx27ads.c b/arch/arm/boards/imx27ads/imx27ads.c index da4260fa58..e93f07a078 100644 --- a/arch/arm/boards/imx27ads/imx27ads.c +++ b/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> diff --git a/arch/arm/boards/karo-tx25/board.c b/arch/arm/boards/karo-tx25/board.c index 22bc27a291..1eece1dfed 100644 --- a/arch/arm/boards/karo-tx25/board.c +++ b/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> diff --git a/arch/arm/boards/karo-tx25/lowlevel.c b/arch/arm/boards/karo-tx25/lowlevel.c index 868ba08dd7..09c0339659 100644 --- a/arch/arm/boards/karo-tx25/lowlevel.c +++ b/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> diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c index 8427dc2391..645aa7b463 100644 --- a/arch/arm/boards/karo-tx28/tx28-stk5.c +++ b/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> diff --git a/arch/arm/boards/karo-tx28/tx28.c b/arch/arm/boards/karo-tx28/tx28.c index def388a8d9..a62cb8257f 100644 --- a/arch/arm/boards/karo-tx28/tx28.c +++ b/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> diff --git a/arch/arm/boards/mini2440/mini2440.c b/arch/arm/boards/mini2440/mini2440.c index fd1f2f27c3..43510238e0 100644 --- a/arch/arm/boards/mini2440/mini2440.c +++ b/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> diff --git a/arch/arm/boards/mmccpu/init.c b/arch/arm/boards/mmccpu/init.c index 36bc193bfc..51dbf24621 100644 --- a/arch/arm/boards/mmccpu/init.c +++ b/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> diff --git a/arch/arm/boards/nhk8815/setup.c b/arch/arm/boards/nhk8815/setup.c index dcf716620d..42d981cbfd 100644 --- a/arch/arm/boards/nhk8815/setup.c +++ b/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> diff --git a/arch/arm/boards/omap/board-beagle.c b/arch/arm/boards/omap/board-beagle.c index 49af40cf75..e63d7b7240 100644 --- a/arch/arm/boards/omap/board-beagle.c +++ b/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> diff --git a/arch/arm/boards/omap/board-omap3evm.c b/arch/arm/boards/omap/board-omap3evm.c index a2532d5c02..bbf0d8108b 100644 --- a/arch/arm/boards/omap/board-omap3evm.c +++ b/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> diff --git a/arch/arm/boards/omap/board-sdp343x.c b/arch/arm/boards/omap/board-sdp343x.c index 82fc16df63..5a8ef1681a 100644 --- a/arch/arm/boards/omap/board-sdp343x.c +++ b/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> diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c index 1303c47233..dfe774fd75 100644 --- a/arch/arm/boards/panda/board.c +++ b/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> diff --git a/arch/arm/boards/panda/lowlevel.c b/arch/arm/boards/panda/lowlevel.c index cc0c374a03..45ea221d87 100644 --- a/arch/arm/boards/panda/lowlevel.c +++ b/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> diff --git a/arch/arm/boards/panda/mux.c b/arch/arm/boards/panda/mux.c index a03104011d..7586e86745 100644 --- a/arch/arm/boards/panda/mux.c +++ b/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> diff --git a/arch/arm/boards/pcm037/pcm037.c b/arch/arm/boards/pcm037/pcm037.c index 85f004fe48..42a543d2cc 100644 --- a/arch/arm/boards/pcm037/pcm037.c +++ b/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> diff --git a/arch/arm/boards/pcm038/lowlevel.c b/arch/arm/boards/pcm038/lowlevel.c index b50e1c8386..32392636e7 100644 --- a/arch/arm/boards/pcm038/lowlevel.c +++ b/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> diff --git a/arch/arm/boards/pcm038/pcm038.c b/arch/arm/boards/pcm038/pcm038.c index 6fee5c2d61..0b07a6378a 100644 --- a/arch/arm/boards/pcm038/pcm038.c +++ b/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> diff --git a/arch/arm/boards/pcm043/lowlevel.c b/arch/arm/boards/pcm043/lowlevel.c index eff96f9777..54cc66bc6f 100644 --- a/arch/arm/boards/pcm043/lowlevel.c +++ b/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> diff --git a/arch/arm/boards/pcm043/pcm043.c b/arch/arm/boards/pcm043/pcm043.c index fbe8cea12f..23580c9f6f 100644 --- a/arch/arm/boards/pcm043/pcm043.c +++ b/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> diff --git a/arch/arm/boards/pcm049/board.c b/arch/arm/boards/pcm049/board.c index 502e121b45..58f09f6ec2 100644 --- a/arch/arm/boards/pcm049/board.c +++ b/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> diff --git a/arch/arm/boards/pcm049/lowlevel.c b/arch/arm/boards/pcm049/lowlevel.c index e036ba742d..bea895e31f 100644 --- a/arch/arm/boards/pcm049/lowlevel.c +++ b/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> diff --git a/arch/arm/boards/pcm049/mux.c b/arch/arm/boards/pcm049/mux.c index d93d4589eb..9911b62e5a 100644 --- a/arch/arm/boards/pcm049/mux.c +++ b/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> diff --git a/arch/arm/boards/phycard-i.MX27/pca100.c b/arch/arm/boards/phycard-i.MX27/pca100.c index f285466641..41567673a7 100644 --- a/arch/arm/boards/phycard-i.MX27/pca100.c +++ b/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> diff --git a/arch/arm/boards/pm9261/init.c b/arch/arm/boards/pm9261/init.c index efc5dcc1fb..2766f473d8 100644 --- a/arch/arm/boards/pm9261/init.c +++ b/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> diff --git a/arch/arm/boards/pm9263/init.c b/arch/arm/boards/pm9263/init.c index 8f451e8edf..92d7e9f166 100644 --- a/arch/arm/boards/pm9263/init.c +++ b/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> diff --git a/arch/arm/boards/pm9g45/init.c b/arch/arm/boards/pm9g45/init.c index 35c9ce9f83..480c7513e3 100644 --- a/arch/arm/boards/pm9g45/init.c +++ b/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> diff --git a/arch/arm/boards/scb9328/scb9328.c b/arch/arm/boards/scb9328/scb9328.c index e90417f01e..906a17e07e 100644 --- a/arch/arm/boards/scb9328/scb9328.c +++ b/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> diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c index 07d85c10e9..535458226c 100644 --- a/arch/arm/boards/usb-a926x/init.c +++ b/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> diff --git a/arch/arm/cpu/cache-l2x0.c b/arch/arm/cpu/cache-l2x0.c index 1ea7bab362..b300e6ffb0 100644 --- a/arch/arm/cpu/cache-l2x0.c +++ b/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 diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c index 92b9e663a4..b6e7f552e1 100644 --- a/arch/arm/mach-at91/at91rm9200_time.c +++ b/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 diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c index 7a1d6dd2f4..7ca2ef4f48 100644 --- a/arch/arm/mach-at91/at91sam926x_time.c +++ b/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) { diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c index b257128da6..c34df0520e 100644 --- a/arch/arm/mach-at91/gpio.c +++ b/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> diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h index 7e1a9a8acd..f3239f5f42 100644 --- a/arch/arm/mach-at91/include/mach/gpio.h +++ b/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> diff --git a/arch/arm/mach-at91/include/mach/io.h b/arch/arm/mach-at91/include/mach/io.h index f09b2df0e3..7b0cd9dcbb 100644 --- a/arch/arm/mach-at91/include/mach/io.h +++ b/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) { diff --git a/arch/arm/mach-at91/sam9_smc.c b/arch/arm/mach-at91/sam9_smc.c index 3e7de2fc58..c397fe46b5 100644 --- a/arch/arm/mach-at91/sam9_smc.c +++ b/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> diff --git a/arch/arm/mach-ep93xx/clocksource.c b/arch/arm/mach-ep93xx/clocksource.c index b500948968..ce8a29fee7 100644 --- a/arch/arm/mach-ep93xx/clocksource.c +++ b/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) diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c index 5d57434031..f4def289e4 100644 --- a/arch/arm/mach-ep93xx/gpio.c +++ b/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 diff --git a/arch/arm/mach-ep93xx/led.c b/arch/arm/mach-ep93xx/led.c index 6d6b90235f..91f33d1aea 100644 --- a/arch/arm/mach-ep93xx/led.c +++ b/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 diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c index 8482b60f40..f13d956bf1 100644 --- a/arch/arm/mach-imx/boot.c +++ b/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) diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c index 5397da03d7..4f5895c2a5 100644 --- a/arch/arm/mach-imx/clocksource.c +++ b/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) diff --git a/arch/arm/mach-imx/gpio.c b/arch/arm/mach-imx/gpio.c index 0a3e0461eb..fdee20b865 100644 --- a/arch/arm/mach-imx/gpio.c +++ b/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> diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c index ca89710329..7494e3a40c 100644 --- a/arch/arm/mach-imx/iim.c +++ b/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> diff --git a/arch/arm/mach-imx/imx25.c b/arch/arm/mach-imx/imx25.c index 75ec8c7f45..19a2909e18 100644 --- a/arch/arm/mach-imx/imx25.c +++ b/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" diff --git a/arch/arm/mach-imx/imx35.c b/arch/arm/mach-imx/imx35.c index c846260682..381a564580 100644 --- a/arch/arm/mach-imx/imx35.c +++ b/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> diff --git a/arch/arm/mach-imx/imx51.c b/arch/arm/mach-imx/imx51.c index f2c886e331..0600a9d06b 100644 --- a/arch/arm/mach-imx/imx51.c +++ b/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" diff --git a/arch/arm/mach-imx/imx53.c b/arch/arm/mach-imx/imx53.c index 7a822c2c85..8fb64bb96a 100644 --- a/arch/arm/mach-imx/imx53.c +++ b/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> diff --git a/arch/arm/mach-imx/internal-nand-boot.c b/arch/arm/mach-imx/internal-nand-boot.c index 0d71b99f92..c55a0e7682 100644 --- a/arch/arm/mach-imx/internal-nand-boot.c +++ b/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> diff --git a/arch/arm/mach-imx/iomux-v2.c b/arch/arm/mach-imx/iomux-v2.c index abb2ebe195..1b49ccb328 100644 --- a/arch/arm/mach-imx/iomux-v2.c +++ b/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> diff --git a/arch/arm/mach-imx/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c index a74f942509..bb2307a370 100644 --- a/arch/arm/mach-imx/iomux-v3.c +++ b/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> diff --git a/arch/arm/mach-imx/nand.c b/arch/arm/mach-imx/nand.c index c52b8b06c2..fcbb85ef68 100644 --- a/arch/arm/mach-imx/nand.c +++ b/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) diff --git a/arch/arm/mach-imx/speed-imx25.c b/arch/arm/mach-imx/speed-imx25.c index 150adb28ba..f6dcacb71b 100644 --- a/arch/arm/mach-imx/speed-imx25.c +++ b/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> diff --git a/arch/arm/mach-imx/speed-imx31.c b/arch/arm/mach-imx/speed-imx31.c index 32a517d724..d3f168c4ae 100644 --- a/arch/arm/mach-imx/speed-imx31.c +++ b/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> diff --git a/arch/arm/mach-imx/speed-imx35.c b/arch/arm/mach-imx/speed-imx35.c index b2a339c6c2..1e1c39ff82 100644 --- a/arch/arm/mach-imx/speed-imx35.c +++ b/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> diff --git a/arch/arm/mach-imx/speed-imx51.c b/arch/arm/mach-imx/speed-imx51.c index 47d3c91c46..643ad8f39b 100644 --- a/arch/arm/mach-imx/speed-imx51.c +++ b/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> diff --git a/arch/arm/mach-imx/speed-imx53.c b/arch/arm/mach-imx/speed-imx53.c index 7b099f5fa6..0d6ac24944 100644 --- a/arch/arm/mach-imx/speed-imx53.c +++ b/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" diff --git a/arch/arm/mach-mxs/clocksource-imx23.c b/arch/arm/mach-mxs/clocksource-imx23.c index f7c94c1d75..66e534bda3 100644 --- a/arch/arm/mach-mxs/clocksource-imx23.c +++ b/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 diff --git a/arch/arm/mach-mxs/clocksource-imx28.c b/arch/arm/mach-mxs/clocksource-imx28.c index 15ae951004..328ca5d023 100644 --- a/arch/arm/mach-mxs/clocksource-imx28.c +++ b/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 diff --git a/arch/arm/mach-mxs/imx_lcd_clk.c b/arch/arm/mach-mxs/imx_lcd_clk.c index 65bfc6ee3d..455dfcb9c7 100644 --- a/arch/arm/mach-mxs/imx_lcd_clk.c +++ b/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 diff --git a/arch/arm/mach-mxs/iomux-imx.c b/arch/arm/mach-mxs/iomux-imx.c index bf6165f8d2..3161a5d3cc 100644 --- a/arch/arm/mach-mxs/iomux-imx.c +++ b/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 diff --git a/arch/arm/mach-mxs/reset-imx.c b/arch/arm/mach-mxs/reset-imx.c index b35f796b40..cfb3548f2a 100644 --- a/arch/arm/mach-mxs/reset-imx.c +++ b/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) diff --git a/arch/arm/mach-mxs/speed-imx23.c b/arch/arm/mach-mxs/speed-imx23.c index a31139d7a7..b10c78643c 100644 --- a/arch/arm/mach-mxs/speed-imx23.c +++ b/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> diff --git a/arch/arm/mach-mxs/speed-imx28.c b/arch/arm/mach-mxs/speed-imx28.c index 63c6b0754b..67cdbdf81d 100644 --- a/arch/arm/mach-mxs/speed-imx28.c +++ b/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> diff --git a/arch/arm/mach-mxs/usb.c b/arch/arm/mach-mxs/usb.c index d232bb6075..b7a93769b7 100644 --- a/arch/arm/mach-mxs/usb.c +++ b/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) diff --git a/arch/arm/mach-nomadik/reset.c b/arch/arm/mach-nomadik/reset.c index d55f278293..6ea74dd6c0 100644 --- a/arch/arm/mach-nomadik/reset.c +++ b/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) diff --git a/arch/arm/mach-nomadik/timer.c b/arch/arm/mach-nomadik/timer.c index 7de1f391a6..becd36357a 100644 --- a/arch/arm/mach-nomadik/timer.c +++ b/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> diff --git a/arch/arm/mach-omap/devices-gpmc-nand.c b/arch/arm/mach-omap/devices-gpmc-nand.c index 76ceb20024..197d4be418 100644 --- a/arch/arm/mach-omap/devices-gpmc-nand.c +++ b/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> diff --git a/arch/arm/mach-omap/gpio.c b/arch/arm/mach-omap/gpio.c index b0bd805628..142cf524eb 100644 --- a/arch/arm/mach-omap/gpio.c +++ b/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 diff --git a/arch/arm/mach-omap/gpmc.c b/arch/arm/mach-omap/gpmc.c index 2b9964950d..e8946d7c56 100644 --- a/arch/arm/mach-omap/gpmc.c +++ b/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> diff --git a/arch/arm/mach-omap/include/mach/syslib.h b/arch/arm/mach-omap/include/mach/syslib.h index 65aca0297f..1909f172a6 100644 --- a/arch/arm/mach-omap/include/mach/syslib.h +++ b/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 */ diff --git a/arch/arm/mach-omap/omap3_clock.c b/arch/arm/mach-omap/omap3_clock.c index 3a0ab24e58..412d7b714c 100644 --- a/arch/arm/mach-omap/omap3_clock.c +++ b/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> diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c index 7468441952..fc83d23713 100644 --- a/arch/arm/mach-omap/omap3_generic.c +++ b/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> diff --git a/arch/arm/mach-omap/omap4_clock.c b/arch/arm/mach-omap/omap4_clock.c index 23a77d06f1..f8bab5f93a 100644 --- a/arch/arm/mach-omap/omap4_clock.c +++ b/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 diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c index 313e5e997b..5223c7e757 100644 --- a/arch/arm/mach-omap/omap4_generic.c +++ b/arch/arm/mach-omap/omap4_generic.c @@ -1,7 +1,7 @@ #include <common.h> #include <init.h> #include <mach/silicon.h> -#include <asm/io.h> +#include <io.h> #include <mach/omap4-silicon.h> #include <mach/omap4-clock.h> #include <mach/syslib.h> diff --git a/arch/arm/mach-omap/s32k_clksource.c b/arch/arm/mach-omap/s32k_clksource.c index 094b76d6b7..3ed9448949 100644 --- a/arch/arm/mach-omap/s32k_clksource.c +++ b/arch/arm/mach-omap/s32k_clksource.c @@ -33,7 +33,7 @@ #include <common.h> #include <clock.h> #include <init.h> -#include <asm/io.h> +#include <io.h> #include <mach/silicon.h> #include <mach/clocks.h> #include <mach/timers.h> diff --git a/arch/arm/mach-omap/syslib.c b/arch/arm/mach-omap/syslib.c index 677de6a27d..765a816147 100644 --- a/arch/arm/mach-omap/syslib.c +++ b/arch/arm/mach-omap/syslib.c @@ -32,7 +32,7 @@ #include <config.h> #include <common.h> -#include <asm/io.h> +#include <io.h> #include <mach/syslib.h> /** diff --git a/arch/arm/mach-s3c24xx/generic.c b/arch/arm/mach-s3c24xx/generic.c index 4c7e799850..d2f2ac7ac0 100644 --- a/arch/arm/mach-s3c24xx/generic.c +++ b/arch/arm/mach-s3c24xx/generic.c @@ -26,7 +26,7 @@ #include <common.h> #include <init.h> #include <clock.h> -#include <asm/io.h> +#include <io.h> #include <mach/s3c24x0-iomap.h> /** diff --git a/arch/arm/mach-s3c24xx/gpio-s3c24x0.c b/arch/arm/mach-s3c24xx/gpio-s3c24x0.c index 3d5e5e5c96..946ec3396e 100644 --- a/arch/arm/mach-s3c24xx/gpio-s3c24x0.c +++ b/arch/arm/mach-s3c24xx/gpio-s3c24x0.c @@ -17,7 +17,7 @@ #include <common.h> #include <errno.h> -#include <asm/io.h> +#include <io.h> #include <mach/s3c24x0-iomap.h> #include <mach/gpio.h> diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 1231a7db63..bdf48f97a2 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@ -35,7 +35,7 @@ #include <linux/clk.h> #include <linux/err.h> -#include <asm/io.h> +#include <io.h> #include <asm/hardware/arm_timer.h> #include <asm/armlinux.h> diff --git a/arch/arm/mach-versatile/include/mach/debug_ll.h b/arch/arm/mach-versatile/include/mach/debug_ll.h index 1f6162b9db..30762c93fb 100644 --- a/arch/arm/mach-versatile/include/mach/debug_ll.h +++ b/arch/arm/mach-versatile/include/mach/debug_ll.h @@ -20,7 +20,7 @@ #define __MACH_DEBUG_LL_H__ #include <linux/amba/serial.h> -#include <asm/io.h> +#include <io.h> static inline void putc(char c) { diff --git a/arch/mips/boards/dlink-dir-320/serial.c b/arch/mips/boards/dlink-dir-320/serial.c index ebe8c06c7a..3eaab2a129 100644 --- a/arch/mips/boards/dlink-dir-320/serial.c +++ b/arch/mips/boards/dlink-dir-320/serial.c @@ -24,7 +24,7 @@ #include <init.h> #include <ns16550.h> #include <mach/hardware.h> -#include <asm/io.h> +#include <io.h> #include <asm/common.h> static struct NS16550_plat serial_plat = { diff --git a/arch/mips/boards/qemu-malta/serial.c b/arch/mips/boards/qemu-malta/serial.c index ef6be17f1f..502b3468bb 100644 --- a/arch/mips/boards/qemu-malta/serial.c +++ b/arch/mips/boards/qemu-malta/serial.c @@ -24,7 +24,7 @@ #include <init.h> #include <ns16550.h> #include <mach/hardware.h> -#include <asm/io.h> +#include <io.h> #include <asm/common.h> static struct NS16550_plat serial_plat = { diff --git a/arch/mips/lib/csrc-r4k.c b/arch/mips/lib/csrc-r4k.c index 8e93e6f6c4..1dd0928949 100644 --- a/arch/mips/lib/csrc-r4k.c +++ b/arch/mips/lib/csrc-r4k.c @@ -25,7 +25,7 @@ #include <init.h> #include <clock.h> -#include <asm/io.h> +#include <io.h> #include <asm/mipsregs.h> static uint64_t c0_hpt_read(void) diff --git a/arch/mips/mach-bcm47xx/include/mach/debug_ll.h b/arch/mips/mach-bcm47xx/include/mach/debug_ll.h index 32d13c1a87..ccc9d9bfc7 100644 --- a/arch/mips/mach-bcm47xx/include/mach/debug_ll.h +++ b/arch/mips/mach-bcm47xx/include/mach/debug_ll.h @@ -24,7 +24,7 @@ #ifndef __INCLUDE_ARCH_DEBUG_LL_H__ #define __INCLUDE_ARCH_DEBUG_LL_H__ -#include <asm/io.h> +#include <io.h> #include <mach/hardware.h> #define rbr 0 diff --git a/arch/mips/mach-bcm47xx/reset.c b/arch/mips/mach-bcm47xx/reset.c index 2818e7cfa3..d6fcd8dec2 100644 --- a/arch/mips/mach-bcm47xx/reset.c +++ b/arch/mips/mach-bcm47xx/reset.c @@ -24,7 +24,7 @@ */ #include <common.h> -#include <asm/io.h> +#include <io.h> #include <mach/hardware.h> void __noreturn reset_cpu(ulong addr) diff --git a/arch/mips/mach-malta/include/mach/debug_ll.h b/arch/mips/mach-malta/include/mach/debug_ll.h index 32d13c1a87..ccc9d9bfc7 100644 --- a/arch/mips/mach-malta/include/mach/debug_ll.h +++ b/arch/mips/mach-malta/include/mach/debug_ll.h @@ -24,7 +24,7 @@ #ifndef __INCLUDE_ARCH_DEBUG_LL_H__ #define __INCLUDE_ARCH_DEBUG_LL_H__ -#include <asm/io.h> +#include <io.h> #include <mach/hardware.h> #define rbr 0 diff --git a/arch/mips/mach-malta/reset.c b/arch/mips/mach-malta/reset.c index 2818e7cfa3..d6fcd8dec2 100644 --- a/arch/mips/mach-malta/reset.c +++ b/arch/mips/mach-malta/reset.c @@ -24,7 +24,7 @@ */ #include <common.h> -#include <asm/io.h> +#include <io.h> #include <mach/hardware.h> void __noreturn reset_cpu(ulong addr) diff --git a/arch/nios2/cpu/interrupts.c b/arch/nios2/cpu/interrupts.c index 5efbd5e354..f443bfdec5 100644 --- a/arch/nios2/cpu/interrupts.c +++ b/arch/nios2/cpu/interrupts.c @@ -27,7 +27,7 @@ #include <nios2.h> #include <asm/nios2-io.h> #include <asm/types.h> -#include <asm/io.h> +#include <io.h> #include <asm/ptrace.h> #include <common.h> #include <command.h> diff --git a/arch/nios2/lib/clock.c b/arch/nios2/lib/clock.c index 05008be793..52f52fd145 100644 --- a/arch/nios2/lib/clock.c +++ b/arch/nios2/lib/clock.c @@ -24,7 +24,7 @@ #include <clock.h> #include <init.h> #include <asm/nios2-io.h> -#include <asm/io.h> +#include <io.h> static struct nios_timer *timer = (struct nios_timer *)NIOS_SOPC_TIMER_BASE; diff --git a/arch/nios2/lib/early_printf.c b/arch/nios2/lib/early_printf.c index 637bb73b0d..50b071ba5e 100644 --- a/arch/nios2/lib/early_printf.c +++ b/arch/nios2/lib/early_printf.c @@ -23,7 +23,7 @@ #include <stdio.h> #include <common.h> #include <asm/nios2-io.h> -#include <asm/io.h> +#include <io.h> void early_putc(char ch) { diff --git a/arch/ppc/include/asm/mc146818rtc.h b/arch/ppc/include/asm/mc146818rtc.h index 5f806c4ec2..adc4e24db7 100644 --- a/arch/ppc/include/asm/mc146818rtc.h +++ b/arch/ppc/include/asm/mc146818rtc.h @@ -4,7 +4,7 @@ #ifndef __ASM_PPC_MC146818RTC_H #define __ASM_PPC_MC146818RTC_H -#include <asm/io.h> +#include <io.h> #ifndef RTC_PORT #define RTC_PORT(x) (0x70 + (x)) diff --git a/arch/ppc/mach-mpc5xxx/interrupts.c b/arch/ppc/mach-mpc5xxx/interrupts.c index e484b6ecde..4838bc5f70 100644 --- a/arch/ppc/mach-mpc5xxx/interrupts.c +++ b/arch/ppc/mach-mpc5xxx/interrupts.c @@ -39,7 +39,7 @@ #include <common.h> #include <asm/processor.h> -#include <asm/io.h> +#include <io.h> #include <command.h> #include <mach/sdma.h> #include <asm/bitops.h> diff --git a/arch/ppc/mach-mpc5xxx/pci_mpc5200.c b/arch/ppc/mach-mpc5xxx/pci_mpc5200.c index a7de4a2268..d8f3b00759 100644 --- a/arch/ppc/mach-mpc5xxx/pci_mpc5200.c +++ b/arch/ppc/mach-mpc5xxx/pci_mpc5200.c @@ -26,7 +26,7 @@ #if defined(CONFIG_PCI) && defined(CONFIG_MPC5200) #include <asm/processor.h> -#include <asm/io.h> +#include <io.h> #include <pci.h> #include <mpc5xxx.h> diff --git a/arch/x86/boot/a20.c b/arch/x86/boot/a20.c index 4b61d91930..ddb40ee5c2 100644 --- a/arch/x86/boot/a20.c +++ b/arch/x86/boot/a20.c @@ -14,7 +14,7 @@ */ #include <asm/segment.h> -#include <asm/io.h> +#include <io.h> #include "boot.h" #define MAX_8042_LOOPS 100000 diff --git a/arch/x86/boot/prepare_uboot.c b/arch/x86/boot/prepare_uboot.c index a68aceddb6..79e6fb0cbe 100644 --- a/arch/x86/boot/prepare_uboot.c +++ b/arch/x86/boot/prepare_uboot.c @@ -13,7 +13,7 @@ */ #include <asm/segment.h> #include <asm/modes.h> -#include <asm/io.h> +#include <io.h> #include "boot.h" /* be aware of: */ diff --git a/arch/x86/mach-i386/generic.c b/arch/x86/mach-i386/generic.c index edeacc4275..376de58964 100644 --- a/arch/x86/mach-i386/generic.c +++ b/arch/x86/mach-i386/generic.c @@ -23,7 +23,7 @@ * @brief x86 Architecture Initialization routines */ -#include <asm/io.h> +#include <io.h> /** to work with the 8250 UART driver implementation we need this function */ unsigned int x86_uart_read(unsigned long base, unsigned char reg_idx) diff --git a/arch/x86/mach-i386/pit_timer.c b/arch/x86/mach-i386/pit_timer.c index ec97cee49b..36019b0ede 100644 --- a/arch/x86/mach-i386/pit_timer.c +++ b/arch/x86/mach-i386/pit_timer.c @@ -32,7 +32,7 @@ #include <init.h> #include <clock.h> -#include <asm/io.h> +#include <io.h> /** base address of the PIT in a standard PC */ #define PIT 0x40 diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 2d075f72ca..c1e9cafa80 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -44,7 +44,7 @@ #include <linux/err.h> -#include <asm/io.h> +#include <io.h> #include <i2c/i2c.h> #include <mach/generic.h> #include <mach/clock.h> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 95c4fdf782..2a1ae7af75 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -43,7 +43,7 @@ #include <linux/err.h> -#include <asm/io.h> +#include <io.h> #include <i2c/i2c.h> #include <mach/generic.h> #include <mach/omap3-clock.h> diff --git a/drivers/mci/atmel_mci.c b/drivers/mci/atmel_mci.c index 7af153aa2f..4a29cad18f 100644 --- a/drivers/mci/atmel_mci.c +++ b/drivers/mci/atmel_mci.c @@ -20,7 +20,7 @@ #include <errno.h> #include <clock.h> #include <gpio.h> -#include <asm/io.h> +#include <io.h> #include <mach/board.h> #include <linux/clk.h> #include <linux/err.h> diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c index 358f0dc25c..a0e61f0d01 100644 --- a/drivers/mci/imx-esdhc.c +++ b/drivers/mci/imx-esdhc.c @@ -32,7 +32,7 @@ #include <malloc.h> #include <mci.h> #include <clock.h> -#include <asm/io.h> +#include <io.h> #include <asm/mmu.h> #include <mach/clock.h> #include <mach/generic.h> diff --git a/drivers/mci/imx.c b/drivers/mci/imx.c index 905c251db3..50c98e1cef 100644 --- a/drivers/mci/imx.c +++ b/drivers/mci/imx.c @@ -26,7 +26,7 @@ #include <init.h> #include <driver.h> #include <mach/clock.h> -#include <asm/io.h> +#include <io.h> #define DRIVER_NAME "imx-mmc" diff --git a/drivers/mci/mxs.c b/drivers/mci/mxs.c index 70b8be9bf7..d747ad1b17 100644 --- a/drivers/mci/mxs.c +++ b/drivers/mci/mxs.c @@ -39,7 +39,7 @@ #include <mci.h> #include <errno.h> #include <clock.h> -#include <asm/io.h> +#include <io.h> #include <asm/bitops.h> #include <mach/imx-regs.h> #include <mach/mci.h> diff --git a/drivers/mci/omap_hsmmc.c b/drivers/mci/omap_hsmmc.c index bf8d4a9796..3f70e22629 100644 --- a/drivers/mci/omap_hsmmc.c +++ b/drivers/mci/omap_hsmmc.c @@ -29,7 +29,7 @@ #include <mci.h> #include <clock.h> #include <errno.h> -#include <asm/io.h> +#include <io.h> #include <mach/omap_hsmmc.h> diff --git a/drivers/mci/s3c.c b/drivers/mci/s3c.c index c621445e5c..f97e13a6dd 100644 --- a/drivers/mci/s3c.c +++ b/drivers/mci/s3c.c @@ -39,7 +39,7 @@ #include <mci.h> #include <errno.h> #include <clock.h> -#include <asm/io.h> +#include <io.h> #include <mach/mci.h> #include <mach/s3c24xx-generic.h> #include <mach/s3c24x0-iomap.h> diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 07104078dc..8cc1b51f7f 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -31,7 +31,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> -#include <asm/io.h> +#include <io.h> #include <mach/board.h> #include <errno.h> diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c index e762524540..2433945571 100644 --- a/drivers/mtd/nand/diskonchip.c +++ b/drivers/mtd/nand/diskonchip.c @@ -29,7 +29,7 @@ #include <linux/delay.h> #include <linux/rslib.h> #include <linux/moduleparam.h> -#include <asm/io.h> +#include <io.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 5e122a10a5..2710f6a309 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -39,7 +39,7 @@ #include <linux/err.h> #include <linux/mtd/nand_ecc.h> #include <asm/byteorder.h> -#include <asm/io.h> +#include <io.h> #include <malloc.h> #include <module.h> diff --git a/drivers/mtd/nand/nand_hwecc.c b/drivers/mtd/nand/nand_hwecc.c index 95b08d3a79..5ead49c60c 100644 --- a/drivers/mtd/nand/nand_hwecc.c +++ b/drivers/mtd/nand/nand_hwecc.c @@ -6,7 +6,7 @@ #include <linux/err.h> #include <linux/mtd/nand_ecc.h> #include <asm/byteorder.h> -#include <asm/io.h> +#include <io.h> #include <malloc.h> #include "nand.h" diff --git a/drivers/mtd/nand/nand_hwecc_syndrome.c b/drivers/mtd/nand/nand_hwecc_syndrome.c index 9a66180952..dd067c9970 100644 --- a/drivers/mtd/nand/nand_hwecc_syndrome.c +++ b/drivers/mtd/nand/nand_hwecc_syndrome.c @@ -6,7 +6,7 @@ #include <linux/err.h> #include <linux/mtd/nand_ecc.h> #include <asm/byteorder.h> -#include <asm/io.h> +#include <io.h> #include <malloc.h> #include <module.h> diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c index f270326aaa..581136aed4 100644 --- a/drivers/mtd/nand/nand_imx.c +++ b/drivers/mtd/nand/nand_imx.c @@ -27,7 +27,7 @@ #include <mach/generic.h> #include <mach/imx-nand.h> #include <mach/imx-regs.h> -#include <asm/io.h> +#include <io.h> #include <errno.h> #define NFC_V3_FLASH_CMD (host->regs_axi + 0x00) diff --git a/drivers/mtd/nand/nand_omap_gpmc.c b/drivers/mtd/nand/nand_omap_gpmc.c index 083aa57520..a012c03dec 100644 --- a/drivers/mtd/nand/nand_omap_gpmc.c +++ b/drivers/mtd/nand/nand_omap_gpmc.c @@ -71,7 +71,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/nand_ecc.h> -#include <asm/io.h> +#include <io.h> #include <mach/silicon.h> #include <mach/gpmc.h> #include <mach/gpmc_nand.h> diff --git a/drivers/mtd/nand/nand_s3c2410.c b/drivers/mtd/nand/nand_s3c2410.c index 0ce20d42c3..c5f5d97db3 100644 --- a/drivers/mtd/nand/nand_s3c2410.c +++ b/drivers/mtd/nand/nand_s3c2410.c @@ -33,7 +33,7 @@ #include <mach/s3c24xx-generic.h> #include <mach/s3c24x0-iomap.h> #include <mach/s3c24x0-nand.h> -#include <asm/io.h> +#include <io.h> #include <asm-generic/errno.h> #ifdef CONFIG_S3C24XX_NAND_BOOT diff --git a/drivers/mtd/nand/nand_swecc.c b/drivers/mtd/nand/nand_swecc.c index 93511cbe3d..a5edffaece 100644 --- a/drivers/mtd/nand/nand_swecc.c +++ b/drivers/mtd/nand/nand_swecc.c @@ -6,7 +6,7 @@ #include <linux/err.h> #include <linux/mtd/nand_ecc.h> #include <asm/byteorder.h> -#include <asm/io.h> +#include <io.h> #include <malloc.h> #include "nand.h" diff --git a/drivers/mtd/nand/nand_write.c b/drivers/mtd/nand/nand_write.c index 3ede8d02f0..13b6c8984f 100644 --- a/drivers/mtd/nand/nand_write.c +++ b/drivers/mtd/nand/nand_write.c @@ -6,7 +6,7 @@ #include <linux/err.h> #include <linux/mtd/nand_ecc.h> #include <asm/byteorder.h> -#include <asm/io.h> +#include <io.h> #include <malloc.h> #include <module.h> diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c index 3073011614..c1e93ad076 100644 --- a/drivers/mtd/nand/nomadik_nand.c +++ b/drivers/mtd/nand/nomadik_nand.c @@ -30,7 +30,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> -#include <asm/io.h> +#include <io.h> #include <mach/nand.h> #include <mach/fsmc.h> diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index 7e456c762e..5163488183 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -31,7 +31,7 @@ #include <clock.h> #include <linux/mii.h> -#include <asm/io.h> +#include <io.h> #include <asm/dma-mapping.h> #include "altera_tse.h" diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c index 33afc5e0f3..da23755a5e 100644 --- a/drivers/net/cs8900.c +++ b/drivers/net/cs8900.c @@ -27,7 +27,7 @@ #include <net.h> #include <malloc.h> #include <clock.h> -#include <asm/io.h> +#include <io.h> #include <errno.h> /* I/O ports for I/O Space operation */ diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index e9ec61b37d..f32778135d 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c @@ -50,7 +50,7 @@ #include <malloc.h> #include <net.h> #include <init.h> -#include <asm/io.h> +#include <io.h> #include <xfuncs.h> #include <dm9000.h> #include <errno.h> diff --git a/drivers/net/ep93xx.c b/drivers/net/ep93xx.c index 954ec789f3..227e317492 100644 --- a/drivers/net/ep93xx.c +++ b/drivers/net/ep93xx.c @@ -35,7 +35,7 @@ #include <init.h> #include <malloc.h> #include <miidev.h> -#include <asm/io.h> +#include <io.h> #include <linux/types.h> #include <mach/ep93xx-regs.h> #include "ep93xx.h" diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 3b0f266a2b..ae63fdc3b5 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -28,7 +28,7 @@ #include <fec.h> #include <asm/mmu.h> -#include <asm/io.h> +#include <io.h> #include <mach/generic.h> #include <mach/imx-regs.h> #include <clock.h> diff --git a/drivers/net/macb.c b/drivers/net/macb.c index e3368c93db..c1f7f68484 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -46,7 +46,7 @@ #include <init.h> #include <miidev.h> #include <errno.h> -#include <asm/io.h> +#include <io.h> #include <mach/board.h> #include <linux/clk.h> #include <linux/err.h> diff --git a/drivers/net/netx_eth.c b/drivers/net/netx_eth.c index 5503bc94dd..81a7ff4fcd 100644 --- a/drivers/net/netx_eth.c +++ b/drivers/net/netx_eth.c @@ -1,7 +1,7 @@ #include <common.h> #include <command.h> #include <net.h> -#include <asm/io.h> +#include <io.h> #include <miidev.h> #include <mach/netx-xc.h> #include <mach/netx-eth.h> diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c index 2313aaeb63..c51f8c7291 100644 --- a/drivers/net/smc91111.c +++ b/drivers/net/smc91111.c @@ -73,7 +73,7 @@ #include <xfuncs.h> #include <errno.h> #include <clock.h> -#include <asm/io.h> +#include <io.h> /*--------------------------------------------------------------- . diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index fba61c460f..e34c0df90d 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -36,7 +36,7 @@ #include <xfuncs.h> #include <errno.h> #include <clock.h> -#include <asm/io.h> +#include <io.h> #define AS CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT diff --git a/drivers/nor/cfi_flash.c b/drivers/nor/cfi_flash.c index 7b25adb3ac..f9b96c50a2 100644 --- a/drivers/nor/cfi_flash.c +++ b/drivers/nor/cfi_flash.c @@ -40,7 +40,7 @@ #include <clock.h> #include <init.h> #include <malloc.h> -#include <asm/io.h> +#include <io.h> #include <errno.h> #include <progress.h> #include "cfi_flash.h" diff --git a/drivers/nor/cfi_flash.h b/drivers/nor/cfi_flash.h index 32dcc8c5e0..34a4cf8352 100644 --- a/drivers/nor/cfi_flash.h +++ b/drivers/nor/cfi_flash.h @@ -26,7 +26,7 @@ #include <driver.h> #include <asm/byteorder.h> -#include <asm/io.h> +#include <io.h> #include <linux/mtd/mtd.h> typedef unsigned long flash_sect_t; diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index 2b6d5d384c..148bdbf576 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c @@ -31,7 +31,7 @@ #include <driver.h> #include <init.h> #include <malloc.h> -#include <asm/io.h> +#include <io.h> #include <linux/amba/serial.h> #include <linux/clk.h> #include <linux/err.h> diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c index 2d4b842420..9ba4ca9dab 100644 --- a/drivers/serial/atmel.c +++ b/drivers/serial/atmel.c @@ -21,7 +21,7 @@ #include <driver.h> #include <init.h> #include <malloc.h> -#include <asm/io.h> +#include <io.h> #include <linux/clk.h> /* USART3 register offsets */ diff --git a/drivers/serial/serial_altera.c b/drivers/serial/serial_altera.c index 1148564b9e..8fd5d8a1a0 100644 --- a/drivers/serial/serial_altera.c +++ b/drivers/serial/serial_altera.c @@ -24,7 +24,7 @@ #include <driver.h> #include <init.h> #include <malloc.h> -#include <asm/io.h> +#include <io.h> #include <asm/nios2-io.h> struct altera_serial_priv { diff --git a/drivers/serial/serial_altera_jtag.c b/drivers/serial/serial_altera_jtag.c index 2e34c894a4..3e1b0cf6e1 100644 --- a/drivers/serial/serial_altera_jtag.c +++ b/drivers/serial/serial_altera_jtag.c @@ -27,7 +27,7 @@ #include <driver.h> #include <init.h> #include <malloc.h> -#include <asm/io.h> +#include <io.h> #include <asm/nios2-io.h> struct altera_serial_jtag_priv { diff --git a/drivers/serial/serial_at91rm9200.c b/drivers/serial/serial_at91rm9200.c index f5546aa758..9bdc626e4d 100644 --- a/drivers/serial/serial_at91rm9200.c +++ b/drivers/serial/serial_at91rm9200.c @@ -30,7 +30,7 @@ */ #include <common.h> -#include <asm/io.h> +#include <io.h> #include <mach/hardware.h> #if !defined(CONFIG_DBGU) && !defined(CONFIG_USART0) && !defined(CONFIG_USART1) diff --git a/drivers/serial/serial_blackfin.c b/drivers/serial/serial_blackfin.c index 59b2fbb1ec..9ad55792ac 100644 --- a/drivers/serial/serial_blackfin.c +++ b/drivers/serial/serial_blackfin.c @@ -25,7 +25,7 @@ #include <driver.h> #include <init.h> #include <malloc.h> -#include <asm/io.h> +#include <io.h> #include <asm/blackfin.h> #define UART_IER_ERBFI 0x01 diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index e3edac951f..4923dcbd94 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -24,7 +24,7 @@ #include <init.h> #include <malloc.h> #include <notifier.h> -#include <asm/io.h> +#include <io.h> #define URXD0 0x0 /* Receiver Register */ #define URTX0 0x40 /* Transmitter Register */ diff --git a/drivers/serial/serial_netx.c b/drivers/serial/serial_netx.c index fbbc4efdac..a3273e9602 100644 --- a/drivers/serial/serial_netx.c +++ b/drivers/serial/serial_netx.c @@ -26,7 +26,7 @@ #include <driver.h> #include <init.h> #include <malloc.h> -#include <asm/io.h> +#include <io.h> enum uart_regs { UART_DR = 0x00, diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 36d39cd125..1217a5f249 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -41,7 +41,7 @@ #include <init.h> #include <errno.h> #include <malloc.h> -#include <asm/io.h> +#include <io.h> #include "serial_ns16550.h" #include <ns16550.h> diff --git a/drivers/serial/serial_pl010.c b/drivers/serial/serial_pl010.c index 9f7b7d3b02..cb875410ea 100644 --- a/drivers/serial/serial_pl010.c +++ b/drivers/serial/serial_pl010.c @@ -32,7 +32,7 @@ #include <common.h> #include <init.h> #include <malloc.h> -#include <asm/io.h> +#include <io.h> #include "serial_pl010.h" static int pl010_setbaudrate(struct console_device *cdev, int baudrate) diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c index 21bca12f39..3a703b6fe8 100644 --- a/drivers/serial/serial_s3c24x0.c +++ b/drivers/serial/serial_s3c24x0.c @@ -24,7 +24,7 @@ #include <driver.h> #include <init.h> #include <malloc.h> -#include <asm/io.h> +#include <io.h> #include <mach/s3c24xx-generic.h> #include <mach/s3c24x0-iomap.h> diff --git a/drivers/serial/stm-serial.c b/drivers/serial/stm-serial.c index 4264345182..1563d2a93b 100644 --- a/drivers/serial/stm-serial.c +++ b/drivers/serial/stm-serial.c @@ -30,7 +30,7 @@ #include <init.h> #include <notifier.h> #include <gpio.h> -#include <asm/io.h> +#include <io.h> #include <mach/imx-regs.h> #include <mach/clock.h> diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c index 2c02d7af63..4fd82fb905 100644 --- a/drivers/spi/altera_spi.c +++ b/drivers/spi/altera_spi.c @@ -22,7 +22,7 @@ #include <init.h> #include <driver.h> #include <spi/spi.h> -#include <asm/io.h> +#include <io.h> #include <asm/spi.h> #include <asm/nios2-io.h> diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index 5f5ccb6556..faa03b1c9e 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -33,7 +33,7 @@ #include <clock.h> #include <xfuncs.h> #include <gpio.h> -#include <asm/io.h> +#include <io.h> #include <spi/spi.h> #include <mach/io.h> #include <mach/board.h> diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c index bc84e19337..3b33b669fb 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -23,7 +23,7 @@ #include <driver.h> #include <spi/spi.h> #include <xfuncs.h> -#include <asm/io.h> +#include <io.h> #include <gpio.h> #include <mach/spi.h> #include <mach/generic.h> diff --git a/drivers/usb/gadget/fsl_udc.c b/drivers/usb/gadget/fsl_udc.c index 1e4d4b08f3..fbc6e4ecc7 100644 --- a/drivers/usb/gadget/fsl_udc.c +++ b/drivers/usb/gadget/fsl_udc.c @@ -5,7 +5,7 @@ #include <usb/ch9.h> #include <usb/gadget.h> #include <usb/fsl_usb2.h> -#include <asm/io.h> +#include <io.h> #include <asm/byteorder.h> #include <asm/mmu.h> diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 81e41d938e..77087cb6ca 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -24,7 +24,7 @@ #include <common.h> #include <asm/byteorder.h> #include <usb/usb.h> -#include <asm/io.h> +#include <io.h> #include <malloc.h> #include <driver.h> #include <init.h> diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 94aa356dd3..e2ce65f864 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -15,7 +15,7 @@ #include <usb/twl4030.h> #include <mach/ehci.h> #include <common.h> -#include <asm/io.h> +#include <io.h> #include <clock.h> #include <gpio.h> #include <mach/omap3-silicon.h> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index cae049add8..7465182a7b 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -27,7 +27,7 @@ #include <usb/usb.h> #include <usb/usb_defs.h> #include <errno.h> -#include <asm/io.h> +#include <io.h> #include "ohci.h" diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 5ac4acca30..f103101464 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -53,7 +53,7 @@ #include <errno.h> #include <asm/byteorder.h> -#include <asm/io.h> +#include <io.h> #include <asm/mmu.h> #include "ohci.h" diff --git a/drivers/usb/otg/ulpi.c b/drivers/usb/otg/ulpi.c index 4a898fb223..6ed6f01e8e 100644 --- a/drivers/usb/otg/ulpi.c +++ b/drivers/usb/otg/ulpi.c @@ -17,7 +17,7 @@ */ #include <common.h> -#include <asm/io.h> +#include <io.h> #include <errno.h> #include <usb/ulpi.h> diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c index 5ae8c4b389..dce2a9e47c 100644 --- a/drivers/video/imx-ipu-fb.c +++ b/drivers/video/imx-ipu-fb.c @@ -23,7 +23,7 @@ #include <common.h> #include <init.h> -#include <asm/io.h> +#include <io.h> #include <mach/imx-regs.h> #include <fb.h> #include <mach/imxfb.h> diff --git a/drivers/video/imx.c b/drivers/video/imx.c index c19e83e50f..7ffbcb550b 100644 --- a/drivers/video/imx.c +++ b/drivers/video/imx.c @@ -16,7 +16,7 @@ #include <common.h> #include <fb.h> -#include <asm/io.h> +#include <io.h> #include <mach/imxfb.h> #include <driver.h> #include <malloc.h> diff --git a/drivers/video/s3c.c b/drivers/video/s3c.c index d079fdea59..b17aeb69ff 100644 --- a/drivers/video/s3c.c +++ b/drivers/video/s3c.c @@ -29,7 +29,7 @@ #include <driver.h> #include <malloc.h> #include <errno.h> -#include <asm/io.h> +#include <io.h> #include <mach/gpio.h> #include <mach/s3c24xx-generic.h> #include <mach/fb.h> diff --git a/drivers/video/stm.c b/drivers/video/stm.c index 78acad7372..c109352565 100644 --- a/drivers/video/stm.c +++ b/drivers/video/stm.c @@ -23,7 +23,7 @@ #include <malloc.h> #include <errno.h> #include <xfuncs.h> -#include <asm/io.h> +#include <io.h> #include <mach/imx-regs.h> #include <mach/clock.h> #include <mach/fb.h> diff --git a/include/io.h b/include/io.h new file mode 100644 index 0000000000..8eb56b061f --- /dev/null +++ b/include/io.h @@ -0,0 +1,6 @@ +#ifndef __IO_H +#define __IO_H + +#include <asm/io.h> + +#endif /* __IO_H */ |