Move most of omap io.h into omap-iomap.h

PATCH New Tony Lindgren 1 participant 6 messages Feb 13, 2012 – Feb 21, 2012

Subsystems (15)

Arm (32-bit) USB Arm sub-architectures GPIO +11 more subsystems

lore

Share & tools

lore

Tony Lindgren

author maintainer

2012-02-13 23:53 UTC #0 lore raw

cover Move most of omap io.h into omap-iomap.h

Hi all,

This is intended as clean-up before we apply Rob Herring's series to remove mach/io.h.

Regards,

Tony

---

Tony Lindgren (3):
ARM: OMAP2+: Move SDRC related functions from io.h into local common.h
ARM: OMAP: Introduce omap-iomap.h and convert files depending on current io.h to use it
ARM: OMAP: Move most of io.h to omap-iomap.h

 arch/arm/mach-omap1/ams-delta-fiq-handler.S    |    1 
 arch/arm/mach-omap1/ams-delta-fiq.c            |    3 
 arch/arm/mach-omap1/board-ams-delta.c          |    7 +
 arch/arm/mach-omap1/board-fsample.c            |    7 +
 arch/arm/mach-omap1/board-h2.c                 |    7 -
 arch/arm/mach-omap1/board-h3.c                 |    9 +
 arch/arm/mach-omap1/board-htcherald.c          |    5 -
 arch/arm/mach-omap1/board-innovator.c          |    7 +
 arch/arm/mach-omap1/board-nokia770.c           |    7 +
 arch/arm/mach-omap1/board-osk.c                |    8 -
 arch/arm/mach-omap1/board-palmte.c             |    5 -
 arch/arm/mach-omap1/board-palmtt.c             |   10 +
 arch/arm/mach-omap1/board-palmz71.c            |   10 +
 arch/arm/mach-omap1/board-perseus2.c           |    7 +
 arch/arm/mach-omap1/board-sx1.c                |    7 +
 arch/arm/mach-omap1/board-voiceblue.c          |    7 +
 arch/arm/mach-omap1/clock.c                    |    1 
 arch/arm/mach-omap1/clock_data.c               |    1 
 arch/arm/mach-omap1/devices.c                  |    8 +
 arch/arm/mach-omap1/dma.c                      |    1 
 arch/arm/mach-omap1/flash.c                    |    1 
 arch/arm/mach-omap1/fpga.c                     |    4 
 arch/arm/mach-omap1/id.c                       |    2 
 arch/arm/mach-omap1/include/mach/entry-macro.S |    4 
 arch/arm/mach-omap1/io.c                       |    2 
 arch/arm/mach-omap1/irq.c                      |    5 -
 arch/arm/mach-omap1/lcd_dma.c                  |    4 
 arch/arm/mach-omap1/mcbsp.c                    |    4 
 arch/arm/mach-omap1/pm.c                       |    6 -
 arch/arm/mach-omap1/reset.c                    |    4 
 arch/arm/mach-omap1/sleep.S                    |    5 +
 arch/arm/mach-omap1/sram.S                     |    4 
 arch/arm/mach-omap1/time.c                     |    4 
 arch/arm/mach-omap1/timer32k.c                 |    8 +
 arch/arm/mach-omap1/usb.c                      |    1 
 arch/arm/mach-omap2/board-flash.c              |    1 
 arch/arm/mach-omap2/clock2420_data.c           |    1 
 arch/arm/mach-omap2/clock2430.c                |    1 
 arch/arm/mach-omap2/clock2430_data.c           |    1 
 arch/arm/mach-omap2/clock3xxx_data.c           |    1 
 arch/arm/mach-omap2/clock44xx_data.c           |    2 
 arch/arm/mach-omap2/cm2xxx_3xxx.c              |    3 
 arch/arm/mach-omap2/cm44xx.c                   |    3 
 arch/arm/mach-omap2/cminst44xx.c               |    3 
 arch/arm/mach-omap2/common.c                   |    3 
 arch/arm/mach-omap2/common.h                   |    5 +
 arch/arm/mach-omap2/control.c                  |    1 
 arch/arm/mach-omap2/devices.c                  |    1 
 arch/arm/mach-omap2/io.c                       |    3 
 arch/arm/mach-omap2/irq.c                      |    5 -
 arch/arm/mach-omap2/omap-smp.c                 |    4 
 arch/arm/mach-omap2/pm24xx.c                   |    4 
 arch/arm/mach-omap2/prcm_mpu44xx.c             |    3 
 arch/arm/mach-omap2/prm44xx.c                  |    3 
 arch/arm/mach-omap2/prminst44xx.c              |    3 
 arch/arm/mach-omap2/sdrc2xxx.c                 |    5 -
 arch/arm/mach-omap2/sleep34xx.S                |    4 
 arch/arm/mach-omap2/sram242x.S                 |    4 
 arch/arm/mach-omap2/sram243x.S                 |    4 
 arch/arm/mach-omap2/sram34xx.S                 |    5 -
 arch/arm/plat-omap/devices.c                   |    4 
 arch/arm/plat-omap/dma.c                       |    6 -
 arch/arm/plat-omap/dmtimer.c                   |    1 
 arch/arm/plat-omap/include/plat/io.h           |  226 ------------------------
 arch/arm/plat-omap/include/plat/omap-iomap.h   |  221 +++++++++++++++++++++++
 arch/arm/plat-omap/ocpi.c                      |    2 
 arch/arm/plat-omap/sram.c                      |    2 
 arch/arm/plat-omap/usb.c                       |    1 
 drivers/gpio/gpio-omap.c                       |    7 +
 drivers/pcmcia/omap_cf.c                       |    4 
 drivers/spi/spi-omap-uwire.c                   |    4 
 drivers/usb/host/ohci-omap.c                   |    6 -
 drivers/usb/otg/isp1301_omap.c                 |    7 -
 drivers/video/omap/lcd_ams_delta.c             |    2 
 drivers/video/omap/lcd_inn1510.c               |    2 
 drivers/video/omap/lcd_osk.c                   |    3 
 drivers/video/omap/lcdc.c                      |    7 -
 drivers/video/omap/sossi.c                     |    1 
 78 files changed, 449 insertions(+), 306 deletions(-)
 create mode 100644 arch/arm/plat-omap/include/plat/omap-iomap.h

Signature · 1 line

Signature

Tony Lindgren

author maintainer

2012-02-13 23:53 UTC #1 lore raw

PATCH 1/3 ARM: OMAP2+: Move SDRC related functions from io.h into local common.h

These should be local to omap2/3/4.

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/mach-omap2/common.h         |    5 +++++
 arch/arm/plat-omap/include/plat/io.h |    4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

arch/arm/mach-omap2/common.h +5 -0

index febffde..5aa1acb 100644
@@ -235,5 +235,10 @@ static inline u32 omap4_mpuss_read_prev_context_state(void)
 	return 0;
 }
 #endif
+
+struct omap_sdrc_params;
+extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
+				      struct omap_sdrc_params *sdrc_cs1);
+
 #endif /* __ASSEMBLER__ */
 #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */

arch/arm/plat-omap/include/plat/io.h +0 -4

index 0696bae..f5b386b 100644
@@ -266,10 +266,6 @@ extern void omap_writeb(u8 v, u32 pa);
 extern void omap_writew(u16 v, u32 pa);
 extern void omap_writel(u32 v, u32 pa);
 
-struct omap_sdrc_params;
-extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
-				      struct omap_sdrc_params *sdrc_cs1);
-
 extern void __init omap_init_consistent_dma_size(void);
 
 #endif

Tony Lindgren

author maintainer

