diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-10-19 17:32:55 -0700 | 
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-10-19 17:32:55 -0700 | 
| commit | 1e79ab8a45b71d3d08eb6cdac44b66229dcea03e (patch) | |
| tree | 1e13ca8d336618d251883c3d7b80a5067faa7d2f /arch/arm/plat-omap | |
| parent | 72464dbae2749dd57bc2b3cd57d4fc6ba7abca37 (diff) | |
| download | olio-linux-3.10-1e79ab8a45b71d3d08eb6cdac44b66229dcea03e.tar.xz olio-linux-3.10-1e79ab8a45b71d3d08eb6cdac44b66229dcea03e.zip  | |
omap: headers: Move mtd-xip.h to be mach-omap1 specific
These registers are omap1 specific.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/mtd-xip.h | 61 | 
1 files changed, 0 insertions, 61 deletions
diff --git a/arch/arm/plat-omap/include/mach/mtd-xip.h b/arch/arm/plat-omap/include/mach/mtd-xip.h deleted file mode 100644 index f82a8dcaad9..00000000000 --- a/arch/arm/plat-omap/include/mach/mtd-xip.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * MTD primitives for XIP support. Architecture specific functions. - * - * Do not include this file directly. It's included from linux/mtd/xip.h - * - * Author: Vladimir Barinov <vbarinov@embeddedalley.com> - * - * (c) 2005 MontaVista Software, Inc.  This file is licensed under the - * terms of the GNU General Public License version 2.  This program is - * licensed "as is" without any warranty of any kind, whether express or - * implied. - */ - -#ifndef __ARCH_OMAP_MTD_XIP_H__ -#define __ARCH_OMAP_MTD_XIP_H__ - -#include <mach/hardware.h> -#define OMAP_MPU_TIMER_BASE	(0xfffec500) -#define OMAP_MPU_TIMER_OFFSET	0x100 - -typedef struct { -	u32 cntl;			/* CNTL_TIMER, R/W */ -	u32 load_tim;			/* LOAD_TIM,   W */ -	u32 read_tim;			/* READ_TIM,   R */ -} xip_omap_mpu_timer_regs_t; - -#define xip_omap_mpu_timer_base(n)					\ -((volatile xip_omap_mpu_timer_regs_t*)OMAP1_IO_ADDRESS(OMAP_MPU_TIMER_BASE +	\ -	(n)*OMAP_MPU_TIMER_OFFSET)) - -static inline unsigned long xip_omap_mpu_timer_read(int nr) -{ -	volatile xip_omap_mpu_timer_regs_t* timer = xip_omap_mpu_timer_base(nr); -	return timer->read_tim; -} - -#define xip_irqpending()	\ -	(omap_readl(OMAP_IH1_ITR) & ~omap_readl(OMAP_IH1_MIR)) -#define xip_currtime()		(~xip_omap_mpu_timer_read(0)) - -/* - * It's permitted to do approxmation for xip_elapsed_since macro - * (see linux/mtd/xip.h) - */ - -#ifdef CONFIG_MACH_OMAP_PERSEUS2 -#define xip_elapsed_since(x)	(signed)((~xip_omap_mpu_timer_read(0) - (x)) / 7) -#else -#define xip_elapsed_since(x)	(signed)((~xip_omap_mpu_timer_read(0) - (x)) / 6) -#endif - -/* - * xip_cpu_idle() is used when waiting for a delay equal or larger than - * the system timer tick period.  This should put the CPU into idle mode - * to save power and to be woken up only when some interrupts are pending. - * As above, this should not rely upon standard kernel code. - */ - -#define xip_cpu_idle()  asm volatile ("mcr p15, 0, %0, c7, c0, 4" :: "r" (1)) - -#endif /* __ARCH_OMAP_MTD_XIP_H__ */  |