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