Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a8f48f8 authored by Alistair Buxton's avatar Alistair Buxton
Browse files

OMAP7XX: omap_uwire.c: Convert to omap7xx.h 



This also replaces CPU checks with cpu_is_omap7xx()

Signed-off-by: default avatarAlistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: default avatarZebediah C. McClure <zmc@lurian.net>
parent 7c006926

drivers/spi/omap_uwire.c

+4 −4
Original line number Diff line number Diff line
@@ -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);