karo: fdt: fix panel-dpi support

[karo-tx-uboot.git] / drivers / dfu / dfu_nand.c

diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
index 0ec12cff264fe8ad88117f8fe8748851cf0d4e85..a9754922e8d63ec4df950dd7c947bf189090c086 100644 (file)
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -19,12 +19,7 @@
 #include <jffs2/load_kernel.h>
 #include <nand.h>
 
-enum dfu_nand_op {
-       DFU_OP_READ = 1,
-       DFU_OP_WRITE,
-};
-
-static int nand_block_op(enum dfu_nand_op op, struct dfu_entity *dfu,
+static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu,
                        u64 offset, void *buf, long *len)
 {
        loff_t start, lim;
@@ -69,7 +64,7 @@ static int nand_block_op(enum dfu_nand_op op, struct dfu_entity *dfu,
                        return ret;
                /* then write */
                ret = nand_write_skip_bad(nand, start, &count, &actual,
-                               lim, buf, 0);
+                               lim, buf, WITH_WR_VERIFY);
        }
 
        if (ret != 0) {
@@ -119,6 +114,11 @@ static int dfu_write_medium_nand(struct dfu_entity *dfu,
        return ret;
 }
 
+long dfu_get_medium_size_nand(struct dfu_entity *dfu)
+{
+       return dfu->data.nand.size;
+}
+
 static int dfu_read_medium_nand(struct dfu_entity *dfu, u64 offset, void *buf,
                long *len)
 {
@@ -167,7 +167,19 @@ static int dfu_flush_medium_nand(struct dfu_entity *dfu)
        return ret;
 }
 
-int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s)
+unsigned int dfu_polltimeout_nand(struct dfu_entity *dfu)
+{
+       /*
+        * Currently, Poll Timeout != 0 is only needed on nand
+        * ubi partition, as the not used sectors need an erase
+        */
+       if (dfu->data.nand.ubi)
+               return DFU_MANIFEST_POLL_TIMEOUT;
+
+       return DFU_DEFAULT_POLL_TIMEOUT;
+}
+
+int dfu_fill_entity_nand(struct dfu_entity *dfu, char *devstr, char *s)
 {
        char *st;
        int ret, dev, part;
@@ -212,9 +224,11 @@ int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s)
                return -1;
        }
 
+       dfu->get_medium_size = dfu_get_medium_size_nand;
        dfu->read_medium = dfu_read_medium_nand;
        dfu->write_medium = dfu_write_medium_nand;
        dfu->flush_medium = dfu_flush_medium_nand;
+       dfu->poll_timeout = dfu_polltimeout_nand;
 
        /* initial state */
        dfu->inited = 0;