diff options
author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2009-09-10 01:55:23 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2009-11-30 20:02:43 -0500 |
commit | 82b95ecb96122896fd5b7b75001fdda3e047ef38 (patch) | |
tree | 88eda9608b83db56e9e4b4473a342760706843d9 /arch/arm/mach-pxa | |
parent | 171d0fbee2b80cd21ff590449a05a48c1dc917b8 (diff) |
pxa3xx_nand: move pxa3xx_nand.h common into plat directory
Since the same nand controller is shared between ARCH_PXA and ARCH_MMP. Move
the pxa3xx_nand.h from mach directory to plat directoy.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: David Woodhouse <david.woodhouse@intel.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/cm-x300.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/colibri-pxa3xx.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/devices.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa3xx_nand.h | 63 | ||||
-rw-r--r-- | arch/arm/mach-pxa/littleton.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zylonite.c | 2 |
6 files changed, 7 insertions, 70 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index 102916f1e465..06552ca91814 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <mach/mmc.h> | 35 | #include <mach/mmc.h> |
36 | #include <mach/ohci.h> | 36 | #include <mach/ohci.h> |
37 | #include <plat/i2c.h> | 37 | #include <plat/i2c.h> |
38 | #include <mach/pxa3xx_nand.h> | 38 | #include <plat/pxa3xx_nand.h> |
39 | 39 | ||
40 | #include <asm/mach/map.h> | 40 | #include <asm/mach/map.h> |
41 | 41 | ||
diff --git a/arch/arm/mach-pxa/colibri-pxa3xx.c b/arch/arm/mach-pxa/colibri-pxa3xx.c index efebaf4d734d..e6c0a2287eb8 100644 --- a/arch/arm/mach-pxa/colibri-pxa3xx.c +++ b/arch/arm/mach-pxa/colibri-pxa3xx.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <mach/colibri.h> | 25 | #include <mach/colibri.h> |
26 | #include <mach/mmc.h> | 26 | #include <mach/mmc.h> |
27 | #include <mach/pxafb.h> | 27 | #include <mach/pxafb.h> |
28 | #include <mach/pxa3xx_nand.h> | 28 | #include <plat/pxa3xx_nand.h> |
29 | 29 | ||
30 | #include "generic.h" | 30 | #include "generic.h" |
31 | #include "devices.h" | 31 | #include "devices.h" |
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 46fabe1cca11..e2b427fa55e5 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c | |||
@@ -8,13 +8,13 @@ | |||
8 | #include <mach/pxafb.h> | 8 | #include <mach/pxafb.h> |
9 | #include <mach/mmc.h> | 9 | #include <mach/mmc.h> |
10 | #include <mach/irda.h> | 10 | #include <mach/irda.h> |
11 | #include <plat/i2c.h> | ||
12 | #include <mach/ohci.h> | 11 | #include <mach/ohci.h> |
13 | #include <mach/pxa27x_keypad.h> | 12 | #include <mach/pxa27x_keypad.h> |
14 | #include <mach/pxa2xx_spi.h> | 13 | #include <mach/pxa2xx_spi.h> |
15 | #include <mach/camera.h> | 14 | #include <mach/camera.h> |
16 | #include <mach/audio.h> | 15 | #include <mach/audio.h> |
17 | #include <mach/pxa3xx_nand.h> | 16 | #include <plat/i2c.h> |
17 | #include <plat/pxa3xx_nand.h> | ||
18 | 18 | ||
19 | #include "devices.h" | 19 | #include "devices.h" |
20 | #include "generic.h" | 20 | #include "generic.h" |
diff --git a/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h b/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h deleted file mode 100644 index 3478eae32d8a..000000000000 --- a/arch/arm/mach-pxa/include/mach/pxa3xx_nand.h +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | #ifndef __ASM_ARCH_PXA3XX_NAND_H | ||
2 | #define __ASM_ARCH_PXA3XX_NAND_H | ||
3 | |||
4 | #include <linux/mtd/mtd.h> | ||
5 | #include <linux/mtd/partitions.h> | ||
6 | |||
7 | struct pxa3xx_nand_timing { | ||
8 | unsigned int tCH; /* Enable signal hold time */ | ||
9 | unsigned int tCS; /* Enable signal setup time */ | ||
10 | unsigned int tWH; /* ND_nWE high duration */ | ||
11 | unsigned int tWP; /* ND_nWE pulse time */ | ||
12 | unsigned int tRH; /* ND_nRE high duration */ | ||
13 | unsigned int tRP; /* ND_nRE pulse width */ | ||
14 | unsigned int tR; /* ND_nWE high to ND_nRE low for read */ | ||
15 | unsigned int tWHR; /* ND_nWE high to ND_nRE low for status read */ | ||
16 | unsigned int tAR; /* ND_ALE low to ND_nRE low delay */ | ||
17 | }; | ||
18 | |||
19 | struct pxa3xx_nand_cmdset { | ||
20 | uint16_t read1; | ||
21 | uint16_t read2; | ||
22 | uint16_t program; | ||
23 | uint16_t read_status; | ||
24 | uint16_t read_id; | ||
25 | uint16_t erase; | ||
26 | uint16_t reset; | ||
27 | uint16_t lock; | ||
28 | uint16_t unlock; | ||
29 | uint16_t lock_status; | ||
30 | }; | ||
31 | |||
32 | struct pxa3xx_nand_flash { | ||
33 | const struct pxa3xx_nand_timing *timing; /* NAND Flash timing */ | ||
34 | const struct pxa3xx_nand_cmdset *cmdset; | ||
35 | |||
36 | uint32_t page_per_block;/* Pages per block (PG_PER_BLK) */ | ||
37 | uint32_t page_size; /* Page size in bytes (PAGE_SZ) */ | ||
38 | uint32_t flash_width; /* Width of Flash memory (DWIDTH_M) */ | ||
39 | uint32_t dfc_width; /* Width of flash controller(DWIDTH_C) */ | ||
40 | uint32_t num_blocks; /* Number of physical blocks in Flash */ | ||
41 | uint32_t chip_id; | ||
42 | }; | ||
43 | |||
44 | struct pxa3xx_nand_platform_data { | ||
45 | |||
46 | /* the data flash bus is shared between the Static Memory | ||
47 | * Controller and the Data Flash Controller, the arbiter | ||
48 | * controls the ownership of the bus | ||
49 | */ | ||
50 | int enable_arbiter; | ||
51 | |||
52 | /* allow platform code to keep OBM/bootloader defined NFC config */ | ||
53 | int keep_config; | ||
54 | |||
55 | const struct mtd_partition *parts; | ||
56 | unsigned int nr_parts; | ||
57 | |||
58 | const struct pxa3xx_nand_flash * flash; | ||
59 | size_t num_flash; | ||
60 | }; | ||
61 | |||
62 | extern void pxa3xx_set_nand_info(struct pxa3xx_nand_platform_data *info); | ||
63 | #endif /* __ASM_ARCH_PXA3XX_NAND_H */ | ||
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c index 13848955d133..ce5e6175a050 100644 --- a/arch/arm/mach-pxa/littleton.c +++ b/arch/arm/mach-pxa/littleton.c | |||
@@ -44,10 +44,10 @@ | |||
44 | #include <mach/ssp.h> | 44 | #include <mach/ssp.h> |
45 | #include <mach/mmc.h> | 45 | #include <mach/mmc.h> |
46 | #include <mach/pxa2xx_spi.h> | 46 | #include <mach/pxa2xx_spi.h> |
47 | #include <plat/i2c.h> | ||
48 | #include <mach/pxa27x_keypad.h> | 47 | #include <mach/pxa27x_keypad.h> |
49 | #include <mach/pxa3xx_nand.h> | ||
50 | #include <mach/littleton.h> | 48 | #include <mach/littleton.h> |
49 | #include <plat/i2c.h> | ||
50 | #include <plat/pxa3xx_nand.h> | ||
51 | 51 | ||
52 | #include "generic.h" | 52 | #include "generic.h" |
53 | 53 | ||
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c index 09784d3954e4..8fcb69411cf7 100644 --- a/arch/arm/mach-pxa/zylonite.c +++ b/arch/arm/mach-pxa/zylonite.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <mach/mmc.h> | 31 | #include <mach/mmc.h> |
32 | #include <mach/ohci.h> | 32 | #include <mach/ohci.h> |
33 | #include <mach/pxa27x_keypad.h> | 33 | #include <mach/pxa27x_keypad.h> |
34 | #include <mach/pxa3xx_nand.h> | 34 | #include <plat/pxa3xx_nand.h> |
35 | 35 | ||
36 | #include "devices.h" | 36 | #include "devices.h" |
37 | #include "generic.h" | 37 | #include "generic.h" |