diff options
| author | Anand Gadiyar <gadiyar@ti.com> | 2010-10-22 14:15:16 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-10-22 15:14:12 -0400 |
| commit | bc487fb341af05120bccb9f59ce76302391dcc77 (patch) | |
| tree | 6d1c0058b95731491621181e3b9ac860e382fc61 | |
| parent | cb74f0223fcf9b2db8f57d9ee5fa4738c066f3c6 (diff) | |
omap: complete removal of machine_desc.io_pg_offst and .phys_io
Commit ab69bcd66fb4be64edfc767365cb9eb084961246 (arm: remove
machine_desc.io_pg_offst and .phys_io) could not update
the new boards in the omap tree. This causes the build of
omap2plus_defconfig to fail. Fix this.
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Eric Miao <eric.miao at canonical.com>
[tony@atomide.com: updated description]
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/board-cm-t3517.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-igep0030.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3logic.c | 4 |
3 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c index c49319ff5c36..1dd303e9a267 100644 --- a/arch/arm/mach-omap2/board-cm-t3517.c +++ b/arch/arm/mach-omap2/board-cm-t3517.c | |||
| @@ -283,8 +283,6 @@ static void __init cm_t3517_init(void) | |||
| 283 | } | 283 | } |
| 284 | 284 | ||
| 285 | MACHINE_START(CM_T3517, "Compulab CM-T3517") | 285 | MACHINE_START(CM_T3517, "Compulab CM-T3517") |
| 286 | .phys_io = 0x48000000, | ||
| 287 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, | ||
| 288 | .boot_params = 0x80000100, | 286 | .boot_params = 0x80000100, |
| 289 | .map_io = omap3_map_io, | 287 | .map_io = omap3_map_io, |
| 290 | .reserve = omap_reserve, | 288 | .reserve = omap_reserve, |
diff --git a/arch/arm/mach-omap2/board-igep0030.c b/arch/arm/mach-omap2/board-igep0030.c index 7ed41e076c04..22b0b253e16b 100644 --- a/arch/arm/mach-omap2/board-igep0030.c +++ b/arch/arm/mach-omap2/board-igep0030.c | |||
| @@ -392,8 +392,6 @@ static void __init igep3_init(void) | |||
| 392 | } | 392 | } |
| 393 | 393 | ||
| 394 | MACHINE_START(IGEP0030, "IGEP OMAP3 module") | 394 | MACHINE_START(IGEP0030, "IGEP OMAP3 module") |
| 395 | .phys_io = 0x48000000, | ||
| 396 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | ||
| 397 | .boot_params = 0x80000100, | 395 | .boot_params = 0x80000100, |
| 398 | .map_io = omap3_map_io, | 396 | .map_io = omap3_map_io, |
| 399 | .init_irq = igep3_init_irq, | 397 | .init_irq = igep3_init_irq, |
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index 44ff6744ef59..5f7d2c1e7ef5 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c | |||
| @@ -225,8 +225,6 @@ static void __init omap3logic_init(void) | |||
| 225 | } | 225 | } |
| 226 | 226 | ||
| 227 | MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board") | 227 | MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board") |
| 228 | .phys_io = 0x48000000, | ||
| 229 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, | ||
| 230 | .boot_params = 0x80000100, | 228 | .boot_params = 0x80000100, |
| 231 | .map_io = omap3_map_io, | 229 | .map_io = omap3_map_io, |
| 232 | .init_irq = omap3logic_init_irq, | 230 | .init_irq = omap3logic_init_irq, |
| @@ -235,8 +233,6 @@ MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board") | |||
| 235 | MACHINE_END | 233 | MACHINE_END |
| 236 | 234 | ||
| 237 | MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board") | 235 | MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board") |
| 238 | .phys_io = 0x48000000, | ||
| 239 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, | ||
| 240 | .boot_params = 0x80000100, | 236 | .boot_params = 0x80000100, |
| 241 | .map_io = omap3_map_io, | 237 | .map_io = omap3_map_io, |
| 242 | .init_irq = omap3logic_init_irq, | 238 | .init_irq = omap3logic_init_irq, |