2012-02-13 23:53 UTC #2 lore raw

PATCH 2/3 ARM: OMAP: Introduce omap-iomap.h and convert files depending on current io.h to use it

In reply to Tony Lindgren

Introduce omap-iomap.h and convert files depending on current io.h to use it.

This is needed to move most of io.h into omap-iomap.h in two smaller patches without breaking build and booting.

While at it, clean-up the include ordering to separate asm, plat, mach and local includes as the ordering has gotten confusing after earlier search and replace changes to introduce the local common.h header.

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/mach-omap1/ams-delta-fiq-handler.S    |    1 +
 arch/arm/mach-omap1/ams-delta-fiq.c            |    3 +++
 arch/arm/mach-omap1/board-ams-delta.c          |    7 +++++--
 arch/arm/mach-omap1/board-fsample.c            |    7 +++++--
 arch/arm/mach-omap1/board-h2.c                 |    7 ++++---
 arch/arm/mach-omap1/board-h3.c                 |    9 +++++----
 arch/arm/mach-omap1/board-htcherald.c          |    5 +++--
 arch/arm/mach-omap1/board-innovator.c          |    7 +++++--
 arch/arm/mach-omap1/board-nokia770.c           |    7 +++++--
 arch/arm/mach-omap1/board-osk.c                |    8 ++++----
 arch/arm/mach-omap1/board-palmte.c             |    5 ++++-
 arch/arm/mach-omap1/board-palmtt.c             |   10 ++++++----
 arch/arm/mach-omap1/board-palmz71.c            |   10 ++++++----
 arch/arm/mach-omap1/board-perseus2.c           |    7 +++++--
 arch/arm/mach-omap1/board-sx1.c                |    7 +++++--
 arch/arm/mach-omap1/board-voiceblue.c          |    7 +++++--
 arch/arm/mach-omap1/clock.c                    |    1 +
 arch/arm/mach-omap1/clock_data.c               |    1 +
 arch/arm/mach-omap1/devices.c                  |    8 +++++---
 arch/arm/mach-omap1/dma.c                      |    1 +
 arch/arm/mach-omap1/flash.c                    |    1 +
 arch/arm/mach-omap1/fpga.c                     |    4 +++-
 arch/arm/mach-omap1/id.c                       |    2 ++
 arch/arm/mach-omap1/include/mach/entry-macro.S |    4 +++-
 arch/arm/mach-omap1/io.c                       |    2 ++
 arch/arm/mach-omap1/irq.c                      |    5 ++++-
 arch/arm/mach-omap1/lcd_dma.c                  |    4 +++-
 arch/arm/mach-omap1/mcbsp.c                    |    4 +++-
 arch/arm/mach-omap1/pm.c                       |    6 ++++--
 arch/arm/mach-omap1/reset.c                    |    4 +++-
 arch/arm/mach-omap1/sleep.S                    |    5 +++++
 arch/arm/mach-omap1/sram.S                     |    4 ++++
 arch/arm/mach-omap1/time.c                     |    4 +++-
 arch/arm/mach-omap1/timer32k.c                 |    8 ++++++--
 arch/arm/mach-omap1/usb.c                      |    1 +
 arch/arm/mach-omap2/board-flash.c              |    1 +
 arch/arm/mach-omap2/clock2420_data.c           |    1 +
 arch/arm/mach-omap2/clock2430.c                |    1 +
 arch/arm/mach-omap2/clock2430_data.c           |    1 +
 arch/arm/mach-omap2/clock3xxx_data.c           |    1 +
 arch/arm/mach-omap2/clock44xx_data.c           |    2 ++
 arch/arm/mach-omap2/cm2xxx_3xxx.c              |    3 ++-
 arch/arm/mach-omap2/cm44xx.c                   |    3 ++-
 arch/arm/mach-omap2/cminst44xx.c               |    3 ++-
 arch/arm/mach-omap2/common.c                   |    3 ++-
 arch/arm/mach-omap2/control.c                  |    1 +
 arch/arm/mach-omap2/devices.c                  |    1 +
 arch/arm/mach-omap2/io.c                       |    3 ++-
 arch/arm/mach-omap2/irq.c                      |    5 ++++-
 arch/arm/mach-omap2/omap-smp.c                 |    4 +++-
 arch/arm/mach-omap2/pm24xx.c                   |    4 +++-
 arch/arm/mach-omap2/prcm_mpu44xx.c             |    3 ++-
 arch/arm/mach-omap2/prm44xx.c                  |    3 ++-
 arch/arm/mach-omap2/prminst44xx.c              |    3 ++-
 arch/arm/mach-omap2/sdrc2xxx.c                 |    5 +++--
 arch/arm/mach-omap2/sleep34xx.S                |    4 ++++
 arch/arm/mach-omap2/sram242x.S                 |    4 ++++
 arch/arm/mach-omap2/sram243x.S                 |    4 ++++
 arch/arm/mach-omap2/sram34xx.S                 |    5 ++++-
 arch/arm/plat-omap/devices.c                   |    4 +++-
 arch/arm/plat-omap/dma.c                       |    6 ++++--
 arch/arm/plat-omap/dmtimer.c                   |    1 +
 arch/arm/plat-omap/include/plat/omap-iomap.h   |    0 
 arch/arm/plat-omap/ocpi.c                      |    2 ++
 arch/arm/plat-omap/sram.c                      |    2 +-
 arch/arm/plat-omap/usb.c                       |    1 +
 drivers/gpio/gpio-omap.c                       |    7 +++++--
 drivers/pcmcia/omap_cf.c                       |    4 +++-
 drivers/spi/spi-omap-uwire.c                   |    4 +++-
 drivers/usb/host/ohci-omap.c                   |    6 ++++--
 drivers/usb/otg/isp1301_omap.c                 |    7 ++++---
 drivers/video/omap/lcd_ams_delta.c             |    2 ++
 drivers/video/omap/lcd_inn1510.c               |    2 ++
 drivers/video/omap/lcd_osk.c                   |    3 +++
 drivers/video/omap/lcdc.c                      |    7 ++++---
 drivers/video/omap/sossi.c                     |    1 +
 76 files changed, 223 insertions(+), 80 deletions(-)
 create mode 100644 arch/arm/plat-omap/include/plat/omap-iomap.h

arch/arm/mach-omap1/ams-delta-fiq-handler.S +1 -0

index c1c5fb6..878c27b 100644
@@ -15,6 +15,7 @@
 
 #include <linux/linkage.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/io.h>
 #include <plat/board-ams-delta.h>

arch/arm/mach-omap1/ams-delta-fiq.c +3 -0

index 152b32c..b909475 100644
@@ -22,6 +22,9 @@
 #include <plat/board-ams-delta.h>
 
 #include <asm/fiq.h>
