diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-01 19:55:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-01 19:55:42 -0400 |
commit | f5e7e844a571124ffc117d4696787d6afc4fc5ae (patch) | |
tree | 26bb17dc94e9536da540c187b00cedb0c1b24664 /arch/arm/mach-ep93xx | |
parent | 48445159e9ecb44a96a4de06c6ae7c54eb43ba5b (diff) | |
parent | 4a43faf54e9173b6acce37cf7f053fc9515a2cdf (diff) |
Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd
Pull mtd update from David Woodhouse:
- More robust parsing especially of xattr data in JFFS2
- Updates to mxc_nand and gpmi drivers to support new boards and device tree
- Improve consistency of information about ECC strength in NAND devices
- Clean up partition handling of plat_nand
- Support NAND drivers without dedicated access to OOB area
- BCH hardware ECC support for OMAP
- Other fixes and cleanups, and a few new device IDs
Fixed trivial conflict in drivers/mtd/nand/gpmi-nand/gpmi-nand.c due to
added include files next to each other.
* tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd: (75 commits)
mtd: mxc_nand: move ecc strengh setup before nand_scan_tail
mtd: block2mtd: fix recursive call of mtd_writev
mtd: gpmi-nand: define ecc.strength
mtd: of_parts: fix breakage in Kconfig
mtd: nand: fix scan_read_raw_oob
mtd: docg3 fix in-middle of blocks reads
mtd: cfi_cmdset_0002: Slight cleanup of fixup messages
mtd: add fixup for S29NS512P NOR flash.
jffs2: allow to complete xattr integrity check on first GC scan
jffs2: allow to discriminate between recoverable and non-recoverable errors
mtd: nand: omap: add support for hardware BCH ecc
ARM: OMAP3: gpmc: add BCH ecc api and modes
mtd: nand: check the return code of 'read_oob/read_oob_raw'
mtd: nand: remove 'sndcmd' parameter of 'read_oob/read_oob_raw'
mtd: m25p80: Add support for Winbond W25Q80BW
jffs2: get rid of jffs2_sync_super
jffs2: remove unnecessary GC pass on sync
jffs2: remove unnecessary GC pass on umount
jffs2: remove lock_super
mtd: gpmi: add gpmi support for mx6q
...
Diffstat (limited to 'arch/arm/mach-ep93xx')
-rw-r--r-- | arch/arm/mach-ep93xx/snappercl15.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/ts72xx.c | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c index eb282378fa78..01abd3516a77 100644 --- a/arch/arm/mach-ep93xx/snappercl15.c +++ b/arch/arm/mach-ep93xx/snappercl15.c | |||
@@ -82,8 +82,6 @@ static int snappercl15_nand_dev_ready(struct mtd_info *mtd) | |||
82 | return !!(__raw_readw(NAND_CTRL_ADDR(chip)) & SNAPPERCL15_NAND_RDY); | 82 | return !!(__raw_readw(NAND_CTRL_ADDR(chip)) & SNAPPERCL15_NAND_RDY); |
83 | } | 83 | } |
84 | 84 | ||
85 | static const char *snappercl15_nand_part_probes[] = {"cmdlinepart", NULL}; | ||
86 | |||
87 | static struct mtd_partition snappercl15_nand_parts[] = { | 85 | static struct mtd_partition snappercl15_nand_parts[] = { |
88 | { | 86 | { |
89 | .name = "Kernel", | 87 | .name = "Kernel", |
@@ -100,10 +98,8 @@ static struct mtd_partition snappercl15_nand_parts[] = { | |||
100 | static struct platform_nand_data snappercl15_nand_data = { | 98 | static struct platform_nand_data snappercl15_nand_data = { |
101 | .chip = { | 99 | .chip = { |
102 | .nr_chips = 1, | 100 | .nr_chips = 1, |
103 | .part_probe_types = snappercl15_nand_part_probes, | ||
104 | .partitions = snappercl15_nand_parts, | 101 | .partitions = snappercl15_nand_parts, |
105 | .nr_partitions = ARRAY_SIZE(snappercl15_nand_parts), | 102 | .nr_partitions = ARRAY_SIZE(snappercl15_nand_parts), |
106 | .options = NAND_NO_AUTOINCR, | ||
107 | .chip_delay = 25, | 103 | .chip_delay = 25, |
108 | }, | 104 | }, |
109 | .ctrl = { | 105 | .ctrl = { |
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index d4ef339d961e..75cab2d7ec73 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c | |||
@@ -105,8 +105,6 @@ static int ts72xx_nand_device_ready(struct mtd_info *mtd) | |||
105 | return !!(__raw_readb(addr) & 0x20); | 105 | return !!(__raw_readb(addr) & 0x20); |
106 | } | 106 | } |
107 | 107 | ||
108 | static const char *ts72xx_nand_part_probes[] = { "cmdlinepart", NULL }; | ||
109 | |||
110 | #define TS72XX_BOOTROM_PART_SIZE (SZ_16K) | 108 | #define TS72XX_BOOTROM_PART_SIZE (SZ_16K) |
111 | #define TS72XX_REDBOOT_PART_SIZE (SZ_2M + SZ_1M) | 109 | #define TS72XX_REDBOOT_PART_SIZE (SZ_2M + SZ_1M) |
112 | 110 | ||
@@ -134,7 +132,6 @@ static struct platform_nand_data ts72xx_nand_data = { | |||
134 | .nr_chips = 1, | 132 | .nr_chips = 1, |
135 | .chip_offset = 0, | 133 | .chip_offset = 0, |
136 | .chip_delay = 15, | 134 | .chip_delay = 15, |
137 | .part_probe_types = ts72xx_nand_part_probes, | ||
138 | .partitions = ts72xx_nand_parts, | 135 | .partitions = ts72xx_nand_parts, |
139 | .nr_partitions = ARRAY_SIZE(ts72xx_nand_parts), | 136 | .nr_partitions = ARRAY_SIZE(ts72xx_nand_parts), |
140 | }, | 137 | }, |