Message ID | 20230807-mtd-flash-info-db-rework-v2-2-291a0f39f8d8@kernel.org |
---|---|
State | Changes Requested |
Delegated to: | Ambarus Tudor |
Headers | show |
Series | mtd: spi-nor: clean the flash_info database up | expand |
On 8/22/23 08:09, Michael Walle wrote: > This part is not a flash but an EEPROM like FRAM. It is even has a DT > binding for the (correct) driver (at25), see > Documentation/devicetree/bindings/eeprom/at25.yaml. Just remove it. > > Signed-off-by: Michael Walle <mwalle@kernel.org> Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org> > --- > drivers/mtd/spi-nor/Makefile | 1 - > drivers/mtd/spi-nor/core.c | 1 - > drivers/mtd/spi-nor/core.h | 1 - > drivers/mtd/spi-nor/fujitsu.c | 21 --------------------- > 4 files changed, 24 deletions(-) > > diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile > index 496dae9ca0f3..5e68468b72fc 100644 > --- a/drivers/mtd/spi-nor/Makefile > +++ b/drivers/mtd/spi-nor/Makefile > @@ -5,7 +5,6 @@ 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 > spi-nor-objs += gigadevice.o > spi-nor-objs += intel.o > spi-nor-objs += issi.o > diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c > index c44de69c4353..286155002cdc 100644 > --- a/drivers/mtd/spi-nor/core.c > +++ b/drivers/mtd/spi-nor/core.c > @@ -2002,7 +2002,6 @@ static const struct spi_nor_manufacturer *manufacturers[] = { > &spi_nor_eon, > &spi_nor_esmt, > &spi_nor_everspin, > - &spi_nor_fujitsu, > &spi_nor_gigadevice, > &spi_nor_intel, > &spi_nor_issi, > diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h > index 6d31af6c39ed..dfc20a3296fb 100644 > --- a/drivers/mtd/spi-nor/core.h > +++ b/drivers/mtd/spi-nor/core.h > @@ -634,7 +634,6 @@ 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; > extern const struct spi_nor_manufacturer spi_nor_gigadevice; > extern const struct spi_nor_manufacturer spi_nor_intel; > extern const struct spi_nor_manufacturer spi_nor_issi; > diff --git a/drivers/mtd/spi-nor/fujitsu.c b/drivers/mtd/spi-nor/fujitsu.c > deleted file mode 100644 > index 69cffc5c73ef..000000000000 > --- a/drivers/mtd/spi-nor/fujitsu.c > +++ /dev/null > @@ -1,21 +0,0 @@ > -// 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_nor_parts[] = { > - /* Fujitsu */ > - { "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1) > - FLAGS(SPI_NOR_NO_ERASE) }, > -}; > - > -const struct spi_nor_manufacturer spi_nor_fujitsu = { > - .name = "fujitsu", > - .parts = fujitsu_nor_parts, > - .nparts = ARRAY_SIZE(fujitsu_nor_parts), > -}; >
diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile index 496dae9ca0f3..5e68468b72fc 100644 --- a/drivers/mtd/spi-nor/Makefile +++ b/drivers/mtd/spi-nor/Makefile @@ -5,7 +5,6 @@ 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 spi-nor-objs += gigadevice.o spi-nor-objs += intel.o spi-nor-objs += issi.o diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index c44de69c4353..286155002cdc 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -2002,7 +2002,6 @@ static const struct spi_nor_manufacturer *manufacturers[] = { &spi_nor_eon, &spi_nor_esmt, &spi_nor_everspin, - &spi_nor_fujitsu, &spi_nor_gigadevice, &spi_nor_intel, &spi_nor_issi, diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h index 6d31af6c39ed..dfc20a3296fb 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h @@ -634,7 +634,6 @@ 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; extern const struct spi_nor_manufacturer spi_nor_gigadevice; extern const struct spi_nor_manufacturer spi_nor_intel; extern const struct spi_nor_manufacturer spi_nor_issi; diff --git a/drivers/mtd/spi-nor/fujitsu.c b/drivers/mtd/spi-nor/fujitsu.c deleted file mode 100644 index 69cffc5c73ef..000000000000 --- a/drivers/mtd/spi-nor/fujitsu.c +++ /dev/null @@ -1,21 +0,0 @@ -// 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_nor_parts[] = { - /* Fujitsu */ - { "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1) - FLAGS(SPI_NOR_NO_ERASE) }, -}; - -const struct spi_nor_manufacturer spi_nor_fujitsu = { - .name = "fujitsu", - .parts = fujitsu_nor_parts, - .nparts = ARRAY_SIZE(fujitsu_nor_parts), -};
This part is not a flash but an EEPROM like FRAM. It is even has a DT binding for the (correct) driver (at25), see Documentation/devicetree/bindings/eeprom/at25.yaml. Just remove it. Signed-off-by: Michael Walle <mwalle@kernel.org> --- drivers/mtd/spi-nor/Makefile | 1 - drivers/mtd/spi-nor/core.c | 1 - drivers/mtd/spi-nor/core.h | 1 - drivers/mtd/spi-nor/fujitsu.c | 21 --------------------- 4 files changed, 24 deletions(-)