Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56c5c328 authored by Ricardo Ribalda Delgado's avatar Ricardo Ribalda Delgado Committed by Cyrille Pitchen
Browse files

mtd: spi-nor: Fix S3AN addressing calculation 



The page calculation under spi_nor_s3an_addr_convert() was wrong. On
Default Address Mode we need to perform a divide by page_size.

Signed-off-by: default avatarRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Acked-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@atmel.com>
parent f40a2725

drivers/mtd/spi-nor/spi-nor.c

+6 −3
Original line number Diff line number Diff line
@@ -431,11 +431,14 @@ static void spi_nor_unlock_and_unprep(struct spi_nor *nor, enum spi_nor_ops ops) 
 */

static loff_t spi_nor_s3an_addr_convert(struct spi_nor *nor, unsigned int addr)

{

	unsigned int offset = addr;

	unsigned int offset;

	unsigned int page;



	offset %= nor->page_size;

	offset = addr % nor->page_size;

	page = addr / nor->page_size;

	page <<= (nor->page_size > 512) ? 10 : 9;



	return ((addr - offset) << 1) | offset;

	return page | offset;

}



/*