+
+#include <plat/omap-iomap.h>
+
 #include <mach/ams-delta-fiq.h>
 
 static struct fiq_handler fh = {

arch/arm/mach-omap1/board-ams-delta.c +5 -2

index 88909cc..46700d9 100644
@@ -29,16 +29,19 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/io.h>
 #include <plat/board-ams-delta.h>
 #include <plat/keypad.h>
 #include <plat/mux.h>
 #include <plat/usb.h>
 #include <plat/board.h>
-#include "common.h"
-#include <mach/camera.h>
 
+#include <mach/hardware.h>
 #include <mach/ams-delta-fiq.h>
+#include <mach/camera.h>
+
+#include "common.h"
 
 static u8 ams_delta_latch1_reg;
 static u16 ams_delta_latch2_reg;

arch/arm/mach-omap1/board-fsample.c +5 -2

index 0b9464b..5c99339 100644
@@ -22,19 +22,22 @@
 #include <linux/input.h>
 #include <linux/smc91x.h>
 
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/tc.h>
 #include <plat/mux.h>
 #include <plat/flash.h>
 #include <plat/fpga.h>
 #include <plat/keypad.h>
-#include "common.h"
 #include <plat/board.h>
 
+#include <mach/hardware.h>
+
+#include "common.h"
+
 /* fsample is pretty close to p2-sample */
 
 #define fsample_cpld_read(reg) __raw_readb(reg)

arch/arm/mach-omap1/board-h2.c +4 -3

index 00ad6b2..8e3fa0d 100644
@@ -31,21 +31,22 @@
 #include <linux/i2c/tps65010.h>
 #include <linux/smc91x.h>
 
-#include <mach/hardware.h>
-
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/irda.h>
 #include <plat/usb.h>
 #include <plat/keypad.h>
-#include "common.h"
 #include <plat/flash.h>
 
+#include <mach/hardware.h>
+
+#include "common.h"
 #include "board-h2.h"
 
 /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */

arch/arm/mach-omap1/board-h3.c +5 -4

index 4a7f251..4400b10 100644
@@ -33,21 +33,22 @@
 
 #include <asm/setup.h>
 #include <asm/page.h>
-#include <mach/hardware.h>
-
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/irqs.h>
+#include <plat/omap-iomap.h>
 #include <plat/mux.h>
 #include <plat/tc.h>
 #include <plat/usb.h>
 #include <plat/keypad.h>
 #include <plat/dma.h>
-#include "common.h"
 #include <plat/flash.h>
 
+#include <mach/hardware.h>
+#include <mach/irqs.h>
+
+#include "common.h"
 #include "board-h3.h"
 
 /* In OMAP1710 H3 the Ethernet is directly connected to CS1 */

arch/arm/mach-omap1/board-htcherald.c +3 -2

index 731cc3d..0eb2c48 100644
@@ -28,6 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/input.h>
 #include <linux/io.h>
+#include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
 #include <linux/i2c.h>

@@ -40,8 +41,8 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/omap7xx.h>
-#include "common.h"
 #include <plat/board.h>
 #include <plat/keypad.h>
 #include <plat/usb.h>

@@ -49,7 +50,7 @@
 
 #include <mach/irqs.h>
 
-#include <linux/delay.h>
+#include "common.h"
 
 /* LCD register definition */
 #define       OMAP_LCDC_CONTROL               (0xfffec000 + 0x00)

arch/arm/mach-omap1/board-innovator.c +5 -2

index 309369e..445703e 100644
@@ -26,20 +26,23 @@
 #include <linux/input.h>
 #include <linux/smc91x.h>
 
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/mux.h>
 #include <plat/flash.h>
 #include <plat/fpga.h>
 #include <plat/tc.h>
 #include <plat/usb.h>
 #include <plat/keypad.h>
-#include "common.h"
 #include <plat/mmc.h>
 
+#include <mach/hardware.h>
+
+#include "common.h"
+
 /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
 #define INNOVATOR1610_ETHR_START	0x04000300

arch/arm/mach-omap1/board-nokia770.c +5 -2

index f9efc03..1024273 100644
@@ -21,21 +21,24 @@
 #include <linux/workqueue.h>
 #include <linux/delay.h>
 
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/mux.h>
 #include <plat/usb.h>
 #include <plat/board.h>
 #include <plat/keypad.h>
-#include "common.h"
 #include <plat/hwa742.h>
 #include <plat/lcd_mipid.h>
 #include <plat/mmc.h>
 #include <plat/clock.h>
 
+#include <mach/hardware.h>
+
+#include "common.h"
+
 #define ADS7846_PENDOWN_GPIO	15
 
 static const unsigned int nokia770_keymap[] = {

arch/arm/mach-omap1/board-osk.c +4 -4

index 675de06..fb41432 100644
@@ -34,23 +34,23 @@
 #include <linux/i2c.h>
 #include <linux/leds.h>
 #include <linux/smc91x.h>
-
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
-
 #include <linux/i2c/tps65010.h>
 
-#include <mach/hardware.h>
-
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/flash.h>
 #include <plat/usb.h>
 #include <plat/mux.h>
 #include <plat/tc.h>
+
+#include <mach/hardware.h>
+
 #include "common.h"
 
 /* At OMAP5912 OSK the Ethernet is directly connected to CS1 */

arch/arm/mach-omap1/board-palmte.c +4 -1

index 81fa27f..a6ba1ba 100644
@@ -28,11 +28,11 @@
 #include <linux/interrupt.h>
 #include <linux/apm-emulation.h>
 
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/flash.h>
 #include <plat/mux.h>
 #include <plat/usb.h>

@@ -41,6 +41,9 @@
 #include <plat/board.h>
 #include <plat/irda.h>
 #include <plat/keypad.h>
+
+#include <mach/hardware.h>
+
 #include "common.h"
 
 #define PALMTE_USBDETECT_GPIO	0

arch/arm/mach-omap1/board-palmtt.c +6 -4

index 81cb821..19a3d47 100644
@@ -24,12 +24,14 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/leds.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/ads7846.h>
 
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/led.h>
 #include <plat/flash.h>
 #include <plat/mux.h>

@@ -39,10 +41,10 @@
 #include <plat/board.h>
 #include <plat/irda.h>
 #include <plat/keypad.h>
-#include "common.h"
 
-#include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
+#include <mach/hardware.h>
+
+#include "common.h"
 
 #define PALMTT_USBDETECT_GPIO	0
 #define PALMTT_CABLE_GPIO	1

arch/arm/mach-omap1/board-palmz71.c +6 -4

index e881945..1352c84 100644
@@ -27,12 +27,14 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/ads7846.h>
 
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/flash.h>
 #include <plat/mux.h>
 #include <plat/usb.h>

@@ -41,10 +43,10 @@
 #include <plat/board.h>
 #include <plat/irda.h>
 #include <plat/keypad.h>
-#include "common.h"
 
-#include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
+#include <mach/hardware.h>
+
+#include "common.h"
 
 #define PALMZ71_USBDETECT_GPIO	0
 #define PALMZ71_PENIRQ_GPIO	6

arch/arm/mach-omap1/board-perseus2.c +5 -2

index c000bed..4e487f0 100644
@@ -22,19 +22,22 @@
 #include <linux/input.h>
 #include <linux/smc91x.h>
 
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/tc.h>
 #include <plat/mux.h>
 #include <plat/fpga.h>
 #include <plat/flash.h>
 #include <plat/keypad.h>
-#include "common.h"
 #include <plat/board.h>
 
+#include <mach/hardware.h>
+
+#include "common.h"
+
 static const unsigned int p2_keymap[] = {
 	KEY(0, 0, KEY_UP),
 	KEY(1, 0, KEY_RIGHT),

arch/arm/mach-omap1/board-sx1.c +5 -2

index 7bcd82a..446fb50 100644
@@ -28,11 +28,11 @@
 #include <linux/errno.h>
 #include <linux/export.h>
 
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/flash.h>
 #include <plat/mux.h>
 #include <plat/dma.h>

@@ -40,10 +40,13 @@
 #include <plat/usb.h>
 #include <plat/tc.h>
 #include <plat/board.h>
-#include "common.h"
 #include <plat/keypad.h>
 #include <plat/board-sx1.h>
 
+#include <mach/hardware.h>
+
+#include "common.h"
+
 /* Write to I2C device */
 int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value)
 {

arch/arm/mach-omap1/board-voiceblue.c +5 -2

index f83a502..8141c80 100644
@@ -27,18 +27,21 @@
 #include <linux/smc91x.h>
 #include <linux/export.h>
 
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/board-voiceblue.h>
-#include "common.h"
 #include <plat/flash.h>
 #include <plat/mux.h>
 #include <plat/tc.h>
 #include <plat/usb.h>
 
+#include <mach/hardware.h>
+
+#include "common.h"
+
 static struct plat_serial8250_port voiceblue_ports[] = {
 	{
 		.mapbase	= (unsigned long)(OMAP_CS1_PHYS + 0x40000),

arch/arm/mach-omap1/clock.c +1 -0

index 0c50df0..6305604 100644
@@ -21,6 +21,7 @@
 
 #include <asm/mach-types.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/cpu.h>
 #include <plat/usb.h>
 #include <plat/clock.h>

arch/arm/mach-omap1/clock_data.c +1 -0

index 94699a8..99463f4 100644
@@ -22,6 +22,7 @@
 
 #include <asm/mach-types.h>  /* for machine_is_* */
 
+#include <plat/omap-iomap.h>
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/clkdev_omap.h>

arch/arm/mach-omap1/devices.c +5 -3

index 1d76a63..efbf656 100644
@@ -18,11 +18,9 @@
 #include <linux/io.h>
 #include <linux/spi/spi.h>
 
-#include <mach/camera.h>
-#include <mach/hardware.h>
 #include <asm/mach/map.h>
 
-#include "common.h"
+#include <plat/omap-iomap.h>
 #include <plat/tc.h>
 #include <plat/board.h>
 #include <plat/mux.h>

@@ -30,6 +28,10 @@
 #include <plat/omap7xx.h>
 #include <plat/mcbsp.h>
 
+#include <mach/camera.h>
+#include <mach/hardware.h>
+
+#include "common.h"
 #include "clock.h"
 
 /*-------------------------------------------------------------------------*/

arch/arm/mach-omap1/dma.c +1 -0

index f5a5220..62ccd7f 100644
@@ -25,6 +25,7 @@
 #include <linux/init.h>
 #include <linux/device.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/irqs.h>

arch/arm/mach-omap1/flash.c +1 -0

index 1749cb3..68becc4 100644
@@ -9,6 +9,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/io.h>
 #include <plat/tc.h>
 #include <plat/flash.h>

arch/arm/mach-omap1/fpga.c +3 -1

index 0a17a1a..2b2cdd0 100644
@@ -24,12 +24,14 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 
-#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/fpga.h>
 
+#include <mach/hardware.h>
+
 static void fpga_mask_irq(struct irq_data *d)
 {
 	unsigned int irq = d->irq - OMAP_FPGA_IRQ_BASE;

arch/arm/mach-omap1/id.c +2 -0

index a0e3560..3e8c628 100644
@@ -15,6 +15,8 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
+
+#include <plat/omap-iomap.h>
 #include <plat/cpu.h>
 
 #define OMAP_DIE_ID_0		0xfffe1800

arch/arm/mach-omap1/include/mach/entry-macro.S +3 -1

index bfb4fb1..ef18af6 100644
@@ -9,10 +9,12 @@
  * License version 2. This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
+
+#include <plat/omap-iomap.h>
+
 #include <mach/hardware.h>
 #include <mach/io.h>
 #include <mach/irqs.h>
-#include <asm/hardware/gic.h>
 
  		.macro	disable_fiq
 		.endm

arch/arm/mach-omap1/io.c +2 -0

index 8e55b6f..331b042 100644
@@ -15,6 +15,8 @@
 
 #include <asm/tlb.h>
 #include <asm/mach/map.h>
+
+#include <plat/omap-iomap.h>
 #include <plat/mux.h>
 #include <plat/tc.h>

arch/arm/mach-omap1/irq.c +4 -1

index e5b104b..dd3c053 100644
@@ -42,11 +42,14 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 
-#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
+
+#include <plat/omap-iomap.h>
 #include <plat/cpu.h>
 
+#include <mach/hardware.h>
+
 #define IRQ_BANK(irq) ((irq) >> 5)
 #define IRQ_BIT(irq)  ((irq) & 0x1f)

arch/arm/mach-omap1/lcd_dma.c +3 -1

index 4538093..aa4fe35 100644
@@ -27,9 +27,11 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 
+#include <plat/omap-iomap.h>
+#include <plat/dma.h>
+
 #include <mach/hardware.h>
 #include <mach/lcdc.h>
-#include <plat/dma.h>
 
 int omap_lcd_dma_running(void)
 {

arch/arm/mach-omap1/mcbsp.c +3 -1

index 91f9abb..30fb3ac 100644
@@ -19,12 +19,14 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
-#include <mach/irqs.h>
+#include <plat/omap-iomap.h>
 #include <plat/dma.h>
 #include <plat/mux.h>
 #include <plat/cpu.h>
 #include <plat/mcbsp.h>
 
+#include <mach/irqs.h>
+
 #define DPS_RSTCT2_PER_EN	(1 << 0)
 #define DSP_RSTCT2_WD_PER_EN	(1 << 1)

arch/arm/mach-omap1/pm.c +4 -2

index 89ea20c..9bdbddb 100644
@@ -42,14 +42,14 @@
 #include <linux/sysfs.h>
 #include <linux/module.h>
 #include <linux/io.h>
+#include <linux/atomic.h>
 
 #include <asm/irq.h>
-#include <linux/atomic.h>
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/cpu.h>
-#include <mach/irqs.h>
 #include <plat/clock.h>
 #include <plat/sram.h>
 #include <plat/tc.h>

@@ -57,6 +57,8 @@
 #include <plat/dma.h>
 #include <plat/dmtimer.h>
 
+#include <mach/irqs.h>
+
 #include "pm.h"
 
 static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE];

arch/arm/mach-omap1/reset.c +3 -1

index 91d199b..eed1e32 100644
@@ -4,9 +4,11 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
 
-#include <mach/hardware.h>
+#include <plat/omap-iomap.h>
 #include <plat/prcm.h>
 
+#include <mach/hardware.h>
+
 void omap1_restart(char mode, const char *cmd)
 {
 	/*

arch/arm/mach-omap1/sleep.S +5 -0

index c875bdc..dd67918 100644
@@ -33,8 +33,13 @@
  */
 
 #include <linux/linkage.h>
+
 #include <asm/assembler.h>
+
+#include <plat/omap-iomap.h>
+
 #include <mach/io.h>
+
 #include "pm.h"
 
 		.text

arch/arm/mach-omap1/sram.S +4 -0

index 692587d..17a9451 100644
@@ -9,7 +9,11 @@
  */
 
 #include <linux/linkage.h>
+
 #include <asm/assembler.h>
+
+#include <plat/omap-iomap.h>
+
 #include <mach/io.h>
 #include <mach/hardware.h>

arch/arm/mach-omap1/time.c +3 -1

index b8faffa..24e0a70 100644
@@ -45,11 +45,13 @@
 #include <linux/io.h>
 
 #include <asm/system.h>
-#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/irq.h>
 #include <asm/sched_clock.h>
 
+#include <plat/omap-iomap.h>
+
+#include <mach/hardware.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>

arch/arm/mach-omap1/timer32k.c +6 -2

index 9a54ef4..6dd1274 100644
@@ -47,14 +47,18 @@
 #include <linux/io.h>
 
 #include <asm/system.h>
-#include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
-#include "common.h"
+
+#include <plat/omap-iomap.h>
 #include <plat/dmtimer.h>
 
+#include <mach/hardware.h>
+
+#include "common.h"
+
 /*
  * ---------------------------------------------------------------------------
  * 32KHz OS timer

arch/arm/mach-omap1/usb.c +1 -0

index 19de03b..f4d3b31 100644
@@ -26,6 +26,7 @@
 
 #include <asm/irq.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/mux.h>
 #include <plat/usb.h>

arch/arm/mach-omap2/board-flash.c +1 -0

index 30a6f52..48a9edd 100644
@@ -18,6 +18,7 @@
 #include <linux/io.h>
 #include <plat/irqs.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/gpmc.h>
 #include <plat/nand.h>
 #include <plat/onenand.h>

arch/arm/mach-omap2/clock2420_data.c +1 -0

index 61ad385..81966fc 100644
@@ -17,6 +17,7 @@
 #include <linux/clk.h>
 #include <linux/list.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/clkdev_omap.h>
 
 #include "clock.h"

arch/arm/mach-omap2/clock2430.c +1 -0

index d87bc9c..5fbb189 100644
@@ -21,6 +21,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/clock.h>
 
 #include "clock.h"

arch/arm/mach-omap2/clock2430_data.c +1 -0

index 0cc1287..472f49b 100644
@@ -17,6 +17,7 @@
 #include <linux/clk.h>
 #include <linux/list.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/clkdev_omap.h>
 
 #include "clock.h"

arch/arm/mach-omap2/clock3xxx_data.c +1 -0

index d75e5f6..836ca17 100644
@@ -20,6 +20,7 @@
 #include <linux/clk.h>
 #include <linux/list.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/clkdev_omap.h>
 
 #include "clock.h"

arch/arm/mach-omap2/clock44xx_data.c +2 -0

index 08e86d7..f5bad14 100644
@@ -26,6 +26,8 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/clk.h>
+
+#include <plat/omap-iomap.h>
 #include <plat/clkdev_omap.h>
 
 #include "clock.h"

arch/arm/mach-omap2/cm2xxx_3xxx.c +2 -1

index 04d39cd..ec3224b 100644
@@ -18,8 +18,9 @@
 #include <linux/err.h>
 #include <linux/io.h>
 
-#include "common.h"
+#include <plat/omap-iomap.h>
 
+#include "common.h"
 #include "cm.h"
 #include "cm2xxx_3xxx.h"
 #include "cm-regbits-24xx.h"

arch/arm/mach-omap2/cm44xx.c +2 -1

index 6a83630..cb01011 100644
@@ -18,8 +18,9 @@
 #include <linux/err.h>
 #include <linux/io.h>
 
-#include "common.h"
+#include <plat/omap-iomap.h>
 
+#include "common.h"
 #include "cm.h"
 #include "cm1_44xx.h"
 #include "cm2_44xx.h"

arch/arm/mach-omap2/cminst44xx.c +2 -1

index 6204dea..27de63d 100644
@@ -20,8 +20,9 @@
 #include <linux/err.h>
 #include <linux/io.h>
 
-#include "common.h"
+#include <plat/omap-iomap.h>
 
+#include "common.h"
 #include "cm.h"
 #include "cm1_44xx.h"
 #include "cm2_44xx.h"

arch/arm/mach-omap2/common.c +2 -1

index aaf4211..1591153 100644
@@ -17,12 +17,13 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include "common.h"
+#include <plat/omap-iomap.h>
 #include <plat/board.h>
 #include <plat/mux.h>
 
 #include <plat/clock.h>
 
+#include "common.h"
 #include "sdrc.h"
 #include "control.h"

arch/arm/mach-omap2/control.c +1 -0

index 114c037..f2b304f 100644
@@ -16,6 +16,7 @@
 #include <linux/io.h>
 
 #include "common.h"
+#include <plat/omap-iomap.h>
 #include <plat/sdrc.h>
 
 #include "cm-regbits-34xx.h"

arch/arm/mach-omap2/devices.c +1 -0

index 283d11e..f87c94f 100644
@@ -24,6 +24,7 @@
 #include <asm/mach/map.h>
 #include <asm/pmu.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/tc.h>
 #include <plat/board.h>
 #include <plat/mcbsp.h>

arch/arm/mach-omap2/io.c +2 -1

index eb50c29..2fd855d 100644
@@ -27,6 +27,7 @@
 
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/sram.h>
 #include <plat/sdrc.h>
 #include <plat/serial.h>

@@ -35,7 +36,7 @@
 #include "clock3xxx.h"
 #include "clock44xx.h"
 
-#include "common.h"
+#include <plat/omap-iomap.h>
 #include <plat/omap-pm.h>
 #include "voltage.h"
 #include "powerdomain.h"

arch/arm/mach-omap2/irq.c +4 -1

index 1fef061..6eca959 100644
@@ -14,10 +14,13 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <mach/hardware.h>
+
 #include <asm/exception.h>
 #include <asm/mach/irq.h>
 
+#include <plat/omap-iomap.h>
+
+#include <mach/hardware.h>
 
 /* selected INTC register offsets */

arch/arm/mach-omap2/omap-smp.c +3 -1

index c1bf3ef..d687c84 100644
@@ -23,11 +23,13 @@
 #include <asm/cacheflush.h>
 #include <asm/hardware/gic.h>
 #include <asm/smp_scu.h>
+
+#include <plat/omap-iomap.h>
+
 #include <mach/hardware.h>
 #include <mach/omap-secure.h>
 
 #include "common.h"
-
 #include "clockdomain.h"
 
 /* SCU base address */

arch/arm/mach-omap2/pm24xx.c +3 -1

index b8822f8..971d10d 100644
@@ -35,12 +35,14 @@
 #include <asm/mach/irq.h>
 #include <asm/mach-types.h>
 
-#include <mach/irqs.h>
+#include <plat/omap-iomap.h>
 #include <plat/clock.h>
 #include <plat/sram.h>
 #include <plat/dma.h>
 #include <plat/board.h>
 
+#include <mach/irqs.h>
+
 #include "common.h"
 #include "prm2xxx_3xxx.h"
 #include "prm-regbits-24xx.h"

arch/arm/mach-omap2/prcm_mpu44xx.c +2 -1

index ca669b5..993f567 100644
@@ -15,8 +15,9 @@
 #include <linux/err.h>
 #include <linux/io.h>
 
-#include "common.h"
+#include <plat/omap-iomap.h>
 
+#include "common.h"
 #include "prcm_mpu44xx.h"
 #include "cm-regbits-44xx.h"

arch/arm/mach-omap2/prm44xx.c +2 -1

index 33dd655..418f90a 100644
@@ -17,10 +17,11 @@
 #include <linux/err.h>
 #include <linux/io.h>
 
-#include "common.h"
+#include <plat/omap-iomap.h>
 #include <plat/cpu.h>
 #include <plat/prcm.h>
 
+#include "common.h"
 #include "vp.h"
 #include "prm44xx.h"
 #include "prm-regbits-44xx.h"

arch/arm/mach-omap2/prminst44xx.c +2 -1

index f6de5bc..e79bfb3 100644
@@ -16,8 +16,9 @@
 #include <linux/err.h>
 #include <linux/io.h>
 
-#include "common.h"
+#include <plat/omap-iomap.h>
 
+#include "common.h"
 #include "prm44xx.h"
 #include "prminst44xx.h"
 #include "prm-regbits-44xx.h"

arch/arm/mach-omap2/sdrc2xxx.c +3 -2

index 791a63c..f588c3e 100644
@@ -24,13 +24,14 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include "common.h"
+#include <plat/omap-iomap.h>
 #include <plat/clock.h>
 #include <plat/sram.h>
+#include <plat/sdrc.h>
 
+#include "common.h"
 #include "prm2xxx_3xxx.h"
 #include "clock.h"
-#include <plat/sdrc.h>
 #include "sdrc.h"
 
 /* Memory timing, DLL mode flags */

arch/arm/mach-omap2/sleep34xx.S +4 -0

index f2ea1bd..bc4048f 100644
@@ -23,8 +23,12 @@
  * MA 02111-1307 USA
  */
 #include <linux/linkage.h>
+
 #include <asm/assembler.h>
+
+#include <plat/omap-iomap.h>
 #include <plat/sram.h>
+
 #include <mach/io.h>
 
 #include "cm2xxx_3xxx.h"

arch/arm/mach-omap2/sram242x.S +4 -0

index ff9b9db..e3cb8e2 100644
@@ -29,7 +29,11 @@
  * These crashes may be intermittent.
  */
 #include <linux/linkage.h>
+
 #include <asm/assembler.h>
+
+#include <plat/omap-iomap.h>
+
 #include <mach/io.h>
 #include <mach/hardware.h>

arch/arm/mach-omap2/sram243x.S +4 -0

index 7673020..6748584 100644
@@ -29,7 +29,11 @@
  * These crashes may be intermittent.
  */
 #include <linux/linkage.h>
+
 #include <asm/assembler.h>
+
+#include <plat/omap-iomap.h>
+
 #include <mach/io.h>
 #include <mach/hardware.h>

arch/arm/mach-omap2/sram34xx.S +4 -1

index 6f5849a..d981b99 100644
@@ -26,9 +26,12 @@
  * MA 02111-1307 USA
  */
 #include <linux/linkage.h>
+
 #include <asm/assembler.h>
-#include <mach/hardware.h>
 
+#include <plat/omap-iomap.h>
+
+#include <mach/hardware.h>
 #include <mach/io.h>
 
 #include "sdrc.h"

arch/arm/plat-omap/devices.c +3 -1

index 60278f4..94beb28 100644
@@ -17,17 +17,19 @@
 #include <linux/slab.h>
 #include <linux/memblock.h>
 
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 #include <asm/memblock.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/tc.h>
 #include <plat/board.h>
 #include <plat/mmc.h>
 #include <plat/menelaus.h>
 #include <plat/omap44xx.h>
 
+#include <mach/hardware.h>
+
 #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
 	defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)

arch/arm/plat-omap/dma.c +4 -2

index 002fb4d..424ab8a 100644
@@ -37,11 +37,13 @@
 #include <linux/delay.h>
 
 #include <asm/system.h>
-#include <mach/hardware.h>
-#include <plat/dma.h>
 
+#include <plat/omap-iomap.h>
+#include <plat/dma.h>
 #include <plat/tc.h>
 
+#include <mach/hardware.h>
+
 #undef DEBUG
 
 #ifndef CONFIG_ARCH_OMAP1

arch/arm/plat-omap/dmtimer.c +1 -0

index af3b92b..402f4ea 100644
@@ -41,6 +41,7 @@
 #include <linux/err.h>
 #include <linux/pm_runtime.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/dmtimer.h>
 
 static LIST_HEAD(omap_timer_list);

arch/arm/plat-omap/include/plat/omap-iomap.h new file +0 -0

new file mode 100644
index 0000000..e69de29

arch/arm/plat-omap/ocpi.c +2 -0

index ebe0c73..fa48ee7 100644
@@ -33,6 +33,8 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
+#include <plat/omap-iomap.h>
+
 #include <mach/hardware.h>
 
 #define OCPI_BASE		0xfffec320

arch/arm/plat-omap/sram.c +1 -1

index 4243bdc..1516f76 100644
@@ -22,9 +22,9 @@
 
 #include <asm/tlb.h>
 #include <asm/cacheflush.h>
-
 #include <asm/mach/map.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/sram.h>
 #include <plat/board.h>
 #include <plat/cpu.h>

arch/arm/plat-omap/usb.c +1 -0

index f357088..0a2fe67 100644
@@ -26,6 +26,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/usb.h>
 #include <plat/board.h>

drivers/gpio/gpio-omap.c +5 -2

index 0b05629..e704bea 100644
@@ -22,12 +22,15 @@
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
 
-#include <mach/hardware.h>
 #include <asm/irq.h>
-#include <mach/irqs.h>
 #include <asm/gpio.h>
 #include <asm/mach/irq.h>
 
+#include <plat/omap-iomap.h>
+
+#include <mach/hardware.h>
+#include <mach/irqs.h>
+
 struct gpio_bank {
 	unsigned long pbase;
 	void __iomem *base;

drivers/pcmcia/omap_cf.c +3 -1

index 0ad06a3..ba71697 100644
@@ -20,13 +20,15 @@
 
 #include <pcmcia/ss.h>
 
-#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/mux.h>
 #include <plat/tc.h>
 
+#include <mach/hardware.h>
+
 
 /* NOTE:  don't expect this to support many I/O cards.  The 16xx chips have
  * hard-wired timings to support Compact Flash memory cards; they won't work

drivers/spi/spi-omap-uwire.c +3 -1

index 610f739..6ad597f 100644
@@ -49,13 +49,15 @@
 
 #include <asm/system.h>
 #include <asm/irq.h>
-#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/mux.h>
 #include <plat/omap7xx.h>	/* OMAP7XX_IO_CONF registers */
 
+#include <mach/hardware.h>
+
 
 /* FIXME address is now a platform device resource,
  * and irqs should show there too...

drivers/usb/host/ohci-omap.c +4 -2

index db39686..021108a 100644
@@ -20,15 +20,17 @@
 #include <linux/clk.h>
 #include <linux/gpio.h>
 
-#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/mux.h>
-#include <mach/irqs.h>
 #include <plat/fpga.h>
 #include <plat/usb.h>
 
+#include <mach/hardware.h>
+#include <mach/irqs.h>
+
 
 /* OMAP-1510 OHCI has its own MMU for DMA */
 #define OMAP1510_LB_MEMSIZE	32	/* Should be same as SDRAM size */

drivers/usb/otg/isp1301_omap.c +4 -3

index 8c86787..910b7a7 100644
@@ -33,12 +33,13 @@
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
 
-#include <asm/irq.h>
-#include <asm/mach-types.h>
-
+#include <plat/omap-iomap.h>
 #include <plat/usb.h>
 #include <plat/mux.h>
 
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+
 
 #ifndef	DEBUG
 #undef	VERBOSE

drivers/video/omap/lcd_ams_delta.c +2 -0

index 0fdd6f6..3c7f16f 100644
@@ -26,7 +26,9 @@
 #include <linux/delay.h>
 #include <linux/lcd.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/board-ams-delta.h>
+
 #include <mach/hardware.h>
 
 #include "omapfb.h"

drivers/video/omap/lcd_inn1510.c +2 -0

index b38b1dd..f4e77fe 100644
@@ -23,7 +23,9 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/fpga.h>
+
 #include "omapfb.h"
 
 static int innovator1510_panel_init(struct lcd_panel *panel,

drivers/video/omap/lcd_osk.c +3 -0

index 5914220..c35a789 100644
@@ -25,6 +25,9 @@
 
 #include <asm/gpio.h>
 #include <plat/mux.h>
+
+#include <plat/omap-iomap.h>
+
 #include "omapfb.h"
 
 static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)

drivers/video/omap/lcdc.c +4 -3

index 7767338..a884663 100644
@@ -30,13 +30,14 @@
 #include <linux/clk.h>
 #include <linux/gfp.h>
 
-#include <mach/lcdc.h>
+#include <asm/mach-types.h>
+
+#include <plat/omap-iomap.h>
 #include <plat/dma.h>
 
-#include <asm/mach-types.h>
+#include <mach/lcdc.h>
 
 #include "omapfb.h"
-
 #include "lcdc.h"
 
 #define MODULE_NAME			"lcdc"

drivers/video/omap/sossi.c +1 -0

index f79c137..43263f5 100644
@@ -25,6 +25,7 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 
+#include <plat/omap-iomap.h>
 #include <plat/dma.h>
 
 #include "omapfb.h"

Tony Lindgren

author maintainer

2012-02-13 23:53 UTC #3 lore raw

PATCH 3/3 ARM: OMAP: Move most of io.h to omap-iomap.h

In reply to Tony Lindgren

Move most of io.h to omap-iomap.h. This is needed
for the ARM generic removal of io.h files.

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/plat-omap/include/plat/io.h         |  222 --------------------------
 arch/arm/plat-omap/include/plat/omap-iomap.h |  221 ++++++++++++++++++++++++++
 2 files changed, 221 insertions(+), 222 deletions(-)

arch/arm/plat-omap/include/plat/io.h +0 ~~-222~~

index f5b386b..6a3c700 100644
@@ -48,226 +48,4 @@
 #define __io(a)		__typesafe_io(a)
 #define __mem_pci(a)	(a)
 
-/*
- * ----------------------------------------------------------------------------
- * I/O mapping
- * ----------------------------------------------------------------------------
- */
-
-#ifdef __ASSEMBLER__
-#define IOMEM(x)		(x)
-#else
-#define IOMEM(x)		((void __force __iomem *)(x))
-#endif
-
-#define OMAP1_IO_OFFSET		0x01000000	/* Virtual IO = 0xfefb0000 */
-#define OMAP1_IO_ADDRESS(pa)	IOMEM((pa) - OMAP1_IO_OFFSET)
-
-#define OMAP2_L3_IO_OFFSET	0x90000000
-#define OMAP2_L3_IO_ADDRESS(pa)	IOMEM((pa) + OMAP2_L3_IO_OFFSET) /* L3 */
-
-
-#define OMAP2_L4_IO_OFFSET	0xb2000000
-#define OMAP2_L4_IO_ADDRESS(pa)	IOMEM((pa) + OMAP2_L4_IO_OFFSET) /* L4 */
-
-#define OMAP4_L3_IO_OFFSET	0xb4000000
-#define OMAP4_L3_IO_ADDRESS(pa)	IOMEM((pa) + OMAP4_L3_IO_OFFSET) /* L3 */
-
-#define AM33XX_L4_WK_IO_OFFSET	0xb5000000
-#define AM33XX_L4_WK_IO_ADDRESS(pa)	IOMEM((pa) + AM33XX_L4_WK_IO_OFFSET)
-
-#define OMAP4_L3_PER_IO_OFFSET	0xb1100000
-#define OMAP4_L3_PER_IO_ADDRESS(pa)	IOMEM((pa) + OMAP4_L3_PER_IO_OFFSET)
-
-#define OMAP4_GPMC_IO_OFFSET		0xa9000000
-#define OMAP4_GPMC_IO_ADDRESS(pa)	IOMEM((pa) + OMAP4_GPMC_IO_OFFSET)
-
-#define OMAP2_EMU_IO_OFFSET		0xaa800000	/* Emulation */
-#define OMAP2_EMU_IO_ADDRESS(pa)	IOMEM((pa) + OMAP2_EMU_IO_OFFSET)
-
-/*
- * ----------------------------------------------------------------------------
- * Omap1 specific IO mapping
- * ----------------------------------------------------------------------------
- */
-
-#define OMAP1_IO_PHYS		0xFFFB0000
-#define OMAP1_IO_SIZE		0x40000
-#define OMAP1_IO_VIRT		(OMAP1_IO_PHYS - OMAP1_IO_OFFSET)
-
-/*
- * ----------------------------------------------------------------------------
- * Omap2 specific IO mapping
- * ----------------------------------------------------------------------------
- */
-
-/* We map both L3 and L4 on OMAP2 */
-#define L3_24XX_PHYS	L3_24XX_BASE	/* 0x68000000 --> 0xf8000000*/
-#define L3_24XX_VIRT	(L3_24XX_PHYS + OMAP2_L3_IO_OFFSET)
-#define L3_24XX_SIZE	SZ_1M		/* 44kB of 128MB used, want 1MB sect */
-#define L4_24XX_PHYS	L4_24XX_BASE	/* 0x48000000 --> 0xfa000000 */
-#define L4_24XX_VIRT	(L4_24XX_PHYS + OMAP2_L4_IO_OFFSET)
-#define L4_24XX_SIZE	SZ_1M		/* 1MB of 128MB used, want 1MB sect */
-
-#define L4_WK_243X_PHYS		L4_WK_243X_BASE	/* 0x49000000 --> 0xfb000000 */
-#define L4_WK_243X_VIRT		(L4_WK_243X_PHYS + OMAP2_L4_IO_OFFSET)
-#define L4_WK_243X_SIZE		SZ_1M
-#define OMAP243X_GPMC_PHYS	OMAP243X_GPMC_BASE
-#define OMAP243X_GPMC_VIRT	(OMAP243X_GPMC_PHYS + OMAP2_L3_IO_OFFSET)
-						/* 0x6e000000 --> 0xfe000000 */
-#define OMAP243X_GPMC_SIZE	SZ_1M
-#define OMAP243X_SDRC_PHYS	OMAP243X_SDRC_BASE
-						/* 0x6D000000 --> 0xfd000000 */
-#define OMAP243X_SDRC_VIRT	(OMAP243X_SDRC_PHYS + OMAP2_L3_IO_OFFSET)
-#define OMAP243X_SDRC_SIZE	SZ_1M
-#define OMAP243X_SMS_PHYS	OMAP243X_SMS_BASE
-						/* 0x6c000000 --> 0xfc000000 */
-#define OMAP243X_SMS_VIRT	(OMAP243X_SMS_PHYS + OMAP2_L3_IO_OFFSET)
-#define OMAP243X_SMS_SIZE	SZ_1M
-
-/* 2420 IVA */
-#define DSP_MEM_2420_PHYS	OMAP2420_DSP_MEM_BASE
-						/* 0x58000000 --> 0xfc100000 */
-#define DSP_MEM_2420_VIRT	0xfc100000
-#define DSP_MEM_2420_SIZE	0x28000
-#define DSP_IPI_2420_PHYS	OMAP2420_DSP_IPI_BASE
-						/* 0x59000000 --> 0xfc128000 */
-#define DSP_IPI_2420_VIRT	0xfc128000
-#define DSP_IPI_2420_SIZE	SZ_4K
-#define DSP_MMU_2420_PHYS	OMAP2420_DSP_MMU_BASE
-						/* 0x5a000000 --> 0xfc129000 */
-#define DSP_MMU_2420_VIRT	0xfc129000
-#define DSP_MMU_2420_SIZE	SZ_4K
-
-/* 2430 IVA2.1 - currently unmapped */
-
-/*
- * ----------------------------------------------------------------------------
- * Omap3 specific IO mapping
- * ----------------------------------------------------------------------------
- */
-
-/* We map both L3 and L4 on OMAP3 */
-#define L3_34XX_PHYS		L3_34XX_BASE	/* 0x68000000 --> 0xf8000000 */
-#define L3_34XX_VIRT		(L3_34XX_PHYS + OMAP2_L3_IO_OFFSET)
-#define L3_34XX_SIZE		SZ_1M   /* 44kB of 128MB used, want 1MB sect */
-
-#define L4_34XX_PHYS		L4_34XX_BASE	/* 0x48000000 --> 0xfa000000 */
-#define L4_34XX_VIRT		(L4_34XX_PHYS + OMAP2_L4_IO_OFFSET)
-#define L4_34XX_SIZE		SZ_4M   /* 1MB of 128MB used, want 1MB sect */
-
-/*
- * ----------------------------------------------------------------------------
- * AM33XX specific IO mapping
- * ----------------------------------------------------------------------------
- */
-#define L4_WK_AM33XX_PHYS	L4_WK_AM33XX_BASE
-#define L4_WK_AM33XX_VIRT	(L4_WK_AM33XX_PHYS + AM33XX_L4_WK_IO_OFFSET)
-#define L4_WK_AM33XX_SIZE	SZ_4M   /* 1MB of 128MB used, want 1MB sect */
-
-/*
- * Need to look at the Size 4M for L4.
- * VPOM3430 was not working for Int controller
- */
-
-#define L4_PER_34XX_PHYS	L4_PER_34XX_BASE
-						/* 0x49000000 --> 0xfb000000 */
-#define L4_PER_34XX_VIRT	(L4_PER_34XX_PHYS + OMAP2_L4_IO_OFFSET)
-#define L4_PER_34XX_SIZE	SZ_1M
-
-#define L4_EMU_34XX_PHYS	L4_EMU_34XX_BASE
-						/* 0x54000000 --> 0xfe800000 */
-#define L4_EMU_34XX_VIRT	(L4_EMU_34XX_PHYS + OMAP2_EMU_IO_OFFSET)
-#define L4_EMU_34XX_SIZE	SZ_8M
-
-#define OMAP34XX_GPMC_PHYS	OMAP34XX_GPMC_BASE
-						/* 0x6e000000 --> 0xfe000000 */
-#define OMAP34XX_GPMC_VIRT	(OMAP34XX_GPMC_PHYS + OMAP2_L3_IO_OFFSET)
-#define OMAP34XX_GPMC_SIZE	SZ_1M
-
-#define OMAP343X_SMS_PHYS	OMAP343X_SMS_BASE
-						/* 0x6c000000 --> 0xfc000000 */
-#define OMAP343X_SMS_VIRT	(OMAP343X_SMS_PHYS + OMAP2_L3_IO_OFFSET)
-#define OMAP343X_SMS_SIZE	SZ_1M
-
-#define OMAP343X_SDRC_PHYS	OMAP343X_SDRC_BASE
-						/* 0x6D000000 --> 0xfd000000 */
-#define OMAP343X_SDRC_VIRT	(OMAP343X_SDRC_PHYS + OMAP2_L3_IO_OFFSET)
-#define OMAP343X_SDRC_SIZE	SZ_1M
-
-/* 3430 IVA - currently unmapped */
-
-/*
- * ----------------------------------------------------------------------------
- * Omap4 specific IO mapping
- * ----------------------------------------------------------------------------
- */
-
-/* We map both L3 and L4 on OMAP4 */
-#define L3_44XX_PHYS		L3_44XX_BASE	/* 0x44000000 --> 0xf8000000 */
-#define L3_44XX_VIRT		(L3_44XX_PHYS + OMAP4_L3_IO_OFFSET)
-#define L3_44XX_SIZE		SZ_1M
-
-#define L4_44XX_PHYS		L4_44XX_BASE	/* 0x4a000000 --> 0xfc000000 */
-#define L4_44XX_VIRT		(L4_44XX_PHYS + OMAP2_L4_IO_OFFSET)
-#define L4_44XX_SIZE		SZ_4M
-
-#define L4_PER_44XX_PHYS	L4_PER_44XX_BASE
-						/* 0x48000000 --> 0xfa000000 */
-#define L4_PER_44XX_VIRT	(L4_PER_44XX_PHYS + OMAP2_L4_IO_OFFSET)
-#define L4_PER_44XX_SIZE	SZ_4M
-
-#define L4_ABE_44XX_PHYS	L4_ABE_44XX_BASE
-						/* 0x49000000 --> 0xfb000000 */
-#define L4_ABE_44XX_VIRT	(L4_ABE_44XX_PHYS + OMAP2_L4_IO_OFFSET)
-#define L4_ABE_44XX_SIZE	SZ_1M
-
-#define L4_EMU_44XX_PHYS	L4_EMU_44XX_BASE
-						/* 0x54000000 --> 0xfe800000 */
-#define L4_EMU_44XX_VIRT	(L4_EMU_44XX_PHYS + OMAP2_EMU_IO_OFFSET)
-#define L4_EMU_44XX_SIZE	SZ_8M
-
-#define OMAP44XX_GPMC_PHYS	OMAP44XX_GPMC_BASE
-						/* 0x50000000 --> 0xf9000000 */
-#define OMAP44XX_GPMC_VIRT	(OMAP44XX_GPMC_PHYS + OMAP4_GPMC_IO_OFFSET)
-#define OMAP44XX_GPMC_SIZE	SZ_1M
-
-
-#define OMAP44XX_EMIF1_PHYS	OMAP44XX_EMIF1_BASE
-						/* 0x4c000000 --> 0xfd100000 */
-#define OMAP44XX_EMIF1_VIRT	(OMAP44XX_EMIF1_PHYS + OMAP4_L3_PER_IO_OFFSET)
-#define OMAP44XX_EMIF1_SIZE	SZ_1M
-
-#define OMAP44XX_EMIF2_PHYS	OMAP44XX_EMIF2_BASE
-						/* 0x4d000000 --> 0xfd200000 */
-#define OMAP44XX_EMIF2_SIZE	SZ_1M
-#define OMAP44XX_EMIF2_VIRT	(OMAP44XX_EMIF1_VIRT + OMAP44XX_EMIF1_SIZE)
-
-#define OMAP44XX_DMM_PHYS	OMAP44XX_DMM_BASE
-						/* 0x4e000000 --> 0xfd300000 */
-#define OMAP44XX_DMM_SIZE	SZ_1M
-#define OMAP44XX_DMM_VIRT	(OMAP44XX_EMIF2_VIRT + OMAP44XX_EMIF2_SIZE)
-/*
- * ----------------------------------------------------------------------------
- * Omap specific register access
- * ----------------------------------------------------------------------------
- */
-
-#ifndef __ASSEMBLER__
-
-/*
- * NOTE: Please use ioremap + __raw_read/write where possible instead of these
- */
-
-extern u8 omap_readb(u32 pa);
-extern u16 omap_readw(u32 pa);
-extern u32 omap_readl(u32 pa);
-extern void omap_writeb(u8 v, u32 pa);
-extern void omap_writew(u16 v, u32 pa);
-extern void omap_writel(u32 v, u32 pa);
-
-extern void __init omap_init_consistent_dma_size(void);
-
-#endif
-
 #endif

arch/arm/plat-omap/include/plat/omap-iomap.h +221 -0

221 lines not on this page · raw message

Tony Lindgren

author maintainer

2012-02-14 17:18 UTC #4 lore raw

cover Move most of omap io.h into omap-iomap.h

In reply to Tony Lindgren

Quoted 4 lines · Tony Lindgren

Hi all,
This is intended as clean-up before we apply Rob Herring's series to remove mach/io.h.

Need to update this to fix up more driver modules though.

Tony

Tony Lindgren

author maintainer

2012-02-21 22:34 UTC #5 lore raw

cover Move most of omap io.h into omap-iomap.h

Quoted 7 lines · Tony Lindgren

Quoted 4 lines · Tony Lindgren
Hi all,
This is intended as clean-up before we apply Rob Herring's series to remove mach/io.h.
Need to update this to fix up more driver modules though.

Also we can move almost everything into local iomap.h files.

So let's scrap this series, I will post a new series shortly.

Regards,

Tony