diff options
author | Alistair Buxton <a.j.buxton@gmail.com> | 2009-09-22 02:34:13 -0400 |
---|---|---|
committer | Alistair Buxton <a.j.buxton@gmail.com> | 2009-10-07 18:14:05 -0400 |
commit | b51988db94faec47d6e7c69c8e691cfc194f66db (patch) | |
tree | 7cd25e941cc763c7c2462dcaeee1b72d15397fb3 /arch/arm/mach-omap1/board-perseus2.c | |
parent | e6684f7132c6e6333e96407b06910bebaa4c1935 (diff) |
OMAP7XX: Update core omap1 files to use omap7xx.h
This patch is part of a series which removes references to omap730 in code
which is shared with omap850, replacing them with references to omap7xx.
Signed-off-by: Alistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: Zebediah C. McClure <zmc@lurian.net>
Diffstat (limited to 'arch/arm/mach-omap1/board-perseus2.c')
-rw-r--r-- | arch/arm/mach-omap1/board-perseus2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index 83406699f310..ec22838e8e79 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c | |||
@@ -270,7 +270,7 @@ static void __init omap_perseus2_map_io(void) | |||
270 | /* | 270 | /* |
271 | * Hold GSM Reset until needed | 271 | * Hold GSM Reset until needed |
272 | */ | 272 | */ |
273 | omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL); | 273 | omap_writew(omap_readw(OMAP7XX_DSP_M_CTL) & ~1, OMAP7XX_DSP_M_CTL); |
274 | 274 | ||
275 | /* | 275 | /* |
276 | * UARTs -> done automagically by 8250 driver | 276 | * UARTs -> done automagically by 8250 driver |
@@ -281,21 +281,21 @@ static void __init omap_perseus2_map_io(void) | |||
281 | */ | 281 | */ |
282 | 282 | ||
283 | /* Flash: CS0 timings setup */ | 283 | /* Flash: CS0 timings setup */ |
284 | omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0); | 284 | omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_0); |
285 | omap_writel(0x00000088, OMAP730_FLASH_ACFG_0); | 285 | omap_writel(0x00000088, OMAP7XX_FLASH_ACFG_0); |
286 | 286 | ||
287 | /* | 287 | /* |
288 | * Ethernet support through the debug board | 288 | * Ethernet support through the debug board |
289 | * CS1 timings setup | 289 | * CS1 timings setup |
290 | */ | 290 | */ |
291 | omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1); | 291 | omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_1); |
292 | omap_writel(0x00000000, OMAP730_FLASH_ACFG_1); | 292 | omap_writel(0x00000000, OMAP7XX_FLASH_ACFG_1); |
293 | 293 | ||
294 | /* | 294 | /* |
295 | * Configure MPU_EXT_NIRQ IO in IO_CONF9 register, | 295 | * Configure MPU_EXT_NIRQ IO in IO_CONF9 register, |
296 | * It is used as the Ethernet controller interrupt | 296 | * It is used as the Ethernet controller interrupt |
297 | */ | 297 | */ |
298 | omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9); | 298 | omap_writel(omap_readl(OMAP7XX_IO_CONF_9) & 0x1FFFFFFF, OMAP7XX_IO_CONF_9); |
299 | } | 299 | } |
300 | 300 | ||
301 | MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2") | 301 | MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2") |