diff options
author | Tony Lindgren <tony@atomide.com> | 2012-02-24 13:34:34 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-02-24 13:34:34 -0500 |
commit | 2e3ee9f45b3c25faa012abc9a62ab7aa515cd617 (patch) | |
tree | 0573cc65c3c8906453d949b5fe7f7499d1a25da1 | |
parent | 63325ff235deeed5a5fc25705e292239115c76cd (diff) |
ARM: OMAP1: Move most of plat/io.h into local iomap.h
There's no need to have these in plat/io.h.
While at it, clean up the includes to group them
like they typically are grouped.
Signed-off-by: Tony Lindgren <tony@atomide.com>
36 files changed, 152 insertions, 72 deletions
diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S index c1c5fb6a5b4c..399c4c49722f 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S +++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S | |||
@@ -15,11 +15,12 @@ | |||
15 | 15 | ||
16 | #include <linux/linkage.h> | 16 | #include <linux/linkage.h> |
17 | 17 | ||
18 | #include <plat/io.h> | ||
19 | #include <plat/board-ams-delta.h> | 18 | #include <plat/board-ams-delta.h> |
20 | 19 | ||
21 | #include <mach/ams-delta-fiq.h> | 20 | #include <mach/ams-delta-fiq.h> |
22 | 21 | ||
22 | #include "iomap.h" | ||
23 | |||
23 | /* | 24 | /* |
24 | * GPIO related definitions, copied from arch/arm/plat-omap/gpio.c. | 25 | * GPIO related definitions, copied from arch/arm/plat-omap/gpio.c. |
25 | * Unfortunately, those were not placed in a separate header file. | 26 | * Unfortunately, those were not placed in a separate header file. |
diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c index 152b32c15e28..fcce7ff37630 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq.c +++ b/arch/arm/mach-omap1/ams-delta-fiq.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <plat/board-ams-delta.h> | 22 | #include <plat/board-ams-delta.h> |
23 | 23 | ||
24 | #include <asm/fiq.h> | 24 | #include <asm/fiq.h> |
25 | |||
25 | #include <mach/ams-delta-fiq.h> | 26 | #include <mach/ams-delta-fiq.h> |
26 | 27 | ||
27 | static struct fiq_handler fh = { | 28 | static struct fiq_handler fh = { |
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 88909cc0b254..ac65d7d7c7a1 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c | |||
@@ -20,25 +20,27 @@ | |||
20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
21 | #include <linux/serial_8250.h> | 21 | #include <linux/serial_8250.h> |
22 | #include <linux/export.h> | 22 | #include <linux/export.h> |
23 | #include <linux/io.h> | ||
23 | 24 | ||
24 | #include <media/soc_camera.h> | 25 | #include <media/soc_camera.h> |
25 | 26 | ||
26 | #include <asm/serial.h> | 27 | #include <asm/serial.h> |
27 | #include <mach/hardware.h> | ||
28 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
29 | #include <asm/mach/arch.h> | 29 | #include <asm/mach/arch.h> |
30 | #include <asm/mach/map.h> | 30 | #include <asm/mach/map.h> |
31 | 31 | ||
32 | #include <plat/io.h> | ||
33 | #include <plat/board-ams-delta.h> | 32 | #include <plat/board-ams-delta.h> |
34 | #include <plat/keypad.h> | 33 | #include <plat/keypad.h> |
35 | #include <plat/mux.h> | 34 | #include <plat/mux.h> |
36 | #include <plat/usb.h> | 35 | #include <plat/usb.h> |
37 | #include <plat/board.h> | 36 | #include <plat/board.h> |
38 | #include "common.h" | ||
39 | #include <mach/camera.h> | ||
40 | 37 | ||
38 | #include <mach/hardware.h> | ||
41 | #include <mach/ams-delta-fiq.h> | 39 | #include <mach/ams-delta-fiq.h> |
40 | #include <mach/camera.h> | ||
41 | |||
42 | #include "iomap.h" | ||
43 | #include "common.h" | ||
42 | 44 | ||
43 | static u8 ams_delta_latch1_reg; | 45 | static u8 ams_delta_latch1_reg; |
44 | static u16 ams_delta_latch2_reg; | 46 | static u16 ams_delta_latch2_reg; |
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index 0b9464b41212..079292cca584 100644 --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/input.h> | 22 | #include <linux/input.h> |
23 | #include <linux/smc91x.h> | 23 | #include <linux/smc91x.h> |
24 | 24 | ||
25 | #include <mach/hardware.h> | ||
26 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
27 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
28 | #include <asm/mach/map.h> | 27 | #include <asm/mach/map.h> |
@@ -32,9 +31,13 @@ | |||
32 | #include <plat/flash.h> | 31 | #include <plat/flash.h> |
33 | #include <plat/fpga.h> | 32 | #include <plat/fpga.h> |
34 | #include <plat/keypad.h> | 33 | #include <plat/keypad.h> |
35 | #include "common.h" | ||
36 | #include <plat/board.h> | 34 | #include <plat/board.h> |
37 | 35 | ||
36 | #include <mach/hardware.h> | ||
37 | |||
38 | #include "iomap.h" | ||
39 | #include "common.h" | ||
40 | |||
38 | /* fsample is pretty close to p2-sample */ | 41 | /* fsample is pretty close to p2-sample */ |
39 | 42 | ||
40 | #define fsample_cpld_read(reg) __raw_readb(reg) | 43 | #define fsample_cpld_read(reg) __raw_readb(reg) |
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 00ad6b22d60a..03e0050a8961 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
@@ -31,8 +31,6 @@ | |||
31 | #include <linux/i2c/tps65010.h> | 31 | #include <linux/i2c/tps65010.h> |
32 | #include <linux/smc91x.h> | 32 | #include <linux/smc91x.h> |
33 | 33 | ||
34 | #include <mach/hardware.h> | ||
35 | |||
36 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
37 | #include <asm/mach/arch.h> | 35 | #include <asm/mach/arch.h> |
38 | #include <asm/mach/map.h> | 36 | #include <asm/mach/map.h> |
@@ -43,9 +41,11 @@ | |||
43 | #include <plat/irda.h> | 41 | #include <plat/irda.h> |
44 | #include <plat/usb.h> | 42 | #include <plat/usb.h> |
45 | #include <plat/keypad.h> | 43 | #include <plat/keypad.h> |
46 | #include "common.h" | ||
47 | #include <plat/flash.h> | 44 | #include <plat/flash.h> |
48 | 45 | ||
46 | #include <mach/hardware.h> | ||
47 | |||
48 | #include "common.h" | ||
49 | #include "board-h2.h" | 49 | #include "board-h2.h" |
50 | 50 | ||
51 | /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ | 51 | /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ |
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index 4a7f25149703..f304fe211b1a 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c | |||
@@ -33,21 +33,21 @@ | |||
33 | 33 | ||
34 | #include <asm/setup.h> | 34 | #include <asm/setup.h> |
35 | #include <asm/page.h> | 35 | #include <asm/page.h> |
36 | #include <mach/hardware.h> | ||
37 | |||
38 | #include <asm/mach-types.h> | 36 | #include <asm/mach-types.h> |
39 | #include <asm/mach/arch.h> | 37 | #include <asm/mach/arch.h> |
40 | #include <asm/mach/map.h> | 38 | #include <asm/mach/map.h> |
41 | 39 | ||
42 | #include <mach/irqs.h> | ||
43 | #include <plat/mux.h> | 40 | #include <plat/mux.h> |
44 | #include <plat/tc.h> | 41 | #include <plat/tc.h> |
45 | #include <plat/usb.h> | 42 | #include <plat/usb.h> |
46 | #include <plat/keypad.h> | 43 | #include <plat/keypad.h> |
47 | #include <plat/dma.h> | 44 | #include <plat/dma.h> |
48 | #include "common.h" | ||
49 | #include <plat/flash.h> | 45 | #include <plat/flash.h> |
50 | 46 | ||
47 | #include <mach/hardware.h> | ||
48 | #include <mach/irqs.h> | ||
49 | |||
50 | #include "common.h" | ||
51 | #include "board-h3.h" | 51 | #include "board-h3.h" |
52 | 52 | ||
53 | /* In OMAP1710 H3 the Ethernet is directly connected to CS1 */ | 53 | /* In OMAP1710 H3 the Ethernet is directly connected to CS1 */ |
diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c index 731cc3db7ab3..fa52d145d7b6 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
29 | #include <linux/input.h> | 29 | #include <linux/input.h> |
30 | #include <linux/io.h> | 30 | #include <linux/delay.h> |
31 | #include <linux/gpio.h> | 31 | #include <linux/gpio.h> |
32 | #include <linux/gpio_keys.h> | 32 | #include <linux/gpio_keys.h> |
33 | #include <linux/i2c.h> | 33 | #include <linux/i2c.h> |
@@ -41,7 +41,6 @@ | |||
41 | #include <asm/mach/arch.h> | 41 | #include <asm/mach/arch.h> |
42 | 42 | ||
43 | #include <plat/omap7xx.h> | 43 | #include <plat/omap7xx.h> |
44 | #include "common.h" | ||
45 | #include <plat/board.h> | 44 | #include <plat/board.h> |
46 | #include <plat/keypad.h> | 45 | #include <plat/keypad.h> |
47 | #include <plat/usb.h> | 46 | #include <plat/usb.h> |
@@ -49,7 +48,7 @@ | |||
49 | 48 | ||
50 | #include <mach/irqs.h> | 49 | #include <mach/irqs.h> |
51 | 50 | ||
52 | #include <linux/delay.h> | 51 | #include "common.h" |
53 | 52 | ||
54 | /* LCD register definition */ | 53 | /* LCD register definition */ |
55 | #define OMAP_LCDC_CONTROL (0xfffec000 + 0x00) | 54 | #define OMAP_LCDC_CONTROL (0xfffec000 + 0x00) |
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index 309369ea6978..289a6b82c5f7 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/input.h> | 26 | #include <linux/input.h> |
27 | #include <linux/smc91x.h> | 27 | #include <linux/smc91x.h> |
28 | 28 | ||
29 | #include <mach/hardware.h> | ||
30 | #include <asm/mach-types.h> | 29 | #include <asm/mach-types.h> |
31 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
32 | #include <asm/mach/map.h> | 31 | #include <asm/mach/map.h> |
@@ -37,9 +36,13 @@ | |||
37 | #include <plat/tc.h> | 36 | #include <plat/tc.h> |
38 | #include <plat/usb.h> | 37 | #include <plat/usb.h> |
39 | #include <plat/keypad.h> | 38 | #include <plat/keypad.h> |
40 | #include "common.h" | ||
41 | #include <plat/mmc.h> | 39 | #include <plat/mmc.h> |
42 | 40 | ||
41 | #include <mach/hardware.h> | ||
42 | |||
43 | #include "iomap.h" | ||
44 | #include "common.h" | ||
45 | |||
43 | /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ | 46 | /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ |
44 | #define INNOVATOR1610_ETHR_START 0x04000300 | 47 | #define INNOVATOR1610_ETHR_START 0x04000300 |
45 | 48 | ||
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index f9efc036ba96..abdbdb08644f 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <linux/workqueue.h> | 21 | #include <linux/workqueue.h> |
22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
23 | 23 | ||
24 | #include <mach/hardware.h> | ||
25 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
26 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
27 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
@@ -30,12 +29,15 @@ | |||
30 | #include <plat/usb.h> | 29 | #include <plat/usb.h> |
31 | #include <plat/board.h> | 30 | #include <plat/board.h> |
32 | #include <plat/keypad.h> | 31 | #include <plat/keypad.h> |
33 | #include "common.h" | ||
34 | #include <plat/hwa742.h> | 32 | #include <plat/hwa742.h> |
35 | #include <plat/lcd_mipid.h> | 33 | #include <plat/lcd_mipid.h> |
36 | #include <plat/mmc.h> | 34 | #include <plat/mmc.h> |
37 | #include <plat/clock.h> | 35 | #include <plat/clock.h> |
38 | 36 | ||
37 | #include <mach/hardware.h> | ||
38 | |||
39 | #include "common.h" | ||
40 | |||
39 | #define ADS7846_PENDOWN_GPIO 15 | 41 | #define ADS7846_PENDOWN_GPIO 15 |
40 | 42 | ||
41 | static const unsigned int nokia770_keymap[] = { | 43 | static const unsigned int nokia770_keymap[] = { |
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 675de06557aa..e2d7ae4418f2 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c | |||
@@ -34,15 +34,11 @@ | |||
34 | #include <linux/i2c.h> | 34 | #include <linux/i2c.h> |
35 | #include <linux/leds.h> | 35 | #include <linux/leds.h> |
36 | #include <linux/smc91x.h> | 36 | #include <linux/smc91x.h> |
37 | |||
38 | #include <linux/mtd/mtd.h> | 37 | #include <linux/mtd/mtd.h> |
39 | #include <linux/mtd/partitions.h> | 38 | #include <linux/mtd/partitions.h> |
40 | #include <linux/mtd/physmap.h> | 39 | #include <linux/mtd/physmap.h> |
41 | |||
42 | #include <linux/i2c/tps65010.h> | 40 | #include <linux/i2c/tps65010.h> |
43 | 41 | ||
44 | #include <mach/hardware.h> | ||
45 | |||
46 | #include <asm/mach-types.h> | 42 | #include <asm/mach-types.h> |
47 | #include <asm/mach/arch.h> | 43 | #include <asm/mach/arch.h> |
48 | #include <asm/mach/map.h> | 44 | #include <asm/mach/map.h> |
@@ -51,6 +47,9 @@ | |||
51 | #include <plat/usb.h> | 47 | #include <plat/usb.h> |
52 | #include <plat/mux.h> | 48 | #include <plat/mux.h> |
53 | #include <plat/tc.h> | 49 | #include <plat/tc.h> |
50 | |||
51 | #include <mach/hardware.h> | ||
52 | |||
54 | #include "common.h" | 53 | #include "common.h" |
55 | 54 | ||
56 | /* At OMAP5912 OSK the Ethernet is directly connected to CS1 */ | 55 | /* At OMAP5912 OSK the Ethernet is directly connected to CS1 */ |
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 81fa27f88369..04efa7e61149 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
29 | #include <linux/apm-emulation.h> | 29 | #include <linux/apm-emulation.h> |
30 | 30 | ||
31 | #include <mach/hardware.h> | ||
32 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
33 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/map.h> | 33 | #include <asm/mach/map.h> |
@@ -41,6 +40,9 @@ | |||
41 | #include <plat/board.h> | 40 | #include <plat/board.h> |
42 | #include <plat/irda.h> | 41 | #include <plat/irda.h> |
43 | #include <plat/keypad.h> | 42 | #include <plat/keypad.h> |
43 | |||
44 | #include <mach/hardware.h> | ||
45 | |||
44 | #include "common.h" | 46 | #include "common.h" |
45 | 47 | ||
46 | #define PALMTE_USBDETECT_GPIO 0 | 48 | #define PALMTE_USBDETECT_GPIO 0 |
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index 81cb82178388..acd1f3645ba0 100644 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c | |||
@@ -24,8 +24,9 @@ | |||
24 | #include <linux/mtd/partitions.h> | 24 | #include <linux/mtd/partitions.h> |
25 | #include <linux/mtd/physmap.h> | 25 | #include <linux/mtd/physmap.h> |
26 | #include <linux/leds.h> | 26 | #include <linux/leds.h> |
27 | #include <linux/spi/spi.h> | ||
28 | #include <linux/spi/ads7846.h> | ||
27 | 29 | ||
28 | #include <mach/hardware.h> | ||
29 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
30 | #include <asm/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
31 | #include <asm/mach/map.h> | 32 | #include <asm/mach/map.h> |
@@ -39,10 +40,10 @@ | |||
39 | #include <plat/board.h> | 40 | #include <plat/board.h> |
40 | #include <plat/irda.h> | 41 | #include <plat/irda.h> |
41 | #include <plat/keypad.h> | 42 | #include <plat/keypad.h> |
42 | #include "common.h" | ||
43 | 43 | ||
44 | #include <linux/spi/spi.h> | 44 | #include <mach/hardware.h> |
45 | #include <linux/spi/ads7846.h> | 45 | |
46 | #include "common.h" | ||
46 | 47 | ||
47 | #define PALMTT_USBDETECT_GPIO 0 | 48 | #define PALMTT_USBDETECT_GPIO 0 |
48 | #define PALMTT_CABLE_GPIO 1 | 49 | #define PALMTT_CABLE_GPIO 1 |
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index e881945ce8ec..c1cd0f2d6866 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c | |||
@@ -27,8 +27,9 @@ | |||
27 | #include <linux/mtd/mtd.h> | 27 | #include <linux/mtd/mtd.h> |
28 | #include <linux/mtd/partitions.h> | 28 | #include <linux/mtd/partitions.h> |
29 | #include <linux/mtd/physmap.h> | 29 | #include <linux/mtd/physmap.h> |
30 | #include <linux/spi/spi.h> | ||
31 | #include <linux/spi/ads7846.h> | ||
30 | 32 | ||
31 | #include <mach/hardware.h> | ||
32 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
33 | #include <asm/mach/arch.h> | 34 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/map.h> | 35 | #include <asm/mach/map.h> |
@@ -41,10 +42,10 @@ | |||
41 | #include <plat/board.h> | 42 | #include <plat/board.h> |
42 | #include <plat/irda.h> | 43 | #include <plat/irda.h> |
43 | #include <plat/keypad.h> | 44 | #include <plat/keypad.h> |
44 | #include "common.h" | ||
45 | 45 | ||
46 | #include <linux/spi/spi.h> | 46 | #include <mach/hardware.h> |
47 | #include <linux/spi/ads7846.h> | 47 | |
48 | #include "common.h" | ||
48 | 49 | ||
49 | #define PALMZ71_USBDETECT_GPIO 0 | 50 | #define PALMZ71_USBDETECT_GPIO 0 |
50 | #define PALMZ71_PENIRQ_GPIO 6 | 51 | #define PALMZ71_PENIRQ_GPIO 6 |
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index c000bed76276..83f5b765c5b6 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/input.h> | 22 | #include <linux/input.h> |
23 | #include <linux/smc91x.h> | 23 | #include <linux/smc91x.h> |
24 | 24 | ||
25 | #include <mach/hardware.h> | ||
26 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
27 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
28 | #include <asm/mach/map.h> | 27 | #include <asm/mach/map.h> |
@@ -32,9 +31,13 @@ | |||
32 | #include <plat/fpga.h> | 31 | #include <plat/fpga.h> |
33 | #include <plat/flash.h> | 32 | #include <plat/flash.h> |
34 | #include <plat/keypad.h> | 33 | #include <plat/keypad.h> |
35 | #include "common.h" | ||
36 | #include <plat/board.h> | 34 | #include <plat/board.h> |
37 | 35 | ||
36 | #include <mach/hardware.h> | ||
37 | |||
38 | #include "iomap.h" | ||
39 | #include "common.h" | ||
40 | |||
38 | static const unsigned int p2_keymap[] = { | 41 | static const unsigned int p2_keymap[] = { |
39 | KEY(0, 0, KEY_UP), | 42 | KEY(0, 0, KEY_UP), |
40 | KEY(1, 0, KEY_RIGHT), | 43 | KEY(1, 0, KEY_RIGHT), |
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 7bcd82ab0fd0..fed4435f5d43 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
29 | #include <linux/export.h> | 29 | #include <linux/export.h> |
30 | 30 | ||
31 | #include <mach/hardware.h> | ||
32 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
33 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/map.h> | 33 | #include <asm/mach/map.h> |
@@ -40,10 +39,13 @@ | |||
40 | #include <plat/usb.h> | 39 | #include <plat/usb.h> |
41 | #include <plat/tc.h> | 40 | #include <plat/tc.h> |
42 | #include <plat/board.h> | 41 | #include <plat/board.h> |
43 | #include "common.h" | ||
44 | #include <plat/keypad.h> | 42 | #include <plat/keypad.h> |
45 | #include <plat/board-sx1.h> | 43 | #include <plat/board-sx1.h> |
46 | 44 | ||
45 | #include <mach/hardware.h> | ||
46 | |||
47 | #include "common.h" | ||
48 | |||
47 | /* Write to I2C device */ | 49 | /* Write to I2C device */ |
48 | int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value) | 50 | int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value) |
49 | { | 51 | { |
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index f83a502dc93c..659d0f75de2c 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c | |||
@@ -27,18 +27,20 @@ | |||
27 | #include <linux/smc91x.h> | 27 | #include <linux/smc91x.h> |
28 | #include <linux/export.h> | 28 | #include <linux/export.h> |
29 | 29 | ||
30 | #include <mach/hardware.h> | ||
31 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
32 | #include <asm/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
33 | #include <asm/mach/map.h> | 32 | #include <asm/mach/map.h> |
34 | 33 | ||
35 | #include <plat/board-voiceblue.h> | 34 | #include <plat/board-voiceblue.h> |
36 | #include "common.h" | ||
37 | #include <plat/flash.h> | 35 | #include <plat/flash.h> |
38 | #include <plat/mux.h> | 36 | #include <plat/mux.h> |
39 | #include <plat/tc.h> | 37 | #include <plat/tc.h> |
40 | #include <plat/usb.h> | 38 | #include <plat/usb.h> |
41 | 39 | ||
40 | #include <mach/hardware.h> | ||
41 | |||
42 | #include "common.h" | ||
43 | |||
42 | static struct plat_serial8250_port voiceblue_ports[] = { | 44 | static struct plat_serial8250_port voiceblue_ports[] = { |
43 | { | 45 | { |
44 | .mapbase = (unsigned long)(OMAP_CS1_PHYS + 0x40000), | 46 | .mapbase = (unsigned long)(OMAP_CS1_PHYS + 0x40000), |
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 0c50df05d135..0e8c176c54b1 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
19 | #include <linux/io.h> | ||
20 | #include <linux/clkdev.h> | 19 | #include <linux/clkdev.h> |
21 | 20 | ||
22 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
@@ -27,6 +26,7 @@ | |||
27 | #include <plat/sram.h> | 26 | #include <plat/sram.h> |
28 | #include <plat/clkdev_omap.h> | 27 | #include <plat/clkdev_omap.h> |
29 | 28 | ||
29 | #include "iomap.h" | ||
30 | #include "clock.h" | 30 | #include "clock.h" |
31 | #include "opp.h" | 31 | #include "opp.h" |
32 | 32 | ||
diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c index 94699a82a734..10b74511a4e8 100644 --- a/arch/arm/mach-omap1/clock_data.c +++ b/arch/arm/mach-omap1/clock_data.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
19 | #include <linux/cpufreq.h> | 19 | #include <linux/cpufreq.h> |
20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
21 | #include <linux/io.h> | ||
22 | 21 | ||
23 | #include <asm/mach-types.h> /* for machine_is_* */ | 22 | #include <asm/mach-types.h> /* for machine_is_* */ |
24 | 23 | ||
@@ -28,6 +27,7 @@ | |||
28 | #include <plat/sram.h> /* for omap_sram_reprogram_clock() */ | 27 | #include <plat/sram.h> /* for omap_sram_reprogram_clock() */ |
29 | #include <plat/usb.h> /* for OTG_BASE */ | 28 | #include <plat/usb.h> /* for OTG_BASE */ |
30 | 29 | ||
30 | #include "iomap.h" | ||
31 | #include "clock.h" | 31 | #include "clock.h" |
32 | 32 | ||
33 | /* Some ARM_IDLECT1 bit shifts - used in struct arm_idlect1_clk */ | 33 | /* Some ARM_IDLECT1 bit shifts - used in struct arm_idlect1_clk */ |
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 1d76a63c0983..d06c7140392c 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c | |||
@@ -15,14 +15,10 @@ | |||
15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
18 | #include <linux/io.h> | ||
19 | #include <linux/spi/spi.h> | 18 | #include <linux/spi/spi.h> |
20 | 19 | ||
21 | #include <mach/camera.h> | ||
22 | #include <mach/hardware.h> | ||
23 | #include <asm/mach/map.h> | 20 | #include <asm/mach/map.h> |
24 | 21 | ||
25 | #include "common.h" | ||
26 | #include <plat/tc.h> | 22 | #include <plat/tc.h> |
27 | #include <plat/board.h> | 23 | #include <plat/board.h> |
28 | #include <plat/mux.h> | 24 | #include <plat/mux.h> |
@@ -30,6 +26,10 @@ | |||
30 | #include <plat/omap7xx.h> | 26 | #include <plat/omap7xx.h> |
31 | #include <plat/mcbsp.h> | 27 | #include <plat/mcbsp.h> |
32 | 28 | ||
29 | #include <mach/camera.h> | ||
30 | #include <mach/hardware.h> | ||
31 | |||
32 | #include "common.h" | ||
33 | #include "clock.h" | 33 | #include "clock.h" |
34 | 34 | ||
35 | /*-------------------------------------------------------------------------*/ | 35 | /*-------------------------------------------------------------------------*/ |
diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c index f5a52204b89f..3ef7d52316b4 100644 --- a/arch/arm/mach-omap1/dma.c +++ b/arch/arm/mach-omap1/dma.c | |||
@@ -19,11 +19,11 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/err.h> | 21 | #include <linux/err.h> |
22 | #include <linux/io.h> | ||
23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
26 | #include <linux/device.h> | 25 | #include <linux/device.h> |
26 | #include <linux/io.h> | ||
27 | 27 | ||
28 | #include <plat/dma.h> | 28 | #include <plat/dma.h> |
29 | #include <plat/tc.h> | 29 | #include <plat/tc.h> |
diff --git a/arch/arm/mach-omap1/flash.c b/arch/arm/mach-omap1/flash.c index 1749cb37dda0..98d29a0d3d6e 100644 --- a/arch/arm/mach-omap1/flash.c +++ b/arch/arm/mach-omap1/flash.c | |||
@@ -6,10 +6,10 @@ | |||
6 | * published by the Free Software Foundation. | 6 | * published by the Free Software Foundation. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/io.h> | ||
9 | #include <linux/mtd/mtd.h> | 10 | #include <linux/mtd/mtd.h> |
10 | #include <linux/mtd/map.h> | 11 | #include <linux/mtd/map.h> |
11 | 12 | ||
12 | #include <plat/io.h> | ||
13 | #include <plat/tc.h> | 13 | #include <plat/tc.h> |
14 | #include <plat/flash.h> | 14 | #include <plat/flash.h> |
15 | 15 | ||
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c index 0a17a1a7e00d..76c67b3f9f61 100644 --- a/arch/arm/mach-omap1/fpga.c +++ b/arch/arm/mach-omap1/fpga.c | |||
@@ -24,12 +24,15 @@ | |||
24 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
26 | 26 | ||
27 | #include <mach/hardware.h> | ||
28 | #include <asm/irq.h> | 27 | #include <asm/irq.h> |
29 | #include <asm/mach/irq.h> | 28 | #include <asm/mach/irq.h> |
30 | 29 | ||
31 | #include <plat/fpga.h> | 30 | #include <plat/fpga.h> |
32 | 31 | ||
32 | #include <mach/hardware.h> | ||
33 | |||
34 | #include "iomap.h" | ||
35 | |||
33 | static void fpga_mask_irq(struct irq_data *d) | 36 | static void fpga_mask_irq(struct irq_data *d) |
34 | { | 37 | { |
35 | unsigned int irq = d->irq - OMAP_FPGA_IRQ_BASE; | 38 | unsigned int irq = d->irq - OMAP_FPGA_IRQ_BASE; |
diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c index a0e3560b39db..7483db294123 100644 --- a/arch/arm/mach-omap1/id.c +++ b/arch/arm/mach-omap1/id.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | |||
18 | #include <plat/cpu.h> | 19 | #include <plat/cpu.h> |
19 | 20 | ||
20 | #define OMAP_DIE_ID_0 0xfffe1800 | 21 | #define OMAP_DIE_ID_0 0xfffe1800 |
diff --git a/arch/arm/mach-omap1/include/mach/entry-macro.S b/arch/arm/mach-omap1/include/mach/entry-macro.S index bfb4fb1d7382..68d2679936ff 100644 --- a/arch/arm/mach-omap1/include/mach/entry-macro.S +++ b/arch/arm/mach-omap1/include/mach/entry-macro.S | |||
@@ -9,10 +9,12 @@ | |||
9 | * License version 2. This program is licensed "as is" without any | 9 | * License version 2. This program is licensed "as is" without any |
10 | * warranty of any kind, whether express or implied. | 10 | * warranty of any kind, whether express or implied. |
11 | */ | 11 | */ |
12 | |||
12 | #include <mach/hardware.h> | 13 | #include <mach/hardware.h> |
13 | #include <mach/io.h> | 14 | #include <mach/io.h> |
14 | #include <mach/irqs.h> | 15 | #include <mach/irqs.h> |
15 | #include <asm/hardware/gic.h> | 16 | |
17 | #include "../../iomap.h" | ||
16 | 18 | ||
17 | .macro disable_fiq | 19 | .macro disable_fiq |
18 | .endm | 20 | .endm |
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index 8e55b6fb3478..56fb444a5f11 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c | |||
@@ -15,9 +15,12 @@ | |||
15 | 15 | ||
16 | #include <asm/tlb.h> | 16 | #include <asm/tlb.h> |
17 | #include <asm/mach/map.h> | 17 | #include <asm/mach/map.h> |
18 | |||
18 | #include <plat/mux.h> | 19 | #include <plat/mux.h> |
19 | #include <plat/tc.h> | 20 | #include <plat/tc.h> |
20 | 21 | ||
22 | #include "iomap.h" | ||
23 | #include "common.h" | ||
21 | #include "clock.h" | 24 | #include "clock.h" |
22 | 25 | ||
23 | extern void omap_check_revision(void); | 26 | extern void omap_check_revision(void); |
diff --git a/arch/arm/mach-omap1/iomap.h b/arch/arm/mach-omap1/iomap.h new file mode 100644 index 000000000000..d68175761c3d --- /dev/null +++ b/arch/arm/mach-omap1/iomap.h | |||
@@ -0,0 +1,42 @@ | |||
1 | /* | ||
2 | * IO mappings for OMAP1 | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify it | ||
5 | * under the terms of the GNU General Public License as published by the | ||
6 | * Free Software Foundation; either version 2 of the License, or (at your | ||
7 | * option) any later version. | ||
8 | * | ||
9 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
10 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
11 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
12 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
13 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
14 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
15 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
16 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
17 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
18 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
19 | * | ||
20 | * You should have received a copy of the GNU General Public License along | ||
21 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
22 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
23 | */ | ||
24 | |||
25 | #ifdef __ASSEMBLER__ | ||
26 | #define IOMEM(x) (x) | ||
27 | #else | ||
28 | #define IOMEM(x) ((void __force __iomem *)(x)) | ||
29 | #endif | ||
30 | |||
31 | #define OMAP1_IO_OFFSET 0x01000000 /* Virtual IO = 0xfefb0000 */ | ||
32 | #define OMAP1_IO_ADDRESS(pa) IOMEM((pa) - OMAP1_IO_OFFSET) | ||
33 | |||
34 | /* | ||
35 | * ---------------------------------------------------------------------------- | ||
36 | * Omap1 specific IO mapping | ||
37 | * ---------------------------------------------------------------------------- | ||
38 | */ | ||
39 | |||
40 | #define OMAP1_IO_PHYS 0xFFFB0000 | ||
41 | #define OMAP1_IO_SIZE 0x40000 | ||
42 | #define OMAP1_IO_VIRT (OMAP1_IO_PHYS - OMAP1_IO_OFFSET) | ||
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c index e5b104b7fce6..4448114fab72 100644 --- a/arch/arm/mach-omap1/irq.c +++ b/arch/arm/mach-omap1/irq.c | |||
@@ -42,11 +42,13 @@ | |||
42 | #include <linux/interrupt.h> | 42 | #include <linux/interrupt.h> |
43 | #include <linux/io.h> | 43 | #include <linux/io.h> |
44 | 44 | ||
45 | #include <mach/hardware.h> | ||
46 | #include <asm/irq.h> | 45 | #include <asm/irq.h> |
47 | #include <asm/mach/irq.h> | 46 | #include <asm/mach/irq.h> |
47 | |||
48 | #include <plat/cpu.h> | 48 | #include <plat/cpu.h> |
49 | 49 | ||
50 | #include <mach/hardware.h> | ||
51 | |||
50 | #define IRQ_BANK(irq) ((irq) >> 5) | 52 | #define IRQ_BANK(irq) ((irq) >> 5) |
51 | #define IRQ_BIT(irq) ((irq) & 0x1f) | 53 | #define IRQ_BIT(irq) ((irq) & 0x1f) |
52 | 54 | ||
diff --git a/arch/arm/mach-omap1/lcd_dma.c b/arch/arm/mach-omap1/lcd_dma.c index 453809359ba6..123a0df63d48 100644 --- a/arch/arm/mach-omap1/lcd_dma.c +++ b/arch/arm/mach-omap1/lcd_dma.c | |||
@@ -27,9 +27,10 @@ | |||
27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
29 | 29 | ||
30 | #include <plat/dma.h> | ||
31 | |||
30 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
31 | #include <mach/lcdc.h> | 33 | #include <mach/lcdc.h> |
32 | #include <plat/dma.h> | ||
33 | 34 | ||
34 | int omap_lcd_dma_running(void) | 35 | int omap_lcd_dma_running(void) |
35 | { | 36 | { |
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c index 91f9abbd3250..3082d60af082 100644 --- a/arch/arm/mach-omap1/mcbsp.c +++ b/arch/arm/mach-omap1/mcbsp.c | |||
@@ -19,12 +19,15 @@ | |||
19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
21 | 21 | ||
22 | #include <mach/irqs.h> | ||
23 | #include <plat/dma.h> | 22 | #include <plat/dma.h> |
24 | #include <plat/mux.h> | 23 | #include <plat/mux.h> |
25 | #include <plat/cpu.h> | 24 | #include <plat/cpu.h> |
26 | #include <plat/mcbsp.h> | 25 | #include <plat/mcbsp.h> |
27 | 26 | ||
27 | #include <mach/irqs.h> | ||
28 | |||
29 | #include "iomap.h" | ||
30 | |||
28 | #define DPS_RSTCT2_PER_EN (1 << 0) | 31 | #define DPS_RSTCT2_PER_EN (1 << 0) |
29 | #define DSP_RSTCT2_WD_PER_EN (1 << 1) | 32 | #define DSP_RSTCT2_WD_PER_EN (1 << 1) |
30 | 33 | ||
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 89ea20ca0ccc..c06bb4098ac7 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c | |||
@@ -42,14 +42,13 @@ | |||
42 | #include <linux/sysfs.h> | 42 | #include <linux/sysfs.h> |
43 | #include <linux/module.h> | 43 | #include <linux/module.h> |
44 | #include <linux/io.h> | 44 | #include <linux/io.h> |
45 | #include <linux/atomic.h> | ||
45 | 46 | ||
46 | #include <asm/irq.h> | 47 | #include <asm/irq.h> |
47 | #include <linux/atomic.h> | ||
48 | #include <asm/mach/time.h> | 48 | #include <asm/mach/time.h> |
49 | #include <asm/mach/irq.h> | 49 | #include <asm/mach/irq.h> |
50 | 50 | ||
51 | #include <plat/cpu.h> | 51 | #include <plat/cpu.h> |
52 | #include <mach/irqs.h> | ||
53 | #include <plat/clock.h> | 52 | #include <plat/clock.h> |
54 | #include <plat/sram.h> | 53 | #include <plat/sram.h> |
55 | #include <plat/tc.h> | 54 | #include <plat/tc.h> |
@@ -57,6 +56,9 @@ | |||
57 | #include <plat/dma.h> | 56 | #include <plat/dma.h> |
58 | #include <plat/dmtimer.h> | 57 | #include <plat/dmtimer.h> |
59 | 58 | ||
59 | #include <mach/irqs.h> | ||
60 | |||
61 | #include "iomap.h" | ||
60 | #include "pm.h" | 62 | #include "pm.h" |
61 | 63 | ||
62 | static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE]; | 64 | static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE]; |
diff --git a/arch/arm/mach-omap1/reset.c b/arch/arm/mach-omap1/reset.c index 91d199b64979..f255b153b863 100644 --- a/arch/arm/mach-omap1/reset.c +++ b/arch/arm/mach-omap1/reset.c | |||
@@ -4,9 +4,10 @@ | |||
4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
5 | #include <linux/io.h> | 5 | #include <linux/io.h> |
6 | 6 | ||
7 | #include <mach/hardware.h> | ||
8 | #include <plat/prcm.h> | 7 | #include <plat/prcm.h> |
9 | 8 | ||
9 | #include <mach/hardware.h> | ||
10 | |||
10 | void omap1_restart(char mode, const char *cmd) | 11 | void omap1_restart(char mode, const char *cmd) |
11 | { | 12 | { |
12 | /* | 13 | /* |
diff --git a/arch/arm/mach-omap1/sleep.S b/arch/arm/mach-omap1/sleep.S index c875bdc902c5..0779db150da7 100644 --- a/arch/arm/mach-omap1/sleep.S +++ b/arch/arm/mach-omap1/sleep.S | |||
@@ -33,8 +33,12 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include <linux/linkage.h> | 35 | #include <linux/linkage.h> |
36 | |||
36 | #include <asm/assembler.h> | 37 | #include <asm/assembler.h> |
38 | |||
37 | #include <mach/io.h> | 39 | #include <mach/io.h> |
40 | |||
41 | #include "iomap.h" | ||
38 | #include "pm.h" | 42 | #include "pm.h" |
39 | 43 | ||
40 | .text | 44 | .text |
diff --git a/arch/arm/mach-omap1/sram.S b/arch/arm/mach-omap1/sram.S index 692587d07ea5..2ce0b9ab20e5 100644 --- a/arch/arm/mach-omap1/sram.S +++ b/arch/arm/mach-omap1/sram.S | |||
@@ -9,10 +9,14 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/linkage.h> | 11 | #include <linux/linkage.h> |
12 | |||
12 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
14 | |||
13 | #include <mach/io.h> | 15 | #include <mach/io.h> |
14 | #include <mach/hardware.h> | 16 | #include <mach/hardware.h> |
15 | 17 | ||
18 | #include "iomap.h" | ||
19 | |||
16 | .text | 20 | .text |
17 | 21 | ||
18 | /* | 22 | /* |
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c index b8faffa44f9e..2fae6a2740f1 100644 --- a/arch/arm/mach-omap1/time.c +++ b/arch/arm/mach-omap1/time.c | |||
@@ -45,14 +45,15 @@ | |||
45 | #include <linux/io.h> | 45 | #include <linux/io.h> |
46 | 46 | ||
47 | #include <asm/system.h> | 47 | #include <asm/system.h> |
48 | #include <mach/hardware.h> | ||
49 | #include <asm/leds.h> | 48 | #include <asm/leds.h> |
50 | #include <asm/irq.h> | 49 | #include <asm/irq.h> |
51 | #include <asm/sched_clock.h> | 50 | #include <asm/sched_clock.h> |
52 | 51 | ||
52 | #include <mach/hardware.h> | ||
53 | #include <asm/mach/irq.h> | 53 | #include <asm/mach/irq.h> |
54 | #include <asm/mach/time.h> | 54 | #include <asm/mach/time.h> |
55 | 55 | ||
56 | #include "iomap.h" | ||
56 | #include "common.h" | 57 | #include "common.h" |
57 | 58 | ||
58 | #ifdef CONFIG_OMAP_MPU_TIMER | 59 | #ifdef CONFIG_OMAP_MPU_TIMER |
diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c index 9a54ef4dcf5e..a2e6d0709df2 100644 --- a/arch/arm/mach-omap1/timer32k.c +++ b/arch/arm/mach-omap1/timer32k.c | |||
@@ -47,14 +47,17 @@ | |||
47 | #include <linux/io.h> | 47 | #include <linux/io.h> |
48 | 48 | ||
49 | #include <asm/system.h> | 49 | #include <asm/system.h> |
50 | #include <mach/hardware.h> | ||
51 | #include <asm/leds.h> | 50 | #include <asm/leds.h> |
52 | #include <asm/irq.h> | 51 | #include <asm/irq.h> |
53 | #include <asm/mach/irq.h> | 52 | #include <asm/mach/irq.h> |
54 | #include <asm/mach/time.h> | 53 | #include <asm/mach/time.h> |
55 | #include "common.h" | 54 | |
56 | #include <plat/dmtimer.h> | 55 | #include <plat/dmtimer.h> |
57 | 56 | ||
57 | #include <mach/hardware.h> | ||
58 | |||
59 | #include "common.h" | ||
60 | |||
58 | /* | 61 | /* |
59 | * --------------------------------------------------------------------------- | 62 | * --------------------------------------------------------------------------- |
60 | * 32KHz OS timer | 63 | * 32KHz OS timer |
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h index 28cd79658633..e5e8e08f62f5 100644 --- a/arch/arm/plat-omap/include/plat/io.h +++ b/arch/arm/plat-omap/include/plat/io.h | |||
@@ -60,9 +60,6 @@ | |||
60 | #define IOMEM(x) ((void __force __iomem *)(x)) | 60 | #define IOMEM(x) ((void __force __iomem *)(x)) |
61 | #endif | 61 | #endif |
62 | 62 | ||
63 | #define OMAP1_IO_OFFSET 0x01000000 /* Virtual IO = 0xfefb0000 */ | ||
64 | #define OMAP1_IO_ADDRESS(pa) IOMEM((pa) - OMAP1_IO_OFFSET) | ||
65 | |||
66 | #define OMAP2_L3_IO_OFFSET 0x90000000 | 63 | #define OMAP2_L3_IO_OFFSET 0x90000000 |
67 | #define OMAP2_L3_IO_ADDRESS(pa) IOMEM((pa) + OMAP2_L3_IO_OFFSET) /* L3 */ | 64 | #define OMAP2_L3_IO_ADDRESS(pa) IOMEM((pa) + OMAP2_L3_IO_OFFSET) /* L3 */ |
68 | 65 | ||
@@ -87,16 +84,6 @@ | |||
87 | 84 | ||
88 | /* | 85 | /* |
89 | * ---------------------------------------------------------------------------- | 86 | * ---------------------------------------------------------------------------- |
90 | * Omap1 specific IO mapping | ||
91 | * ---------------------------------------------------------------------------- | ||
92 | */ | ||
93 | |||
94 | #define OMAP1_IO_PHYS 0xFFFB0000 | ||
95 | #define OMAP1_IO_SIZE 0x40000 | ||
96 | #define OMAP1_IO_VIRT (OMAP1_IO_PHYS - OMAP1_IO_OFFSET) | ||
97 | |||
98 | /* | ||
99 | * ---------------------------------------------------------------------------- | ||
100 | * Omap2 specific IO mapping | 87 | * Omap2 specific IO mapping |
101 | * ---------------------------------------------------------------------------- | 88 | * ---------------------------------------------------------------------------- |
102 | */ | 89 | */ |