diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-19 11:08:42 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-24 04:07:03 -0500 |
commit | 44fb5d1945fe87f3299de5e2e0581f092e8dd455 (patch) | |
tree | 93a49d7abc326913e6632a8b99b345bbb3c405ff | |
parent | 9f69fdb36da31672b0e40712fed494182530c887 (diff) |
arm/imx: remove MTD_XIP support
This is broken since at least one year when
ec996ba (mxc timer: make compile time independent)
removed the symbol MXC_TCN.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mtd-xip.h | 34 |
2 files changed, 0 insertions, 35 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9c78cfbed8c..3bf3d48ddbf 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -308,7 +308,6 @@ config ARCH_MXC | |||
308 | bool "Freescale MXC/iMX-based" | 308 | bool "Freescale MXC/iMX-based" |
309 | select GENERIC_TIME | 309 | select GENERIC_TIME |
310 | select GENERIC_CLOCKEVENTS | 310 | select GENERIC_CLOCKEVENTS |
311 | select ARCH_MTD_XIP | ||
312 | select ARCH_REQUIRE_GPIOLIB | 311 | select ARCH_REQUIRE_GPIOLIB |
313 | select HAVE_CLK | 312 | select HAVE_CLK |
314 | select COMMON_CLKDEV | 313 | select COMMON_CLKDEV |
diff --git a/arch/arm/plat-mxc/include/mach/mtd-xip.h b/arch/arm/plat-mxc/include/mach/mtd-xip.h deleted file mode 100644 index 1ab1bba5688..00000000000 --- a/arch/arm/plat-mxc/include/mach/mtd-xip.h +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | /* | ||
2 | * MTD primitives for XIP support. Architecture specific functions | ||
3 | * | ||
4 | * Do not include this file directly. It's included from linux/mtd/xip.h | ||
5 | * | ||
6 | * Copyright (C) 2008 Darius Augulis <augulis.darius@gmail.com>, Teltonika, Inc. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #include <mach/mxc_timer.h> | ||
15 | |||
16 | #ifndef __ARCH_IMX_MTD_XIP_H__ | ||
17 | #define __ARCH_IMX_MTD_XIP_H__ | ||
18 | |||
19 | #ifdef CONFIG_ARCH_MX1 | ||
20 | /* AITC registers */ | ||
21 | #define AITC_BASE IO_ADDRESS(AVIC_BASE_ADDR) | ||
22 | #define NIPNDH (AITC_BASE + 0x58) | ||
23 | #define NIPNDL (AITC_BASE + 0x5C) | ||
24 | #define INTENABLEH (AITC_BASE + 0x10) | ||
25 | #define INTENABLEL (AITC_BASE + 0x14) | ||
26 | /* MTD macros */ | ||
27 | #define xip_irqpending() ((__raw_readl(INTENABLEH) & __raw_readl(NIPNDH)) \ | ||
28 | || (__raw_readl(INTENABLEL) & __raw_readl(NIPNDL))) | ||
29 | #define xip_currtime() (__raw_readl(TIMER_BASE + MXC_TCN)) | ||
30 | #define xip_elapsed_since(x) (signed)((__raw_readl(TIMER_BASE + MXC_TCN) - (x)) / 96) | ||
31 | #define xip_cpu_idle() asm volatile ("mcr p15, 0, %0, c7, c0, 4" :: "r" (0)) | ||
32 | #endif /* CONFIG_ARCH_MX1 */ | ||
33 | |||
34 | #endif /* __ARCH_IMX_MTD_XIP_H__ */ | ||