Unverified Commit 022545e0 authored by Michael Walle's avatar Michael Walle Committed by Tudor Ambarus
Browse files

mtd: spi-nor: remove catalyst 'flashes' 



CAT25xx are actually EEPROMs manufactured by Catalyst. The devices are
ancient (DS are from 1998), there are not in-tree users, nor are there
any device tree bindings. Remove it. The correct driver is the at25.

Signed-off-by: default avatarMichael Walle <mwalle@kernel.org>
Link: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v3-1-e60548861b10@kernel.org


Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@linaro.org>
parent ce9ecca0

drivers/mtd/spi-nor/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


spi-nor-objs			:= core.o sfdp.o swp.o otp.o sysfs.o

spi-nor-objs			+= atmel.o

spi-nor-objs			+= catalyst.o

spi-nor-objs			+= eon.o

spi-nor-objs			+= esmt.o

spi-nor-objs			+= everspin.o

drivers/mtd/spi-nor/catalyst.c

deleted100644 → 0
+0 −24
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 catalyst_nor_parts[] = {

	/* Catalyst / On Semiconductor -- non-JEDEC */

	{ "cat25c11", CAT25_INFO(16, 8, 16, 1) },

	{ "cat25c03", CAT25_INFO(32, 8, 16, 2) },

	{ "cat25c09", CAT25_INFO(128, 8, 32, 2) },

	{ "cat25c17", CAT25_INFO(256, 8, 32, 2) },

	{ "cat25128", CAT25_INFO(2048, 8, 64, 2) },

};



const struct spi_nor_manufacturer spi_nor_catalyst = {

	.name = "catalyst",

	.parts = catalyst_nor_parts,

	.nparts = ARRAY_SIZE(catalyst_nor_parts),

};

drivers/mtd/spi-nor/core.c

+0 −1
Original line number Diff line number Diff line
@@ -1999,7 +1999,6 @@ int spi_nor_sr2_bit7_quad_enable(struct spi_nor *nor) 


static const struct spi_nor_manufacturer *manufacturers[] = {

	&spi_nor_atmel,

	&spi_nor_catalyst,

	&spi_nor_eon,

	&spi_nor_esmt,

	&spi_nor_everspin,

drivers/mtd/spi-nor/core.h

+0 −1
Original line number Diff line number Diff line
@@ -631,7 +631,6 @@ struct sfdp { 


/* Manufacturer drivers. */

extern const struct spi_nor_manufacturer spi_nor_atmel;

extern const struct spi_nor_manufacturer spi_nor_catalyst;

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;