tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 4397989f 1bbc9a66

+9 -3
unified split
+1
drivers/mtd/maps/Kconfig
··· 486 487 config MTD_GPIO_ADDR 488 tristate "GPIO-assisted Flash Chip Support" 489 depends on MTD_COMPLEX_MAPPINGS 490 select MTD_PARTITIONS 491 help
··· 486 487 config MTD_GPIO_ADDR 488 tristate "GPIO-assisted Flash Chip Support" 489 + depends on GENERIC_GPIO || GPIOLIB 490 depends on MTD_COMPLEX_MAPPINGS 491 select MTD_PARTITIONS 492 help
+2 -3
drivers/mtd/maps/gpio-addr-flash.c
··· 13 * Licensed under the GPL-2 or later. 14 */ 15 16 #include <linux/init.h> 17 #include <linux/kernel.h> 18 #include <linux/module.h> 19 #include <linux/mtd/mtd.h> ··· 24 #include <linux/mtd/physmap.h> 25 #include <linux/platform_device.h> 26 #include <linux/types.h> 27 - 28 - #include <asm/gpio.h> 29 - #include <asm/io.h> 30 31 #define pr_devinit(fmt, args...) ({ static const __devinitconst char __fmt[] = fmt; printk(__fmt, ## args); }) 32
··· 13 * Licensed under the GPL-2 or later. 14 */ 15 16 + #include <linux/gpio.h> 17 #include <linux/init.h> 18 + #include <linux/io.h> 19 #include <linux/kernel.h> 20 #include <linux/module.h> 21 #include <linux/mtd/mtd.h> ··· 22 #include <linux/mtd/physmap.h> 23 #include <linux/platform_device.h> 24 #include <linux/types.h> 25 26 #define pr_devinit(fmt, args...) ({ static const __devinitconst char __fmt[] = fmt; printk(__fmt, ## args); }) 27
+6
drivers/mtd/nand/nand_base.c
··· 761 * @mtd: mtd info structure 762 * @chip: nand chip info structure 763 * @buf: buffer to store read data 764 * 765 * Not for syndrome calculating ecc controllers, which use a special oob layout 766 */ ··· 778 * @mtd: mtd info structure 779 * @chip: nand chip info structure 780 * @buf: buffer to store read data 781 * 782 * We need a special oob layout and handling even when OOB isn't used. 783 */ ··· 820 * @mtd: mtd info structure 821 * @chip: nand chip info structure 822 * @buf: buffer to store read data 823 */ 824 static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip, 825 uint8_t *buf, int page) ··· 942 * @mtd: mtd info structure 943 * @chip: nand chip info structure 944 * @buf: buffer to store read data 945 * 946 * Not for syndrome calculating ecc controllers which need a special oob layout 947 */ ··· 987 * @mtd: mtd info structure 988 * @chip: nand chip info structure 989 * @buf: buffer to store read data 990 * 991 * Hardware ECC for large page chips, require OOB to be read first. 992 * For this ECC mode, the write_page method is re-used from ECC_HW. ··· 1036 * @mtd: mtd info structure 1037 * @chip: nand chip info structure 1038 * @buf: buffer to store read data 1039 * 1040 * The hw generator calculates the error syndrome automatically. Therefor 1041 * we need a special oob layout and handling.
··· 761 * @mtd: mtd info structure 762 * @chip: nand chip info structure 763 * @buf: buffer to store read data 764 + * @page: page number to read 765 * 766 * Not for syndrome calculating ecc controllers, which use a special oob layout 767 */ ··· 777 * @mtd: mtd info structure 778 * @chip: nand chip info structure 779 * @buf: buffer to store read data 780 + * @page: page number to read 781 * 782 * We need a special oob layout and handling even when OOB isn't used. 783 */ ··· 818 * @mtd: mtd info structure 819 * @chip: nand chip info structure 820 * @buf: buffer to store read data 821 + * @page: page number to read 822 */ 823 static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip, 824 uint8_t *buf, int page) ··· 939 * @mtd: mtd info structure 940 * @chip: nand chip info structure 941 * @buf: buffer to store read data 942 + * @page: page number to read 943 * 944 * Not for syndrome calculating ecc controllers which need a special oob layout 945 */ ··· 983 * @mtd: mtd info structure 984 * @chip: nand chip info structure 985 * @buf: buffer to store read data 986 + * @page: page number to read 987 * 988 * Hardware ECC for large page chips, require OOB to be read first. 989 * For this ECC mode, the write_page method is re-used from ECC_HW. ··· 1031 * @mtd: mtd info structure 1032 * @chip: nand chip info structure 1033 * @buf: buffer to store read data 1034 + * @page: page number to read 1035 * 1036 * The hw generator calculates the error syndrome automatically. Therefor 1037 * we need a special oob layout and handling.