Permalink
Browse files

Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (226 commits)
  mtd: tests: annotate as DANGEROUS in Kconfig
  mtd: tests: don't use mtd0 as a default
  mtd: clean up usage of MTD_DOCPROBE_ADDRESS
  jffs2: add compr=lzo and compr=zlib options
  jffs2: implement mount option parsing and compression overriding
  mtd: nand: initialize ops.mode
  mtd: provide an alias for the redboot module name
  mtd: m25p80: don't probe device which has status of 'disabled'
  mtd: nand_h1900 never worked
  mtd: Add DiskOnChip G3 support
  mtd: m25p80: add EON flash EN25Q32B into spi flash id table
  mtd: mark block device queue as non-rotational
  mtd: r852: make r852_pm_ops static
  mtd: m25p80: add support for at25df321a spi data flash
  mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
  mtd: nand: switch `check_pattern()' to standard `memcmp()'
  mtd: nand: invalidate cache on unaligned reads
  mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
  mtd: nand: wait to set BBT version
  mtd: nand: scrub BBT on ECC errors
  ...

Fix up trivial conflicts:
 - arch/arm/mach-at91/board-usb-a9260.c
	Merged into board-usb-a926x.c
 - drivers/mtd/maps/lantiq-flash.c
	add_mtd_partitions -> mtd_device_register vs changed to use
	mtd_device_parse_register.
  • Loading branch information...
