Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4397989f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/users/dwmw2/mtd-2.6.32 

* git://git.infradead.org/users/dwmw2/mtd-2.6.32:
  mtd/maps: gpio-addr-flash: depend on GPIO arch support
  mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/
  mtd: nand: fix htmldocs warnings
parents 1bbc9a66 de19d02b

drivers/mtd/maps/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ config MTD_BFIN_ASYNC 


config MTD_GPIO_ADDR

	tristate "GPIO-assisted Flash Chip Support"

	depends on GENERIC_GPIO || GPIOLIB

	depends on MTD_COMPLEX_MAPPINGS

	select MTD_PARTITIONS

	help

drivers/mtd/maps/gpio-addr-flash.c

+2 −3
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ 
 * Licensed under the GPL-2 or later.

 */



#include <linux/gpio.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/mtd/mtd.h>
@@ -23,9 +25,6 @@ 
#include <linux/platform_device.h>

#include <linux/types.h>



#include <asm/gpio.h>

#include <asm/io.h>



#define pr_devinit(fmt, args...) ({ static const __devinitconst char __fmt[] = fmt; printk(__fmt, ## args); })



#define DRIVER_NAME "gpio-addr-flash"

drivers/mtd/nand/nand_base.c

+6 −0
Original line number Diff line number Diff line
@@ -761,6 +761,7 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip) 
 * @mtd:	mtd info structure

 * @chip:	nand chip info structure

 * @buf:	buffer to store read data

 * @page:	page number to read

 *

 * Not for syndrome calculating ecc controllers, which use a special oob layout

 */
@@ -777,6 +778,7 @@ static int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip, 
 * @mtd:	mtd info structure

 * @chip:	nand chip info structure

 * @buf:	buffer to store read data

 * @page:	page number to read

 *

 * We need a special oob layout and handling even when OOB isn't used.

 */
@@ -818,6 +820,7 @@ static int nand_read_page_raw_syndrome(struct mtd_info *mtd, struct nand_chip *c 
 * @mtd:	mtd info structure

 * @chip:	nand chip info structure

 * @buf:	buffer to store read data

 * @page:	page number to read

 */

static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,

				uint8_t *buf, int page)
@@ -939,6 +942,7 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, uint3 
 * @mtd:	mtd info structure

 * @chip:	nand chip info structure

 * @buf:	buffer to store read data

 * @page:	page number to read

 *

 * Not for syndrome calculating ecc controllers which need a special oob layout

 */
@@ -983,6 +987,7 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, 
 * @mtd:	mtd info structure

 * @chip:	nand chip info structure

 * @buf:	buffer to store read data

 * @page:	page number to read

 *

 * Hardware ECC for large page chips, require OOB to be read first.

 * For this ECC mode, the write_page method is re-used from ECC_HW.
@@ -1031,6 +1036,7 @@ static int nand_read_page_hwecc_oob_first(struct mtd_info *mtd, 
 * @mtd:	mtd info structure

 * @chip:	nand chip info structure

 * @buf:	buffer to store read data

 * @page:	page number to read

 *

 * The hw generator calculates the error syndrome automatically. Therefor

 * we need a special oob layout and handling.