lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OMAP7XX: omap_uwire.c: Convert to omap7xx.h

Browse Source 
This also replaces CPU checks with cpu_is_omap7xx()

Signed-off-by: Alistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: Zebediah C. McClure <zmc@lurian.net>
This commit is contained in:
Alistair Buxton
2009-09-22 10:04:51 +01:00
parent 7c00692640
commit 7a8f48f8c6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/spi/omap_uwire.c
View File

@@ -52,7 +52,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/omap730.h> /* OMAP730_IO_CONF registers */ #include <mach/omap7xx.h> /* OMAP7XX_IO_CONF registers */
/* FIXME address is now a platform device resource, /* FIXME address is now a platform device resource,
@@ -504,7 +504,7 @@ static int __init uwire_probe(struct platform_device *pdev)
} }
clk_enable(uwire->ck); clk_enable(uwire->ck);
if (cpu_is_omap730()) if (cpu_is_omap7xx())
uwire_idx_shift = 1; uwire_idx_shift = 1;
else else
uwire_idx_shift = 2; uwire_idx_shift = 2;
@@ -573,8 +573,8 @@ static int __init omap_uwire_init(void)
} }
if (machine_is_omap_perseus2()) { if (machine_is_omap_perseus2()) {
/* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */ /* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */
int val = omap_readl(OMAP730_IO_CONF_9) & ~0x00EEE000; int val = omap_readl(OMAP7XX_IO_CONF_9) & ~0x00EEE000;
omap_writel(val | 0x00AAA000, OMAP730_IO_CONF_9); omap_writel(val | 0x00AAA000, OMAP7XX_IO_CONF_9);
} }
return platform_driver_probe(&uwire_driver, uwire_probe); return platform_driver_probe(&uwire_driver, uwire_probe);