diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-05 16:23:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-05 16:23:16 -0500 |
commit | 4397989fc91ed289909ecf307c2dc21cee0e7905 (patch) | |
tree | fc28a1e179caa3570146ece045cd2bf198f6bd89 /drivers | |
parent | 1bbc9a66d0194449f32c2aa18be40db5744dbd85 (diff) | |
parent | de19d02b731478877ce8b1ccf371c2b2142ac80e (diff) |
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
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/maps/Kconfig | 1 | ||||
-rw-r--r-- | drivers/mtd/maps/gpio-addr-flash.c | 5 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_base.c | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 841e085ab74a..14be0755d7cd 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -486,6 +486,7 @@ config MTD_BFIN_ASYNC | |||
486 | 486 | ||
487 | config MTD_GPIO_ADDR | 487 | config MTD_GPIO_ADDR |
488 | tristate "GPIO-assisted Flash Chip Support" | 488 | tristate "GPIO-assisted Flash Chip Support" |
489 | depends on GENERIC_GPIO || GPIOLIB | ||
489 | depends on MTD_COMPLEX_MAPPINGS | 490 | depends on MTD_COMPLEX_MAPPINGS |
490 | select MTD_PARTITIONS | 491 | select MTD_PARTITIONS |
491 | help | 492 | help |
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c index 44ef9a49a860..1ad5caf9fe69 100644 --- a/drivers/mtd/maps/gpio-addr-flash.c +++ b/drivers/mtd/maps/gpio-addr-flash.c | |||
@@ -13,7 +13,9 @@ | |||
13 | * Licensed under the GPL-2 or later. | 13 | * Licensed under the GPL-2 or later. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/gpio.h> | ||
16 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/io.h> | ||
17 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
18 | #include <linux/module.h> | 20 | #include <linux/module.h> |
19 | #include <linux/mtd/mtd.h> | 21 | #include <linux/mtd/mtd.h> |
@@ -23,9 +25,6 @@ | |||
23 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
24 | #include <linux/types.h> | 26 | #include <linux/types.h> |
25 | 27 | ||
26 | #include <asm/gpio.h> | ||
27 | #include <asm/io.h> | ||
28 | |||
29 | #define pr_devinit(fmt, args...) ({ static const __devinitconst char __fmt[] = fmt; printk(__fmt, ## args); }) | 28 | #define pr_devinit(fmt, args...) ({ static const __devinitconst char __fmt[] = fmt; printk(__fmt, ## args); }) |
30 | 29 | ||
31 | #define DRIVER_NAME "gpio-addr-flash" | 30 | #define DRIVER_NAME "gpio-addr-flash" |
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 22113865438b..2957cc70da3d 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
@@ -761,6 +761,7 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip) | |||
761 | * @mtd: mtd info structure | 761 | * @mtd: mtd info structure |
762 | * @chip: nand chip info structure | 762 | * @chip: nand chip info structure |
763 | * @buf: buffer to store read data | 763 | * @buf: buffer to store read data |
764 | * @page: page number to read | ||
764 | * | 765 | * |
765 | * Not for syndrome calculating ecc controllers, which use a special oob layout | 766 | * Not for syndrome calculating ecc controllers, which use a special oob layout |
766 | */ | 767 | */ |
@@ -777,6 +778,7 @@ static int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip, | |||
777 | * @mtd: mtd info structure | 778 | * @mtd: mtd info structure |
778 | * @chip: nand chip info structure | 779 | * @chip: nand chip info structure |
779 | * @buf: buffer to store read data | 780 | * @buf: buffer to store read data |
781 | * @page: page number to read | ||
780 | * | 782 | * |
781 | * We need a special oob layout and handling even when OOB isn't used. | 783 | * We need a special oob layout and handling even when OOB isn't used. |
782 | */ | 784 | */ |
@@ -818,6 +820,7 @@ static int nand_read_page_raw_syndrome(struct mtd_info *mtd, struct nand_chip *c | |||
818 | * @mtd: mtd info structure | 820 | * @mtd: mtd info structure |
819 | * @chip: nand chip info structure | 821 | * @chip: nand chip info structure |
820 | * @buf: buffer to store read data | 822 | * @buf: buffer to store read data |
823 | * @page: page number to read | ||
821 | */ | 824 | */ |
822 | static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip, | 825 | static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip, |
823 | uint8_t *buf, int page) | 826 | uint8_t *buf, int page) |
@@ -939,6 +942,7 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, uint3 | |||
939 | * @mtd: mtd info structure | 942 | * @mtd: mtd info structure |
940 | * @chip: nand chip info structure | 943 | * @chip: nand chip info structure |
941 | * @buf: buffer to store read data | 944 | * @buf: buffer to store read data |
945 | * @page: page number to read | ||
942 | * | 946 | * |
943 | * Not for syndrome calculating ecc controllers which need a special oob layout | 947 | * Not for syndrome calculating ecc controllers which need a special oob layout |
944 | */ | 948 | */ |
@@ -983,6 +987,7 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, | |||
983 | * @mtd: mtd info structure | 987 | * @mtd: mtd info structure |
984 | * @chip: nand chip info structure | 988 | * @chip: nand chip info structure |
985 | * @buf: buffer to store read data | 989 | * @buf: buffer to store read data |
990 | * @page: page number to read | ||
986 | * | 991 | * |
987 | * Hardware ECC for large page chips, require OOB to be read first. | 992 | * Hardware ECC for large page chips, require OOB to be read first. |
988 | * For this ECC mode, the write_page method is re-used from ECC_HW. | 993 | * 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, | |||
1031 | * @mtd: mtd info structure | 1036 | * @mtd: mtd info structure |
1032 | * @chip: nand chip info structure | 1037 | * @chip: nand chip info structure |
1033 | * @buf: buffer to store read data | 1038 | * @buf: buffer to store read data |
1039 | * @page: page number to read | ||
1034 | * | 1040 | * |
1035 | * The hw generator calculates the error syndrome automatically. Therefor | 1041 | * The hw generator calculates the error syndrome automatically. Therefor |
1036 | * we need a special oob layout and handling. | 1042 | * we need a special oob layout and handling. |