[PATCH 1/2] mtd: Fix writesize parameter value

[PATCH 1/2] mtd: Fix writesize parameter value

[Herve Codina]

Signed-off-by: Herve Codina <Herve.CODINA@celad.com>
---
 drivers/mtd/core.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
index d954f72..d3e7763 100644
--- a/drivers/mtd/core.c
+++ b/drivers/mtd/core.c
@@ -403,7 +403,7 @@ int add_mtd_device(struct mtd_info *mtd, char *devname, int device_id)
 	if (IS_ENABLED(CONFIG_PARAMETER)) {
 		dev_add_param_int_ro(&mtd->class_dev, "size", mtd->size, "%llu");
 		dev_add_param_int_ro(&mtd->class_dev, "erasesize", mtd->erasesize, "%u");
-		dev_add_param_int_ro(&mtd->class_dev, "writesize", mtd->oobsize, "%u");
+		dev_add_param_int_ro(&mtd->class_dev, "writesize", mtd->writesize, "%u");
 		dev_add_param_int_ro(&mtd->class_dev, "oobsize", mtd->oobsize, "%u");
 	}
 
-- 
1.7.9.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] mtd: fix mtd erasesize

[Herve Codina]

Set mtd erasize using max erasesize from erase regions

Signed-off-by: Herve Codina <Herve.CODINA@celad.com>
---
 drivers/mtd/nor/cfi_flash.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nor/cfi_flash.c b/drivers/mtd/nor/cfi_flash.c
index 3d3d231..a56183d 100644
--- a/drivers/mtd/nor/cfi_flash.c
+++ b/drivers/mtd/nor/cfi_flash.c
@@ -949,6 +949,8 @@ static int cfi_mtd_erase(struct mtd_info *mtd, struct erase_info *instr)
 static void cfi_init_mtd(struct flash_info *info)
 {
 	struct mtd_info *mtd = &info->mtd;
+	u_int32_t erasesize;
+	int i;
 
 	mtd->read = cfi_mtd_read;
 	mtd->write = cfi_mtd_write;
@@ -956,7 +958,14 @@ static void cfi_init_mtd(struct flash_info *info)
 	mtd->lock = cfi_mtd_lock;
 	mtd->unlock = cfi_mtd_unlock;
 	mtd->size = info->size;
-	mtd->erasesize = info->eraseregions[1].erasesize; /* FIXME */
+	
+	erasesize = 0;
+	for (i=0; i < info->numeraseregions; i++) {
+		if (erasesize < info->eraseregions[i].erasesize)
+			erasesize = info->eraseregions[i].erasesize;
+	}
+	mtd->erasesize = erasesize;
+	
 	mtd->writesize = 1;
 	mtd->subpage_sft = 0;
 	mtd->eraseregions = info->eraseregions;
-- 
1.7.9.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] mtd: Fix writesize parameter value

[Sascha Hauer]

On Mon, Jun 09, 2014 at 05:14:07PM +0200, Herve Codina wrote:
> Signed-off-by: Herve Codina <Herve.CODINA@celad.com>

Applied both, thanks

Sascha

> ---
>  drivers/mtd/core.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
> index d954f72..d3e7763 100644
> --- a/drivers/mtd/core.c
> +++ b/drivers/mtd/core.c
> @@ -403,7 +403,7 @@ int add_mtd_device(struct mtd_info *mtd, char *devname, int device_id)
>  	if (IS_ENABLED(CONFIG_PARAMETER)) {
>  		dev_add_param_int_ro(&mtd->class_dev, "size", mtd->size, "%llu");
>  		dev_add_param_int_ro(&mtd->class_dev, "erasesize", mtd->erasesize, "%u");
> -		dev_add_param_int_ro(&mtd->class_dev, "writesize", mtd->oobsize, "%u");
> +		dev_add_param_int_ro(&mtd->class_dev, "writesize", mtd->writesize, "%u");
>  		dev_add_param_int_ro(&mtd->class_dev, "oobsize", mtd->oobsize, "%u");
>  	}
>  
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox