Merge git://git.denx.de/u-boot-uniphier

[u-boot] / drivers / mtd / nand / nand_timings.c

diff --git a/drivers/mtd/nand/nand_timings.c b/drivers/mtd/nand/nand_timings.c
index ba4f22f12d2a493a693d6e781e2fa3b9b75cd06b..c0545a4fb1590045036589a48fb0791dd5ee189d 100644 (file)
--- a/drivers/mtd/nand/nand_timings.c
+++ b/drivers/mtd/nand/nand_timings.c
@@ -10,13 +10,15 @@
  */
 #include <common.h>
 #include <linux/kernel.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static const struct nand_data_interface onfi_sdr_timings[] = {
        /* Mode 0 */
        {
                .type = NAND_SDR_IFACE,
                .timings.sdr = {
+                       .tCCS_min = 500000,
+                       .tR_max = 200000000,
                        .tADL_min = 400000,
                        .tALH_min = 20000,
                        .tALS_min = 50000,
@@ -57,6 +59,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = {
        {
                .type = NAND_SDR_IFACE,
                .timings.sdr = {
+                       .tCCS_min = 500000,
+                       .tR_max = 200000000,
                        .tADL_min = 400000,
                        .tALH_min = 10000,
                        .tALS_min = 25000,
@@ -97,6 +101,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = {
        {
                .type = NAND_SDR_IFACE,
                .timings.sdr = {
+                       .tCCS_min = 500000,
+                       .tR_max = 200000000,
                        .tADL_min = 400000,
                        .tALH_min = 10000,
                        .tALS_min = 15000,
@@ -137,6 +143,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = {
        {
                .type = NAND_SDR_IFACE,
                .timings.sdr = {
+                       .tCCS_min = 500000,
+                       .tR_max = 200000000,
                        .tADL_min = 400000,
                        .tALH_min = 5000,
                        .tALS_min = 10000,
@@ -177,6 +185,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = {
        {
                .type = NAND_SDR_IFACE,
                .timings.sdr = {
+                       .tCCS_min = 500000,
+                       .tR_max = 200000000,
                        .tADL_min = 400000,
                        .tALH_min = 5000,
                        .tALS_min = 10000,
@@ -217,6 +227,8 @@ static const struct nand_data_interface onfi_sdr_timings[] = {
        {
                .type = NAND_SDR_IFACE,
                .timings.sdr = {
+                       .tCCS_min = 500000,
+                       .tR_max = 200000000,
                        .tADL_min = 400000,
                        .tALH_min = 5000,
                        .tALS_min = 10000,
@@ -289,10 +301,22 @@ int onfi_init_data_interface(struct nand_chip *chip,
        *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, ...
         * 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 = 1000000ULL * le16_to_cpu(params->t_prog);
+               timings->tBERS_max = 1000000ULL * le16_to_cpu(params->t_bers);
+               timings->tR_max = 1000000ULL * le16_to_cpu(params->t_r);
+
+               /* nanoseconds -> picoseconds */
+               timings->tCCS_min = 1000UL * le16_to_cpu(params->t_ccs);
+       }
 
        return 0;
 }