diff options
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/omap_uwire.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c index e75ba9b28898..7bcf409792c7 100644 --- a/drivers/spi/omap_uwire.c +++ b/drivers/spi/omap_uwire.c | |||
@@ -52,7 +52,7 @@ | |||
52 | #include <asm/mach-types.h> | 52 | #include <asm/mach-types.h> |
53 | 53 | ||
54 | #include <mach/mux.h> | 54 | #include <mach/mux.h> |
55 | #include <mach/omap730.h> /* OMAP730_IO_CONF registers */ | 55 | #include <mach/omap7xx.h> /* OMAP7XX_IO_CONF registers */ |
56 | 56 | ||
57 | 57 | ||
58 | /* FIXME address is now a platform device resource, | 58 | /* FIXME address is now a platform device resource, |
@@ -504,7 +504,7 @@ static int __init uwire_probe(struct platform_device *pdev) | |||
504 | } | 504 | } |
505 | clk_enable(uwire->ck); | 505 | clk_enable(uwire->ck); |
506 | 506 | ||
507 | if (cpu_is_omap730()) | 507 | if (cpu_is_omap7xx()) |
508 | uwire_idx_shift = 1; | 508 | uwire_idx_shift = 1; |
509 | else | 509 | else |
510 | uwire_idx_shift = 2; | 510 | uwire_idx_shift = 2; |
@@ -573,8 +573,8 @@ static int __init omap_uwire_init(void) | |||
573 | } | 573 | } |
574 | if (machine_is_omap_perseus2()) { | 574 | if (machine_is_omap_perseus2()) { |
575 | /* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */ | 575 | /* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */ |
576 | int val = omap_readl(OMAP730_IO_CONF_9) & ~0x00EEE000; | 576 | int val = omap_readl(OMAP7XX_IO_CONF_9) & ~0x00EEE000; |
577 | omap_writel(val | 0x00AAA000, OMAP730_IO_CONF_9); | 577 | omap_writel(val | 0x00AAA000, OMAP7XX_IO_CONF_9); |
578 | } | 578 | } |
579 | 579 | ||
580 | return platform_driver_probe(&uwire_driver, uwire_probe); | 580 | return platform_driver_probe(&uwire_driver, uwire_probe); |