Unverified Commit f7242bfc authored by Boris Brezillon's avatar Boris Brezillon Committed by Tudor Ambarus
Browse files

mtd: spi-nor: Move Atmel bits out of core.c 



Create a SPI NOR manufacturer driver for Atmel chips, and move the
Atmel definitions outside of core.c.

Signed-off-by: default avatarBoris Brezillon <bbrezillon@kernel.org>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
parent 9ec4bbcb

drivers/mtd/spi-nor/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



spi-nor-objs			:= core.o sfdp.o

spi-nor-objs			+= atmel.o

obj-$(CONFIG_MTD_SPI_NOR)	+= spi-nor.o

drivers/mtd/spi-nor/atmel.c

0 → 100644
+46 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2005, Intec Automation Inc.

 * Copyright (C) 2014, Freescale Semiconductor, Inc.

 */



#include <linux/mtd/spi-nor.h>



#include "core.h"



static const struct flash_info atmel_parts[] = {

	/* Atmel -- some are (confusingly) marketed as "DataFlash" */

	{ "at25fs010",  INFO(0x1f6601, 0, 32 * 1024,   4, SECT_4K) },

	{ "at25fs040",  INFO(0x1f6604, 0, 64 * 1024,   8, SECT_4K) },



	{ "at25df041a", INFO(0x1f4401, 0, 64 * 1024,   8, SECT_4K) },

	{ "at25df321",  INFO(0x1f4700, 0, 64 * 1024,  64, SECT_4K) },

	{ "at25df321a", INFO(0x1f4701, 0, 64 * 1024,  64, SECT_4K) },

	{ "at25df641",  INFO(0x1f4800, 0, 64 * 1024, 128, SECT_4K) },



	{ "at25sl321",	INFO(0x1f4216, 0, 64 * 1024, 64,

			     SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },



	{ "at26f004",   INFO(0x1f0400, 0, 64 * 1024,  8, SECT_4K) },

	{ "at26df081a", INFO(0x1f4501, 0, 64 * 1024, 16, SECT_4K) },

	{ "at26df161a", INFO(0x1f4601, 0, 64 * 1024, 32, SECT_4K) },

	{ "at26df321",  INFO(0x1f4700, 0, 64 * 1024, 64, SECT_4K) },



	{ "at45db081d", INFO(0x1f2500, 0, 64 * 1024, 16, SECT_4K) },

};



static void atmel_default_init(struct spi_nor *nor)

{

	nor->flags |= SNOR_F_HAS_LOCK;

}



static const struct spi_nor_fixups atmel_fixups = {

	.default_init = atmel_default_init,

};



const struct spi_nor_manufacturer spi_nor_atmel = {

	.name = "atmel",

	.parts = atmel_parts,

	.nparts = ARRAY_SIZE(atmel_parts),

	.fixups = &atmel_fixups,

};

drivers/mtd/spi-nor/core.c

+3 −29
Original line number Diff line number Diff line
@@ -2081,25 +2081,6 @@ static struct spi_nor_fixups gd25q256_fixups = { 
 * old entries may be missing 4K flag.

 */

static const struct flash_info spi_nor_ids[] = {

	/* Atmel -- some are (confusingly) marketed as "DataFlash" */

	{ "at25fs010",  INFO(0x1f6601, 0, 32 * 1024,   4, SECT_4K) },

	{ "at25fs040",  INFO(0x1f6604, 0, 64 * 1024,   8, SECT_4K) },



	{ "at25df041a", INFO(0x1f4401, 0, 64 * 1024,   8, SECT_4K) },

	{ "at25df321",  INFO(0x1f4700, 0, 64 * 1024,  64, SECT_4K) },

	{ "at25df321a", INFO(0x1f4701, 0, 64 * 1024,  64, SECT_4K) },

	{ "at25df641",  INFO(0x1f4800, 0, 64 * 1024, 128, SECT_4K) },



	{ "at25sl321",	INFO(0x1f4216, 0, 64 * 1024, 64,

			     SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },



	{ "at26f004",   INFO(0x1f0400, 0, 64 * 1024,  8, SECT_4K) },

	{ "at26df081a", INFO(0x1f4501, 0, 64 * 1024, 16, SECT_4K) },

	{ "at26df161a", INFO(0x1f4601, 0, 64 * 1024, 32, SECT_4K) },

	{ "at26df321",  INFO(0x1f4700, 0, 64 * 1024, 64, SECT_4K) },



	{ "at45db081d", INFO(0x1f2500, 0, 64 * 1024, 16, SECT_4K) },



	/* EON -- en25xxx */

	{ "en25f32",    INFO(0x1c3116, 0, 64 * 1024,   64, SECT_4K) },

	{ "en25p32",    INFO(0x1c2016, 0, 64 * 1024,   64, 0) },
@@ -2474,7 +2455,9 @@ static const struct flash_info spi_nor_ids[] = { 
	{ },

};



static const struct spi_nor_manufacturer *manufacturers[0];

static const struct spi_nor_manufacturer *manufacturers[] = {

	&spi_nor_atmel,

};



static const struct flash_info *

spi_nor_search_part_by_id(const struct flash_info *parts, unsigned int nparts,
@@ -3253,11 +3236,6 @@ static int spi_nor_setup(struct spi_nor *nor, 
	return nor->params.setup(nor, hwcaps);

}



static void atmel_set_default_init(struct spi_nor *nor)

{

	nor->flags |= SNOR_F_HAS_LOCK;

}



static void intel_set_default_init(struct spi_nor *nor)

{

	nor->flags |= SNOR_F_HAS_LOCK;
@@ -3301,10 +3279,6 @@ static void spi_nor_manufacturer_init_params(struct spi_nor *nor) 
{

	/* Init flash parameters based on MFR */

	switch (JEDEC_MFR(nor->info)) {

	case SNOR_MFR_ATMEL:

		atmel_set_default_init(nor);

		break;



	case SNOR_MFR_INTEL:

		intel_set_default_init(nor);

		break;

drivers/mtd/spi-nor/core.h

+3 −0
Original line number Diff line number Diff line
@@ -166,6 +166,9 @@ struct spi_nor_manufacturer { 
	const struct spi_nor_fixups *fixups;

};



/* Manufacturer drivers. */

extern const struct spi_nor_manufacturer spi_nor_atmel;



int spi_nor_write_enable(struct spi_nor *nor);

int spi_nor_write_disable(struct spi_nor *nor);

int spi_nor_set_4byte_addr_mode(struct spi_nor *nor, bool enable);

CRA Git | Maintained and supported by SUSTech CRA and CCSE