torvalds committed Nov 7, 2011
2 parents cf5e15f + 48e546b commit e0d65113a70f1dc514e625cc4e7a7485a4bf72df
Showing with 7,583 additions and 4,046 deletions.
  1. +1 −18 Documentation/DocBook/mtdnand.tmpl
  2. +14 −0 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
  3. +2 −7 arch/arm/mach-at91/board-afeb-9260v1.c
  4. +2 −7 arch/arm/mach-at91/board-cam60.c
  5. +2 −7 arch/arm/mach-at91/board-cap9adk.c
  6. +2 −7 arch/arm/mach-at91/board-kb9202.c
  7. +2 −7 arch/arm/mach-at91/board-neocore926.c
  8. +2 −7 arch/arm/mach-at91/board-qil-a9260.c
  9. +2 −7 arch/arm/mach-at91/board-rm9200dk.c
  10. +2 −7 arch/arm/mach-at91/board-sam9-l9260.c
  11. +2 −7 arch/arm/mach-at91/board-sam9260ek.c
  12. +2 −7 arch/arm/mach-at91/board-sam9261ek.c
  13. +2 −7 arch/arm/mach-at91/board-sam9263ek.c
  14. +2 −7 arch/arm/mach-at91/board-sam9g20ek.c
  15. +2 −7 arch/arm/mach-at91/board-sam9m10g45ek.c
  16. +2 −7 arch/arm/mach-at91/board-sam9rlek.c
  17. +2 −8 arch/arm/mach-at91/board-snapper9260.c
  18. +2 −7 arch/arm/mach-at91/board-usb-a926x.c
  19. +2 −7 arch/arm/mach-at91/board-yl-9200.c
  20. +2 −1 arch/arm/mach-at91/include/mach/board.h
  21. +1 −1 arch/arm/mach-davinci/board-da830-evm.c
  22. +1 −1 arch/arm/mach-davinci/board-da850-evm.c
  23. +1 −1 arch/arm/mach-davinci/board-dm355-evm.c
  24. +1 −1 arch/arm/mach-davinci/board-dm355-leopard.c
  25. +1 −1 arch/arm/mach-davinci/board-dm365-evm.c
  26. +1 −1 arch/arm/mach-davinci/board-dm644x-evm.c
  27. +2 −1 arch/arm/mach-davinci/board-mityomapl138.c
  28. +1 −1 arch/arm/mach-davinci/board-neuros-osd2.c
  29. +1 −1 arch/arm/mach-davinci/board-tnetv107x-evm.c
  30. +3 −1 arch/arm/mach-davinci/include/mach/nand.h
  31. +5 −18 arch/arm/mach-ep93xx/ts72xx.c
  32. +3 −2 arch/arm/mach-mmp/aspenite.c
  33. +1 −1 arch/arm/mach-orion5x/ts78xx-setup.c
  34. +3 −2 arch/arm/mach-pxa/cm-x300.c
  35. +3 −2 arch/arm/mach-pxa/colibri-pxa3xx.c
  36. +3 −2 arch/arm/mach-pxa/littleton.c
  37. +5 −4 arch/arm/mach-pxa/mxm8x10.c
  38. +3 −2 arch/arm/mach-pxa/raumfeld.c
  39. +3 −2 arch/arm/mach-pxa/zylonite.c
  40. +18 −2 arch/arm/plat-pxa/include/plat/pxa3xx_nand.h
  41. +2 −6 arch/avr32/boards/atngw100/setup.c
  42. +2 −7 arch/avr32/boards/atstk1000/atstk1002.c
  43. +2 −1 arch/avr32/mach-at32ap/include/mach/board.h
  44. +1 −1 arch/cris/arch-v32/drivers/mach-a3/nandflash.c
  45. +1 −1 arch/cris/arch-v32/drivers/mach-fs/nandflash.c
  46. +6 −15 drivers/mtd/Kconfig
  47. +1 −1 drivers/mtd/Makefile
  48. +2 −2 drivers/mtd/afs.c
  49. +1 −1 drivers/mtd/ar7part.c
  50. +13 −18 drivers/mtd/chips/cfi_cmdset_0002.c
  51. +1 −2 drivers/mtd/chips/fwh_lock.h
  52. +13 −21 drivers/mtd/chips/jedec_probe.c
  53. +2 −5 drivers/mtd/cmdlinepart.c
  54. +11 −2 drivers/mtd/devices/Kconfig
  55. +3 −0 drivers/mtd/devices/Makefile
  56. +7 −10 drivers/mtd/devices/doc2000.c
  57. +5 −6 drivers/mtd/devices/doc2001.c
  58. +5 −6 drivers/mtd/devices/doc2001plus.c
  59. +1 −1 drivers/mtd/devices/docecc.c
  60. +1,114 −0 drivers/mtd/devices/docg3.c
  61. +297 −0 drivers/mtd/devices/docg3.h
  62. +0 −5 drivers/mtd/devices/docprobe.c
  63. +1 −17 drivers/mtd/devices/lart.c
  64. +30 −62 drivers/mtd/devices/m25p80.c
  65. +42 −49 drivers/mtd/devices/mtd_dataflash.c
  66. +5 −37 drivers/mtd/devices/sst25l.c
  67. +20 −20 drivers/mtd/ftl.c
  68. +32 −37 drivers/mtd/inftlcore.c
  69. +50 −66 drivers/mtd/inftlmount.c
  70. +0 −26 drivers/mtd/maps/Kconfig
  71. +0 −2 drivers/mtd/maps/Makefile
  72. +2 −14 drivers/mtd/maps/bfin-async-flash.c
  73. +0 −341 drivers/mtd/maps/ceiva.c
  74. +1 −8 drivers/mtd/maps/dc21285.c
  75. +0 −134 drivers/mtd/maps/edb7312.c
  76. +2 −14 drivers/mtd/maps/gpio-addr-flash.c
  77. +2 −21 drivers/mtd/maps/h720x-flash.c
  78. +4 −24 drivers/mtd/maps/impa7.c
  79. +1 −6 drivers/mtd/maps/intel_vr_nor.c
  80. +1 −10 drivers/mtd/maps/ixp2000.c
  81. +4 −25 drivers/mtd/maps/ixp4xx.c
  82. +2 −15 drivers/mtd/maps/lantiq-flash.c
  83. +2 −22 drivers/mtd/maps/latch-addr-flash.c
  84. +52 −72 drivers/mtd/maps/pcmciamtd.c
  85. +2 −36 drivers/mtd/maps/physmap.c
  86. +7 −73 drivers/mtd/maps/physmap_of.c
  87. +2 −21 drivers/mtd/maps/plat-ram.c
  88. +1 −19 drivers/mtd/maps/pxa2xx-flash.c
  89. +4 −20 drivers/mtd/maps/rbtx4939-flash.c
  90. +3 −27 drivers/mtd/maps/sa1100-flash.c
  91. +7 −23 drivers/mtd/maps/solutionengine.c
  92. +13 −20 drivers/mtd/maps/wr_sbc82xx_flash.c
  93. +2 −0 drivers/mtd/mtd_blkdevs.c
  94. +8 −10 drivers/mtd/mtdblock.c
  95. +120 −42 drivers/mtd/mtdchar.c
  96. +5 −5 drivers/mtd/mtdconcat.c
  97. +53 −17 drivers/mtd/mtdcore.c
  98. +3 −0 drivers/mtd/mtdcore.h
  99. +1 −1 drivers/mtd/mtdoops.c
  100. +54 −8 drivers/mtd/mtdpart.c
  101. +10 −10 drivers/mtd/mtdsuper.c
  102. +15 −16 drivers/mtd/mtdswap.c
  103. +18 −11 drivers/mtd/nand/Kconfig
  104. +1 −1 drivers/mtd/nand/Makefile
  105. +8 −66 drivers/mtd/nand/atmel_nand.c
  106. +13 −16 drivers/mtd/nand/au1550nd.c
  107. +2 −2 drivers/mtd/nand/autcpu12.c
  108. +21 −36 drivers/mtd/nand/bcm_umi_nand.c
  109. +5 −16 drivers/mtd/nand/cafe_nand.c
  110. +2 −21 drivers/mtd/nand/cmx270_nand.c
  111. +4 −11 drivers/mtd/nand/cs553x_nand.c
  112. +5 −34 drivers/mtd/nand/davinci_nand.c
  113. +3 −3 drivers/mtd/nand/denali.c
  114. +4 −4 drivers/mtd/nand/diskonchip.c
  115. +0 −203 drivers/mtd/nand/edb7312.c
  116. +28 −47 drivers/mtd/nand/fsl_elbc_nand.c
  117. +5 −11 drivers/mtd/nand/fsl_upm.c
  118. +11 −66 drivers/mtd/nand/fsmc_nand.c
  119. +3 −0 drivers/mtd/nand/gpmi-nand/Makefile
  120. +84 −0 drivers/mtd/nand/gpmi-nand/bch-regs.h
  121. +1,057 −0 drivers/mtd/nand/gpmi-nand/gpmi-lib.c
  122. +1,619 −0 drivers/mtd/nand/gpmi-nand/gpmi-nand.c
  123. +273 −0 drivers/mtd/nand/gpmi-nand/gpmi-nand.h
  124. +172 −0 drivers/mtd/nand/gpmi-nand/gpmi-regs.h
  125. +2 −17 drivers/mtd/nand/h1910.c
  126. +3 −15 drivers/mtd/nand/jz4740_nand.c
  127. +5 −17 drivers/mtd/nand/mpc5121_nfc.c
  128. +12 −25 drivers/mtd/nand/mxc_nand.c
  129. +558 −551 drivers/mtd/nand/nand_base.c
  130. +324 −368 drivers/mtd/nand/nand_bbt.c
  131. +2 −2 drivers/mtd/nand/nand_bch.c
  132. +5 −5 drivers/mtd/nand/nand_ecc.c
  133. +2 −2 drivers/mtd/nand/nandsim.c
  134. +4 −18 drivers/mtd/nand/ndfc.c
  135. +1 −0 drivers/mtd/nand/nomadik_nand.c
  136. +1 −0 drivers/mtd/nand/nuc900_nand.c
  137. +7 −15 drivers/mtd/nand/omap2.c
  138. +2 −14 drivers/mtd/nand/orion_nand.c
  139. +2 −1 drivers/mtd/nand/pasemi_nand.c
  140. +4 −21 drivers/mtd/nand/plat_nand.c
  141. +10 −37 drivers/mtd/nand/ppchameleonevb.c
  142. +291 −180 drivers/mtd/nand/pxa3xx_nand.c
  143. +3 −3 drivers/mtd/nand/r852.c
  144. +2 −3 drivers/mtd/nand/rtc_from4.c
  145. +9 −18 drivers/mtd/nand/s3c2410.c
  146. +2 −11 drivers/mtd/nand/sharpsl.c
  147. +1 −1 drivers/mtd/nand/sm_common.c
  148. +3 −25 drivers/mtd/nand/socrates_nand.c
  149. +3 −14 drivers/mtd/nand/tmio_nand.c
  150. +1 −7 drivers/mtd/nand/txx9ndfmc.c
  151. +17 −20 drivers/mtd/nftlcore.c
  152. +13 −13 drivers/mtd/nftlmount.c
  153. +107 −5 drivers/mtd/ofpart.c
  154. +3 −11 drivers/mtd/onenand/generic.c
  155. +4 −12 drivers/mtd/onenand/omap2.c
  156. +65 −49 drivers/mtd/onenand/onenand_base.c
  157. +3 −5 drivers/mtd/onenand/onenand_bbt.c
  158. +3 −10 drivers/mtd/onenand/samsung.c
  159. +9 −7 drivers/mtd/redboot.c
  160. +13 −13 drivers/mtd/sm_ftl.c
  161. +16 −30 drivers/mtd/ssfdc.c
  162. +20 −13 drivers/mtd/tests/mtd_oobtest.c
  163. +22 −15 drivers/mtd/tests/mtd_pagetest.c
  164. +10 −3 drivers/mtd/tests/mtd_readtest.c
  165. +12 −5 drivers/mtd/tests/mtd_speedtest.c
  166. +9 −2 drivers/mtd/tests/mtd_stresstest.c
  167. +12 −5 drivers/mtd/tests/mtd_subpagetest.c
  168. +9 −2 drivers/mtd/tests/mtd_torturetest.c
  169. +1 −1 drivers/mtd/ubi/eba.c
  170. +12 −12 drivers/mtd/ubi/io.c
  171. +1 −1 drivers/mtd/ubi/kapi.c
  172. +1 −1 drivers/mtd/ubi/misc.c
  173. +2 −2 drivers/mtd/ubi/scan.c
  174. +1 −1 drivers/mtd/ubi/vtbl.c
  175. +3 −3 drivers/staging/spectra/lld_mtd.c
  176. +91 −37 fs/jffs2/compr.c
  177. +2 −0 fs/jffs2/compr.h
  178. +1 −1 fs/jffs2/fs.c
  179. +6 −0 fs/jffs2/jffs2_fs_sb.h
  180. +1 −1 fs/jffs2/os-linux.h
  181. +1 −3 fs/jffs2/scan.c
  182. +119 −0 fs/jffs2/super.c
  183. +4 −5 fs/jffs2/wbuf.c
  184. +27 −12 include/linux/mtd/bbm.h
  185. +32 −50 include/linux/mtd/mtd.h
  186. +43 −49 include/linux/mtd/nand.h
  187. +4 −0 include/linux/mtd/onenand.h
  188. +18 −28 include/linux/mtd/partitions.h
  189. +0 −17 include/linux/mtd/physmap.h
  190. +105 −17 include/mtd/mtd-abi.h
