summary refs log tree commit diff
path: root/arch/arm/plat-pxa
diff options
context:
space:
mode:
authorLei Wen <leiwen@marvell.com>2011-03-03 11:27:01 +0800
committerDavid Woodhouse <David.Woodhouse@intel.com>2011-03-11 14:22:51 +0000
commit4332c116869ceca58638beabd9e9a5d7db4cef83 (patch)
tree634c53f84bc2366ed5d31f47c491f2de324b9177 /arch/arm/plat-pxa
parent401e67e225f350757e11e39392dcc6a0fddcea63 (diff)
downloadlinux-4332c116869ceca58638beabd9e9a5d7db4cef83.tar.gz
mtd: pxa3xx_nand: clean the keep configure code
Use nand_scan_ident to unify the need of mtd member initilization
for both normal detection and keep configuration method.

Signed-off-by: Lei Wen <leiwen@marvell.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch/arm/plat-pxa')
-rw-r--r--arch/arm/plat-pxa/include/plat/pxa3xx_nand.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-pxa/include/plat/pxa3xx_nand.h b/arch/arm/plat-pxa/include/plat/pxa3xx_nand.h
index 01a8448e471c..442301fe48b4 100644
--- a/arch/arm/plat-pxa/include/plat/pxa3xx_nand.h
+++ b/arch/arm/plat-pxa/include/plat/pxa3xx_nand.h
@@ -30,6 +30,7 @@ struct pxa3xx_nand_cmdset {
 };
 
 struct pxa3xx_nand_flash {
+	char		*name;
 	uint32_t	chip_id;
 	unsigned int	page_per_block; /* Pages per block (PG_PER_BLK) */
 	unsigned int	page_size;	/* Page size in bytes (PAGE_SZ) */
@@ -37,7 +38,6 @@ struct pxa3xx_nand_flash {
 	unsigned int	dfc_width;	/* Width of flash controller(DWIDTH_C) */
 	unsigned int	num_blocks;	/* Number of physical blocks in Flash */
 
-	struct pxa3xx_nand_cmdset *cmdset;	/* NAND command set */
 	struct pxa3xx_nand_timing *timing;	/* NAND Flash timing */
 };