diff options
| author | Alistair Buxton <a.j.buxton@gmail.com> | 2009-09-22 10:04:51 +0100 |
|---|---|---|
| committer | Alistair Buxton <a.j.buxton@gmail.com> | 2009-10-07 23:14:07 +0100 |
| commit | 7a8f48f8c611ac8c07023260258e2fec312b9242 (patch) | |
| tree | 53188108f660c9dde79acb3f0ab14cb578c7e6d2 | |
| parent | 7c0069264017fdac8ef017b8893f0f0d7a13851a (diff) | |
| download | op-kernel-dev-7a8f48f8c611ac8c07023260258e2fec312b9242.zip op-kernel-dev-7a8f48f8c611ac8c07023260258e2fec312b9242.tar.gz | |
OMAP7XX: omap_uwire.c: Convert to omap7xx.h
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>
| -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 e75ba9b..7bcf409 100644 --- a/drivers/spi/omap_uwire.c +++ b/drivers/spi/omap_uwire.c @@ -52,7 +52,7 @@ #include <asm/mach-types.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, @@ -504,7 +504,7 @@ static int __init uwire_probe(struct platform_device *pdev) } clk_enable(uwire->ck); - if (cpu_is_omap730()) + if (cpu_is_omap7xx()) uwire_idx_shift = 1; else uwire_idx_shift = 2; @@ -573,8 +573,8 @@ static int __init omap_uwire_init(void) } if (machine_is_omap_perseus2()) { /* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */ - int val = omap_readl(OMAP730_IO_CONF_9) & ~0x00EEE000; - omap_writel(val | 0x00AAA000, OMAP730_IO_CONF_9); + int val = omap_readl(OMAP7XX_IO_CONF_9) & ~0x00EEE000; + omap_writel(val | 0x00AAA000, OMAP7XX_IO_CONF_9); } return platform_driver_probe(&uwire_driver, uwire_probe); |
