Commit 204e7ecd authored by Boris Brezillon's avatar Boris Brezillon

mtd: nand: Add a few more timings to nand_sdr_timings

Add the tR_max, tBERS_max, tPROG_max and tCCS_min timings to the
nand_sdr_timings struct.
Assign default/safe values for the statically defined timings, and
extract them from the ONFI parameter table if the NAND is ONFI
compliant.
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Tested-by: default avatarMarc Gonzalez <marc_gonzalez@sigmadesigns.com>
parent 1c825ad1
...@@ -18,6 +18,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = { ...@@ -18,6 +18,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = {
{ {
.type = NAND_SDR_IFACE, .type = NAND_SDR_IFACE,
.timings.sdr = { .timings.sdr = {
.tCCS_min = 500000,
.tR_max = 200000000,
.tADL_min = 400000, .tADL_min = 400000,
.tALH_min = 20000, .tALH_min = 20000,
.tALS_min = 50000, .tALS_min = 50000,
...@@ -58,6 +60,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = { ...@@ -58,6 +60,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = {
{ {
.type = NAND_SDR_IFACE, .type = NAND_SDR_IFACE,
.timings.sdr = { .timings.sdr = {
.tCCS_min = 500000,
.tR_max = 200000000,
.tADL_min = 400000, .tADL_min = 400000,
.tALH_min = 10000, .tALH_min = 10000,
.tALS_min = 25000, .tALS_min = 25000,
...@@ -98,6 +102,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = { ...@@ -98,6 +102,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = {
{ {
.type = NAND_SDR_IFACE, .type = NAND_SDR_IFACE,
.timings.sdr = { .timings.sdr = {
.tCCS_min = 500000,
.tR_max = 200000000,
.tADL_min = 400000, .tADL_min = 400000,
.tALH_min = 10000, .tALH_min = 10000,
.tALS_min = 15000, .tALS_min = 15000,
...@@ -138,6 +144,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = { ...@@ -138,6 +144,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = {
{ {
.type = NAND_SDR_IFACE, .type = NAND_SDR_IFACE,
.timings.sdr = { .timings.sdr = {
.tCCS_min = 500000,
.tR_max = 200000000,
.tADL_min = 400000, .tADL_min = 400000,
.tALH_min = 5000, .tALH_min = 5000,
.tALS_min = 10000, .tALS_min = 10000,
...@@ -178,6 +186,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = { ...@@ -178,6 +186,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = {
{ {
.type = NAND_SDR_IFACE, .type = NAND_SDR_IFACE,
.timings.sdr = { .timings.sdr = {
.tCCS_min = 500000,
.tR_max = 200000000,
.tADL_min = 400000, .tADL_min = 400000,
.tALH_min = 5000, .tALH_min = 5000,
.tALS_min = 10000, .tALS_min = 10000,
...@@ -218,6 +228,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = { ...@@ -218,6 +228,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = {
{ {
.type = NAND_SDR_IFACE, .type = NAND_SDR_IFACE,
.timings.sdr = { .timings.sdr = {
.tCCS_min = 500000,
.tR_max = 200000000,
.tADL_min = 400000, .tADL_min = 400000,
.tALH_min = 5000, .tALH_min = 5000,
.tALS_min = 10000, .tALS_min = 10000,
...@@ -290,10 +302,22 @@ int onfi_init_data_interface(struct nand_chip *chip, ...@@ -290,10 +302,22 @@ int onfi_init_data_interface(struct nand_chip *chip,
*iface = onfi_sdr_timings[timing_mode]; *iface = onfi_sdr_timings[timing_mode];
/* /*
* TODO: initialize timings that cannot be deduced from timing mode: * Initialize timings that cannot be deduced from timing mode:
* tR, tPROG, tCCS, ... * tR, tPROG, tCCS, ...
* These information are part of the ONFI parameter page. * These information are part of the ONFI parameter page.
*/ */
if (chip->onfi_version) {
struct nand_onfi_params *params = &chip->onfi_params;
struct nand_sdr_timings *timings = &iface->timings.sdr;
/* microseconds -> picoseconds */
timings->tPROG_max = 1000000UL * le16_to_cpu(params->t_prog);
timings->tBERS_max = 1000000UL * le16_to_cpu(params->t_bers);
timings->tR_max = 1000000UL * le16_to_cpu(params->t_r);
/* nanoseconds -> picoseconds */
timings->tCCS_min = 1000UL * le16_to_cpu(params->t_ccs);
}
return 0; return 0;
} }
......
...@@ -584,6 +584,10 @@ struct nand_buffers { ...@@ -584,6 +584,10 @@ struct nand_buffers {
* *
* All these timings are expressed in picoseconds. * All these timings are expressed in picoseconds.
* *
* @tBERS_max: Block erase time
* @tCCS_min: Change column setup time
* @tPROG_max: Page program time
* @tR_max: Page read time
* @tALH_min: ALE hold time * @tALH_min: ALE hold time
* @tADL_min: ALE to data loading time * @tADL_min: ALE to data loading time
* @tALS_min: ALE setup time * @tALS_min: ALE setup time
...@@ -621,6 +625,10 @@ struct nand_buffers { ...@@ -621,6 +625,10 @@ struct nand_buffers {
* @tWW_min: WP# transition to WE# low * @tWW_min: WP# transition to WE# low
*/ */
struct nand_sdr_timings { struct nand_sdr_timings {
u32 tBERS_max;
u32 tCCS_min;
u32 tPROG_max;
u32 tR_max;
u32 tALH_min; u32 tALH_min;
u32 tADL_min; u32 tADL_min;
u32 tALS_min; u32 tALS_min;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment