diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-fsample.c')
-rw-r--r-- | arch/arm/mach-omap1/board-fsample.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index a7ead1b93226..e53f7748ac13 100644 --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.c | |||
@@ -309,7 +309,7 @@ static void __init omap_fsample_map_io(void) | |||
309 | /* | 309 | /* |
310 | * Hold GSM Reset until needed | 310 | * Hold GSM Reset until needed |
311 | */ | 311 | */ |
312 | omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL); | 312 | omap_writew(omap_readw(OMAP7XX_DSP_M_CTL) & ~1, OMAP7XX_DSP_M_CTL); |
313 | 313 | ||
314 | /* | 314 | /* |
315 | * UARTs -> done automagically by 8250 driver | 315 | * UARTs -> done automagically by 8250 driver |
@@ -320,21 +320,21 @@ static void __init omap_fsample_map_io(void) | |||
320 | */ | 320 | */ |
321 | 321 | ||
322 | /* Flash: CS0 timings setup */ | 322 | /* Flash: CS0 timings setup */ |
323 | omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0); | 323 | omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_0); |
324 | omap_writel(0x00000088, OMAP730_FLASH_ACFG_0); | 324 | omap_writel(0x00000088, OMAP7XX_FLASH_ACFG_0); |
325 | 325 | ||
326 | /* | 326 | /* |
327 | * Ethernet support through the debug board | 327 | * Ethernet support through the debug board |
328 | * CS1 timings setup | 328 | * CS1 timings setup |
329 | */ | 329 | */ |
330 | omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1); | 330 | omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_1); |
331 | omap_writel(0x00000000, OMAP730_FLASH_ACFG_1); | 331 | omap_writel(0x00000000, OMAP7XX_FLASH_ACFG_1); |
332 | 332 | ||
333 | /* | 333 | /* |
334 | * Configure MPU_EXT_NIRQ IO in IO_CONF9 register, | 334 | * Configure MPU_EXT_NIRQ IO in IO_CONF9 register, |
335 | * It is used as the Ethernet controller interrupt | 335 | * It is used as the Ethernet controller interrupt |
336 | */ | 336 | */ |
337 | omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9); | 337 | omap_writel(omap_readl(OMAP7XX_IO_CONF_9) & 0x1FFFFFFF, OMAP7XX_IO_CONF_9); |
338 | } | 338 | } |
339 | 339 | ||
340 | MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample") | 340 | MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample") |