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

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



Create a SPI NOR manufacturer driver for Fujitsu chips, and move the
Fujitsu 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 7bdbd1ce

drivers/mtd/spi-nor/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,4 +5,5 @@ spi-nor-objs += atmel.o 
spi-nor-objs			+= eon.o

spi-nor-objs			+= esmt.o

spi-nor-objs			+= everspin.o

spi-nor-objs			+= fujitsu.o

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

drivers/mtd/spi-nor/core.c

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

 */

static const struct flash_info spi_nor_ids[] = {

	/* Fujitsu */

	{ "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1, SPI_NOR_NO_ERASE) },



	/* GigaDevice */

	{

		"gd25q16", INFO(0xc84015, 0, 64 * 1024,  32,
@@ -2432,6 +2429,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { 
	&spi_nor_eon,

	&spi_nor_esmt,

	&spi_nor_everspin,

	&spi_nor_fujitsu,

};



static const struct flash_info *

drivers/mtd/spi-nor/core.h

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ extern const struct spi_nor_manufacturer spi_nor_atmel; 
extern const struct spi_nor_manufacturer spi_nor_eon;

extern const struct spi_nor_manufacturer spi_nor_esmt;

extern const struct spi_nor_manufacturer spi_nor_everspin;

extern const struct spi_nor_manufacturer spi_nor_fujitsu;



int spi_nor_write_enable(struct spi_nor *nor);

int spi_nor_write_disable(struct spi_nor *nor);

drivers/mtd/spi-nor/fujitsu.c

0 → 100644
+20 −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 fujitsu_parts[] = {

	/* Fujitsu */

	{ "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1, SPI_NOR_NO_ERASE) },

};



const struct spi_nor_manufacturer spi_nor_fujitsu = {

	.name = "fujitsu",

	.parts = fujitsu_parts,

	.nparts = ARRAY_SIZE(fujitsu_parts),

};