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

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



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

drivers/mtd/spi-nor/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,4 +16,5 @@ spi-nor-objs += spansion.o 
spi-nor-objs			+= sst.o

spi-nor-objs			+= winbond.o

spi-nor-objs			+= xilinx.o

spi-nor-objs			+= xmc.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
@@ -1943,9 +1943,6 @@ int spi_nor_sr2_bit7_quad_enable(struct spi_nor *nor) 
 * old entries may be missing 4K flag.

 */

static const struct flash_info spi_nor_ids[] = {

	/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */

	{ "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

	{ "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

	{ },

};
@@ -1966,6 +1963,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { 
	&spi_nor_sst,

	&spi_nor_winbond,

	&spi_nor_xilinx,

	&spi_nor_xmc,

};



static const struct flash_info *

drivers/mtd/spi-nor/core.h

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion; 
extern const struct spi_nor_manufacturer spi_nor_sst;

extern const struct spi_nor_manufacturer spi_nor_winbond;

extern const struct spi_nor_manufacturer spi_nor_xilinx;

extern const struct spi_nor_manufacturer spi_nor_xmc;



int spi_nor_write_enable(struct spi_nor *nor);

int spi_nor_write_disable(struct spi_nor *nor);

drivers/mtd/spi-nor/xmc.c

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

	/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */

	{ "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128,

			    SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

	{ "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256,

			     SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

};



const struct spi_nor_manufacturer spi_nor_xmc = {

	.name = "xmc",

	.parts = xmc_parts,

	.nparts = ARRAY_SIZE(xmc_parts),

};