Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 51148f1fb0835fc87ab3630d191dc3c880d4d0af

Authored by Artem Bityutskiy
Committed by David Woodhouse
1 parent 68aa352de2
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

mtd: nand: remove few tiny page NAND bits 

NAND flashes with 256 bytes NAND pages are so old that probably do not exist
any more. Let's remove few related pieces of code and forget about them
forever. The assumption will be that 512 bytes NAND page size is the minimum
possible.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Showing 3 changed files with 4 additions and 13 deletions Side-by-side Diff

drivers/mtd/nand/nand_base.c
Diff comments   View file @ 51148f1
... ... @@ -512,7 +512,7 @@
512 512 * @page_addr: the page address for this command, -1 if none
513 513 *
514 514 * Send command to NAND device. This function is used for small page devices
515   - * (256/512 Bytes per page).
  515 + * (512 Bytes per page).
516 516 */
517 517 static void nand_command(struct mtd_info *mtd, unsigned int command,
518 518 int column, int page_addr)
drivers/mtd/nand/nandsim.c
Diff comments   View file @ 51148f1
... ... @@ -262,14 +262,13 @@
262 262 #define NS_OPER_STATES 6 /* Maximum number of states in operation */
263 263  
264 264 #define OPT_ANY 0xFFFFFFFF /* any chip supports this operation */
265   -#define OPT_PAGE256 0x00000001 /* 256-byte page chips */
266 265 #define OPT_PAGE512 0x00000002 /* 512-byte page chips */
267 266 #define OPT_PAGE2048 0x00000008 /* 2048-byte page chips */
268 267 #define OPT_SMARTMEDIA 0x00000010 /* SmartMedia technology chips */
269 268 #define OPT_PAGE512_8BIT 0x00000040 /* 512-byte page chips with 8-bit bus width */
270 269 #define OPT_PAGE4096 0x00000080 /* 4096-byte page chips */
271 270 #define OPT_LARGEPAGE (OPT_PAGE2048 | OPT_PAGE4096) /* 2048 & 4096-byte page chips */
272   -#define OPT_SMALLPAGE (OPT_PAGE256 | OPT_PAGE512) /* 256 and 512-byte page chips */
  271 +#define OPT_SMALLPAGE (OPT_PAGE512) /* 512-byte page chips */
273 272  
274 273 /* Remove action bits from state */
275 274 #define NS_STATE(x) ((x) & ~ACTION_MASK)
... ... @@ -696,10 +695,7 @@
696 695 ns->geom.secszoob = ns->geom.secsz + ns->geom.oobsz * ns->geom.pgsec;
697 696 ns->options = 0;
698 697  
699   - if (ns->geom.pgsz == 256) {
700   - ns->options |= OPT_PAGE256;
701   - }
702   - else if (ns->geom.pgsz == 512) {
  698 + if (ns->geom.pgsz == 512) {
703 699 ns->options |= OPT_PAGE512;
704 700 if (ns->busw == 8)
705 701 ns->options |= OPT_PAGE512_8BIT;
... ... @@ -2298,7 +2294,7 @@
2298 2294 nand->geom.idbytes = 2;
2299 2295 nand->regs.status = NS_STATUS_OK(nand);
2300 2296 nand->nxstate = STATE_UNKNOWN;
2301   - nand->options |= OPT_PAGE256; /* temporary value */
  2297 + nand->options |= OPT_PAGE512; /* temporary value */
2302 2298 nand->ids[0] = first_id_byte;
2303 2299 nand->ids[1] = second_id_byte;
2304 2300 nand->ids[2] = third_id_byte;
drivers/mtd/nand/sm_common.c
Diff comments   View file @ 51148f1
... ... @@ -69,11 +69,6 @@
69 69  
70 70  
71 71 static struct nand_flash_dev nand_smartmedia_flash_ids[] = {
72   - {"SmartMedia 1MiB 5V", 0x6e, 256, 1, 0x1000, 0},
73   - {"SmartMedia 1MiB 3,3V", 0xe8, 256, 1, 0x1000, 0},
74   - {"SmartMedia 1MiB 3,3V", 0xec, 256, 1, 0x1000, 0},
75   - {"SmartMedia 2MiB 3,3V", 0xea, 256, 2, 0x1000, 0},
76   - {"SmartMedia 2MiB 5V", 0x64, 256, 2, 0x1000, 0},
77 72 {"SmartMedia 2MiB 3,3V ROM", 0x5d, 512, 2, 0x2000, NAND_ROM},
78 73 {"SmartMedia 4MiB 3,3V", 0xe3, 512, 4, 0x2000, 0},
79 74 {"SmartMedia 4MiB 3,3/5V", 0xe5, 512, 4, 0x2000, 0},