summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuang Shijie <b32955@freescale.com>2010-12-17 11:14:14 +0800
committerRobby Cai <R63905@freescale.com>2010-12-17 13:46:47 +0800
commit75a0d047d0863a53756d797a3154bd445505ac53 (patch)
treebf6ce71ba62ea7ce3fd1e2bb09cd656c918e52e1
parent65960ec43ab7b7872adb652df6b2ffe65d965051 (diff)
ENGR00137101-4 GPMI : change the is_onfi_nand() to is_ddr_nand()
change the function name is_onfi_nand() to is_ddr_nand(). Signed-off-by: Huang Shijie <b32955@freescale.com>
-rw-r--r--drivers/mtd/nand/gpmi-nfc/gpmi-nfc-hal-common.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/mtd/nand/gpmi-nfc/gpmi-nfc-hal-common.c b/drivers/mtd/nand/gpmi-nfc/gpmi-nfc-hal-common.c
index ba2fb07aeaa4..e5ba51f2b7be 100644
--- a/drivers/mtd/nand/gpmi-nfc/gpmi-nfc-hal-common.c
+++ b/drivers/mtd/nand/gpmi-nfc/gpmi-nfc-hal-common.c
@@ -178,7 +178,7 @@ int gpmi_nfc_set_geometry(struct gpmi_nfc_data *this)
geometry->ecc_chunk_size_in_bytes = 512;
/* Only ONFI nand uses 1k chunk now */
- if (is_onfi_nand(&this->device_info))
+ if (is_ddr_nand(&this->device_info))
geometry->ecc_chunk_size_in_bytes = 1024;
/* Compute the page size based on the physical geometry. */
@@ -223,9 +223,12 @@ int gpmi_nfc_set_geometry(struct gpmi_nfc_data *this)
break;
case 8192:
geometry->ecc_strength = 24;
-
- /* ONFI nand needs GF14, so re-culculate DMA page size */
- if (is_onfi_nand(&this->device_info))
+ /*
+ * ONFI/TOGGLE nand needs GF14, so re-culculate DMA page size.
+ * The ONFI nand must do the reculation,
+ * else it will fail in DMA.
+ */
+ if (is_ddr_nand(&this->device_info))
geometry->page_size_in_bytes =
physical->page_data_size_in_bytes +
geometry->metadata_size_in_bytes +
@@ -294,7 +297,7 @@ int gpmi_nfc_set_geometry(struct gpmi_nfc_data *this)
chunk_data_size_in_bits = geometry->ecc_chunk_size_in_bytes * 8;
/* ONFI nand needs GF14 */
- if (is_onfi_nand(&this->device_info))
+ if (is_ddr_nand(&this->device_info))
chunk_ecc_size_in_bits = geometry->ecc_strength * 14;
else
chunk_ecc_size_in_bits = geometry->ecc_strength * 13;