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

Commit 4b7f7422 authored by Kevin Cernekee's avatar Kevin Cernekee Committed by David Woodhouse
Browse files

mtd: m25p80: Add support for Macronix MX25L25635E 



This is a 256Mbit (32MiB) part so minor changes were made to support
4-byte addressing.

Signed-off-by: default avatarKevin Cernekee <cernekee@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent f0dff9bd

drivers/mtd/devices/m25p80.c

+28 −3
Original line number Diff line number Diff line
@@ -51,6 +51,10 @@ 
#define	OPCODE_WRDI		0x04	/* Write disable */

#define	OPCODE_AAI_WP		0xad	/* Auto address increment word program */



/* Used for Macronix flashes only. */

#define	OPCODE_EN4B		0xb7	/* Enter 4-byte mode */

#define	OPCODE_EX4B		0xe9	/* Exit 4-byte mode */



/* Status Register bits. */

#define	SR_WIP			1	/* Write in progress */

#define	SR_WEL			2	/* Write enable latch */
@@ -62,7 +66,7 @@ 


/* Define max times to check status register before we give up. */

#define	MAX_READY_WAIT_JIFFIES	(40 * HZ)	/* M25P16 specs 40s max chip erase */

#define	MAX_CMD_SIZE		4

#define	MAX_CMD_SIZE		5



#ifdef CONFIG_M25PXX_USE_FAST_READ

#define OPCODE_READ 	OPCODE_FAST_READ
@@ -151,6 +155,16 @@ static inline int write_disable(struct m25p *flash) 
	return spi_write_then_read(flash->spi, &code, 1, NULL, 0);

}



/*

 * Enable/disable 4-byte addressing mode.

 */

static inline int set_4byte(struct m25p *flash, int enable)

{

	u8	code = enable ? OPCODE_EN4B : OPCODE_EX4B;



	return spi_write_then_read(flash->spi, &code, 1, NULL, 0);

}



/*

 * Service routine to read status register until ready, or timeout occurs.

 * Returns non-zero if error.
@@ -207,6 +221,7 @@ static void m25p_addr2cmd(struct m25p *flash, unsigned int addr, u8 *cmd) 
	cmd[1] = addr >> (flash->addr_width * 8 -  8);

	cmd[2] = addr >> (flash->addr_width * 8 - 16);

	cmd[3] = addr >> (flash->addr_width * 8 - 24);

	cmd[4] = addr >> (flash->addr_width * 8 - 32);

}



static int m25p_cmdsz(struct m25p *flash)
@@ -607,7 +622,6 @@ struct flash_info { 
		.sector_size = (_sector_size),				\

		.n_sectors = (_n_sectors),				\

		.page_size = 256,					\

		.addr_width = 3,					\

		.flags = (_flags),					\

	})
@@ -653,6 +667,7 @@ static const struct spi_device_id m25p_ids[] = { 
	{ "mx25l6405d",  INFO(0xc22017, 0, 64 * 1024, 128, 0) },

	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },

	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },

	{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },



	/* Spansion -- single (large) sector size only, at least

	 * for the chips listed here (without boot sectors).
@@ -884,7 +899,17 @@ static int __devinit m25p_probe(struct spi_device *spi) 


	flash->mtd.dev.parent = &spi->dev;

	flash->page_size = info->page_size;



	if (info->addr_width)

		flash->addr_width = info->addr_width;

	else {

		/* enable 4-byte addressing if the device exceeds 16MiB */

		if (flash->mtd.size > 0x1000000) {

			flash->addr_width = 4;

			set_4byte(flash, 1);

		} else

			flash->addr_width = 3;

	}



	dev_info(&spi->dev, "%s (%lld Kbytes)\n", id->name,

			(long long)flash->mtd.size >> 10);