Unverified Commit 641edddb authored by Tudor Ambarus's avatar Tudor Ambarus
Browse files

mtd: spi-nor: Add s3an_post_sfdp_fixups() 



s3an_nor_scan() was overriding the opcode selection done in
spi_nor_default_setup(). Set nor->setup() method in order to
avoid the unnecessary call to spi_nor_default_setup().

Now that the call to spi_nor_default_setup() is skipped, set
mtd.erasesize to nor->info->sector_size, as it was when
spi_nor_select_erase() was called.

No dummy byte is required for the S3AN's Random Read command (0x03),
so no need to set nor->read_dummy.

Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
parent 2d7ff858

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

+11 −7
Original line number Diff line number Diff line
@@ -2718,7 +2718,8 @@ static int spi_nor_check(struct spi_nor *nor) 
	return 0;

}



static int s3an_nor_scan(struct spi_nor *nor)

static int s3an_nor_setup(struct spi_nor *nor,

			  const struct spi_nor_hwcaps *hwcaps)

{

	int ret;
@@ -2753,6 +2754,7 @@ static int s3an_nor_scan(struct spi_nor *nor) 
	} else {

		/* Flash in Default addressing mode */

		nor->params.convert_addr = s3an_convert_addr;

		nor->mtd.erasesize = nor->info->sector_size;

	}



	return 0;
@@ -4530,6 +4532,11 @@ static void spansion_post_sfdp_fixups(struct spi_nor *nor) 
	nor->mtd.erasesize = nor->info->sector_size;

}



static void s3an_post_sfdp_fixups(struct spi_nor *nor)

{

	nor->params.setup = s3an_nor_setup;

}



/**

 * spi_nor_post_sfdp_fixups() - Updates the flash's parameters and settings

 * after SFDP has been parsed (is also called for SPI NORs that do not
@@ -4551,6 +4558,9 @@ static void spi_nor_post_sfdp_fixups(struct spi_nor *nor) 
		break;

	}



	if (nor->info->flags & SPI_S3AN)

		s3an_post_sfdp_fixups(nor);



	if (nor->info->fixups && nor->info->fixups->post_sfdp)

		nor->info->fixups->post_sfdp(nor);

}
@@ -4899,12 +4909,6 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, 
		return -EINVAL;

	}



	if (info->flags & SPI_S3AN) {

		ret = s3an_nor_scan(nor);

		if (ret)

			return ret;

	}



	/* Send all the required SPI flash commands to initialize device */

	ret = spi_nor_init(nor);

	if (ret)