@@ -572,7 +572,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip)
</para>
<para>
The simplest way to activate the FLASH based bad block table support
- is to set the option NAND_USE_FLASH_BBT in the option field of
+ is to set the option NAND_BBT_USE_FLASH in the bbt_option field of
the nand chip structure before calling nand_scan(). For AG-AND
chips is this done by default.
This activates the default FLASH based bad block table functionality
@@ -773,20 +773,6 @@ struct nand_oobinfo {
done according to the default builtin scheme.
</para>
</sect2>
- <sect2 id="User_space_placement_selection">
- <title>User space placement selection</title>
- <para>
- All non ecc functions like mtd->read and mtd->write use an internal
- structure, which can be set by an ioctl. This structure is preset
- to the autoplacement default.
- <programlisting>
- ioctl (fd, MEMSETOOBSEL, oobsel);
- </programlisting>
- oobsel is a pointer to a user supplied structure of type
- nand_oobconfig. The contents of this structure must match the
- criteria of the filesystem, which will be used. See an example in utils/nandwrite.c.
- </para>
- </sect2>
</sect1>
<sect1 id="Spare_area_autoplacement_default">
<title>Spare area autoplacement default schemes</title>
@@ -1158,9 +1144,6 @@ in this page</entry>
These constants are defined in nand.h. They are ored together to describe
the functionality.
<programlisting>
-/* Use a flash based bad block table. This option is parsed by the
- * default bad block table function (nand_default_bbt). */
-#define NAND_USE_FLASH_BBT 0x00010000
/* The hw ecc generator provides a syndrome instead a ecc value on read
* This can only work if we have the ecc bytes directly behind the
* data bytes. Applies for DOC and AG-AND Renesas HW Reed Solomon generators */
@@ -0,0 +1,14 @@
+* Atmel Data Flash
+
+Required properties:
+- compatible : "atmel,<model>", "atmel,<series>", "atmel,dataflash".
+
+Example:
+
+flash@1 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "atmel,at45db321d", "atmel,at45", "atmel,dataflash";
+ spi-max-frequency = <25000000>;
+ reg = <1>;
+};
@@ -130,19 +130,14 @@ static struct mtd_partition __initdata afeb9260_nand_partition[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(afeb9260_nand_partition);
- return afeb9260_nand_partition;
-}
-
static struct atmel_nand_data __initdata afeb9260_nand_data = {
.ale = 21,
.cle = 22,
.rdy_pin = AT91_PIN_PC13,
.enable_pin = AT91_PIN_PC14,
- .partition_info = nand_partitions,
.bus_width_16 = 0,
+ .parts = afeb9260_nand_partition,
+ .num_parts = ARRAY_SIZE(afeb9260_nand_partition),
};
@@ -132,19 +132,14 @@ static struct mtd_partition __initdata cam60_nand_partition[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(cam60_nand_partition);
- return cam60_nand_partition;
-}
-
static struct atmel_nand_data __initdata cam60_nand_data = {
.ale = 21,
.cle = 22,
// .det_pin = ... not there
.rdy_pin = AT91_PIN_PA9,
.enable_pin = AT91_PIN_PA7,
- .partition_info = nand_partitions,
+ .parts = cam60_nand_partition,
+ .num_parts = ARRAY_SIZE(cam60_nand_partition),
};
static struct sam9_smc_config __initdata cam60_nand_smc_config = {
@@ -169,19 +169,14 @@ static struct mtd_partition __initdata cap9adk_nand_partitions[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(cap9adk_nand_partitions);
- return cap9adk_nand_partitions;
-}
-
static struct atmel_nand_data __initdata cap9adk_nand_data = {
.ale = 21,
.cle = 22,
// .det_pin = ... not connected
// .rdy_pin = ... not connected
.enable_pin = AT91_PIN_PD15,
- .partition_info = nand_partitions,
+ .parts = cap9adk_nand_partitions,
+ .num_parts = ARRAY_SIZE(cap9adk_nand_partitions),
};
static struct sam9_smc_config __initdata cap9adk_nand_smc_config = {
@@ -97,19 +97,14 @@ static struct mtd_partition __initdata kb9202_nand_partition[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(kb9202_nand_partition);
- return kb9202_nand_partition;
-}
-
static struct atmel_nand_data __initdata kb9202_nand_data = {
.ale = 22,
.cle = 21,
// .det_pin = ... not there
.rdy_pin = AT91_PIN_PC29,
.enable_pin = AT91_PIN_PC28,
- .partition_info = nand_partitions,
+ .parts = kb9202_nand_partition,
+ .num_parts = ARRAY_SIZE(kb9202_nand_partition),
};
static void __init kb9202_board_init(void)
@@ -182,19 +182,14 @@ static struct mtd_partition __initdata neocore926_nand_partition[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(neocore926_nand_partition);
- return neocore926_nand_partition;
-}
-
static struct atmel_nand_data __initdata neocore926_nand_data = {
.ale = 21,
.cle = 22,
.rdy_pin = AT91_PIN_PB19,
.rdy_pin_active_low = 1,
.enable_pin = AT91_PIN_PD15,
- .partition_info = nand_partitions,
+ .parts = neocore926_nand_partition,
+ .num_parts = ARRAY_SIZE(neocore926_nand_partition),
};
static struct sam9_smc_config __initdata neocore926_nand_smc_config = {
@@ -130,19 +130,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(ek_nand_partition);
- return ek_nand_partition;
-}
-
static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 21,
.cle = 22,
// .det_pin = ... not connected
.rdy_pin = AT91_PIN_PC13,
.enable_pin = AT91_PIN_PC14,
- .partition_info = nand_partitions,
+ .parts = ek_nand_partition,
+ .num_parts = ARRAY_SIZE(ek_nand_partition),
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -138,19 +138,14 @@ static struct mtd_partition __initdata dk_nand_partition[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(dk_nand_partition);
- return dk_nand_partition;
-}
-
static struct atmel_nand_data __initdata dk_nand_data = {
.ale = 22,
.cle = 21,
.det_pin = AT91_PIN_PB1,
.rdy_pin = AT91_PIN_PC2,
// .enable_pin = ... not there
- .partition_info = nand_partitions,
+ .parts = dk_nand_partition,
+ .num_parts = ARRAY_SIZE(dk_nand_partition),
};
#define DK_FLASH_BASE AT91_CHIPSELECT_0
@@ -131,19 +131,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(ek_nand_partition);
- return ek_nand_partition;
-}
-
static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 21,
.cle = 22,
// .det_pin = ... not connected
.rdy_pin = AT91_PIN_PC13,
.enable_pin = AT91_PIN_PC14,
- .partition_info = nand_partitions,
+ .parts = ek_nand_partition,
+ .num_parts = ARRAY_SIZE(ek_nand_partition),
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -173,19 +173,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(ek_nand_partition);
- return ek_nand_partition;
-}
-
static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 21,
.cle = 22,
// .det_pin = ... not connected
.rdy_pin = AT91_PIN_PC13,
.enable_pin = AT91_PIN_PC14,
- .partition_info = nand_partitions,
+ .parts = ek_nand_partition,
+ .num_parts = ARRAY_SIZE(ek_nand_partition),
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -179,19 +179,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(ek_nand_partition);
- return ek_nand_partition;
-}
-
static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 22,
.cle = 21,
// .det_pin = ... not connected
.rdy_pin = AT91_PIN_PC15,
.enable_pin = AT91_PIN_PC14,
- .partition_info = nand_partitions,
+ .parts = ek_nand_partition,
+ .num_parts = ARRAY_SIZE(ek_nand_partition),
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -180,19 +180,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(ek_nand_partition);
- return ek_nand_partition;
-}
-
static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 21,
.cle = 22,
// .det_pin = ... not connected
.rdy_pin = AT91_PIN_PA22,
.enable_pin = AT91_PIN_PD15,
- .partition_info = nand_partitions,
+ .parts = ek_nand_partition,
+ .num_parts = ARRAY_SIZE(ek_nand_partition),
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -157,19 +157,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(ek_nand_partition);
- return ek_nand_partition;
-}
-
/* det_pin is not connected */
static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 21,
.cle = 22,
.rdy_pin = AT91_PIN_PC13,
.enable_pin = AT91_PIN_PC14,
- .partition_info = nand_partitions,
+ .parts = ek_nand_partition,
+ .num_parts = ARRAY_SIZE(ek_nand_partition),
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -137,19 +137,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(ek_nand_partition);
- return ek_nand_partition;
-}
-
/* det_pin is not connected */
static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 21,
.cle = 22,
.rdy_pin = AT91_PIN_PC8,
.enable_pin = AT91_PIN_PC14,
- .partition_info = nand_partitions,
+ .parts = ek_nand_partition,
+ .num_parts = ARRAY_SIZE(ek_nand_partition),
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -88,19 +88,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
},
};
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(ek_nand_partition);
- return ek_nand_partition;
-}
-
static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 21,
.cle = 22,
// .det_pin = ... not connected
.rdy_pin = AT91_PIN_PD17,
.enable_pin = AT91_PIN_PB6,
- .partition_info = nand_partitions,
+ .parts = ek_nand_partition,
+ .num_parts = ARRAY_SIZE(ek_nand_partition),
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -97,18 +97,12 @@ static struct mtd_partition __initdata snapper9260_nand_partitions[] = {
},
};
-static struct mtd_partition * __init
-snapper9260_nand_partition_info(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(snapper9260_nand_partitions);
- return snapper9260_nand_partitions;
-}
-
static struct atmel_nand_data __initdata snapper9260_nand_data = {
.ale = 21,
.cle = 22,
.rdy_pin = AT91_PIN_PC13,
- .partition_info = snapper9260_nand_partition_info,
+ .parts = snapper9260_nand_partitions,
+ .num_parts = ARRAY_SIZE(snapper9260_nand_partitions),
.bus_width_16 = 0,
};
Oops, something went wrong.

0 comments on commit e0d6511

Please sign in to comment.