Commit 2be508d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/mtd-2.6 

* git://git.infradead.org/mtd-2.6: (69 commits)
  Revert "[MTD] m25p80.c code cleanup"
  [MTD] [NAND] GPIO driver depends on ARM... for now.
  [MTD] [NAND] sh_flctl: fix compile error
  [MTD] [NOR] AT49BV6416 has swapped erase regions
  [MTD] [NAND] GPIO NAND flash driver
  [MTD] cmdlineparts documentation change - explain where mtd-id comes from
  [MTD] cfi_cmdset_0002.c: Add Macronix CFI V1.0 TopBottom detection
  [MTD] [NAND] Fix compilation warnings in drivers/mtd/nand/cs553x_nand.c
  [JFFS2] Write buffer offset adjustment for NOR-ECC (Sibley) flash
  [MTD] mtdoops: Fix a bug where block may not be erased
  [MTD] mtdoops: Add a magic number to logged kernel oops
  [MTD] mtdoops: Fix an off by one error
  [JFFS2] Correct parameter names of jffs2_compress() in comments
  [MTD] [NAND] sh_flctl: add support for Renesas SuperH FLCTL
  [MTD] [NAND] Bug on atmel_nand HW ECC : OOB info not correctly written
  [MTD] [MAPS] Remove unused variable after ROM API cleanup.
  [MTD] m25p80.c extended jedec support (v2)
  [MTD] remove unused mtd parameter in of_mtd_parse_partitions()
  [MTD] [NAND] remove dead Kconfig associated with !CONFIG_PPC_MERGE
  [MTD] [NAND] driver extension to support NAND on TQM85xx modules
  ...
parents 01e8ef11 8a1a6272

Documentation/mtd/nand_ecc.txt

0 → 100644
+714 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-pxa/include/mach/pxa3xx_nand.h

+42 −2
Original line number Diff line number Diff line
@@ -4,6 +4,43 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>



struct pxa3xx_nand_timing {

	unsigned int	tCH;  /* Enable signal hold time */

	unsigned int	tCS;  /* Enable signal setup time */

	unsigned int	tWH;  /* ND_nWE high duration */

	unsigned int	tWP;  /* ND_nWE pulse time */

	unsigned int	tRH;  /* ND_nRE high duration */

	unsigned int	tRP;  /* ND_nRE pulse width */

	unsigned int	tR;   /* ND_nWE high to ND_nRE low for read */

	unsigned int	tWHR; /* ND_nWE high to ND_nRE low for status read */

	unsigned int	tAR;  /* ND_ALE low to ND_nRE low delay */

};



struct pxa3xx_nand_cmdset {

	uint16_t	read1;

	uint16_t	read2;

	uint16_t	program;

	uint16_t	read_status;

	uint16_t	read_id;

	uint16_t	erase;

	uint16_t	reset;

	uint16_t	lock;

	uint16_t	unlock;

	uint16_t	lock_status;

};



struct pxa3xx_nand_flash {

	const struct pxa3xx_nand_timing *timing; /* NAND Flash timing */

	const struct pxa3xx_nand_cmdset *cmdset;



	uint32_t page_per_block;/* Pages per block (PG_PER_BLK) */

	uint32_t page_size;	/* Page size in bytes (PAGE_SZ) */

	uint32_t flash_width;	/* Width of Flash memory (DWIDTH_M) */

	uint32_t dfc_width;	/* Width of flash controller(DWIDTH_C) */

	uint32_t num_blocks;	/* Number of physical blocks in Flash */

	uint32_t chip_id;

};



struct pxa3xx_nand_platform_data {



	/* the data flash bus is shared between the Static Memory
@@ -12,8 +49,11 @@ struct pxa3xx_nand_platform_data { 
	 */

	int	enable_arbiter;



	struct mtd_partition *parts;

	const struct mtd_partition		*parts;

	unsigned int				nr_parts;



	const struct pxa3xx_nand_flash * 	flash;

	size_t					num_flash;

};



extern void pxa3xx_set_nand_info(struct pxa3xx_nand_platform_data *info);

arch/arm/plat-mxc/include/mach/mxc_nand.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.

 * Copyright 2008 Sascha Hauer, kernel@pengutronix.de

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version 2

 * of the License, or (at your option) any later version.

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

 * MA 02110-1301, USA.

 */



#ifndef __ASM_ARCH_NAND_H

#define __ASM_ARCH_NAND_H



struct mxc_nand_platform_data {

	int width;	/* data bus width in bytes */

	int hw_ecc;	/* 0 if supress hardware ECC */

};

#endif /* __ASM_ARCH_NAND_H */

arch/arm/plat-omap/include/mach/onenand.h

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ struct omap_onenand_platform_data { 
	int			gpio_irq;

	struct mtd_partition	*parts;

	int			nr_parts;

	int                     (*onenand_setup)(void __iomem *);

	int                     (*onenand_setup)(void __iomem *, int freq);

	int			dma_channel;

};



int omap2_onenand_rephase(void);



#define ONENAND_MAX_PARTITIONS 8

drivers/mtd/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -172,6 +172,11 @@ config MTD_CHAR 
	  memory chips, and also use ioctl() to obtain information about

	  the device, or to erase parts of it.



config HAVE_MTD_OTP

	bool

	help

	  Enable access to OTP regions using MTD_CHAR.



config MTD_BLKDEVS

	tristate "Common interface to block layer for MTD 'translation layers'"

	depends on BLOCK

CRA Git | Maintained and supported by SUSTech CRA and CCSE