Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
	arch/arm/mach-at91/board-afeb-9260v1.c
	arch/arm/mach-at91/board-neocore926.c
	arch/arm/mach-at91/board-rm9200dk.c
	arch/arm/mach-at91/board-sam9g20ek.c
	arch/arm/mach-at91/board-sam9m10g45ek.c
	arch/arm/mach-at91/board-usb-a9260.c
	drivers/mtd/maps/lantiq-flash.c

diff --cc arch/arm/mach-at91/board-afeb-9260v1.c
index 2d92043308dce086717cab3195b3ae49df437616,a053e915c27942224ae87158aa1ecf60a0c8414e..8c755c6fdbe2c1715158d7eb1c2db04ff33e8a82
--- 1/arch/arm/mach-at91/board-afeb-9260v1.c
--- 2/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
@@@ -142,9 -135,9 +136,10 @@@ static struct atmel_nand_data __initdat
        .cle            = 22,
        .rdy_pin        = AT91_PIN_PC13,
        .enable_pin     = AT91_PIN_PC14,
-       .partition_info = nand_partitions,
        .bus_width_16   = 0,
 +      .det_pin        = -EINVAL,
+       .parts          = afeb9260_nand_partition,
+       .num_parts      = ARRAY_SIZE(afeb9260_nand_partition),
  };
  
  

diff --cc arch/arm/mach-at91/board-cam60.c
index 951e1d9f88301cfccf58f131cde985ee29ed3573,46f8bab9c94387450de9579791b4b273ac782d5f..08a136b039e2a4b038e0e388c34ed86f4db4a39d
--- 1/arch/arm/mach-at91/board-cam60.c
--- 2/arch/arm/mach-at91/board-cam60.c
+++ b/arch/arm/mach-at91/board-cam60.c
@@@ -136,16 -135,11 +136,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata cam60_nand_data = {
        .ale            = 21,
        .cle            = 22,
 -      // .det_pin     = ... not there
 +      .det_pin        = -EINVAL,
        .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 = {

diff --cc arch/arm/mach-at91/board-cap9adk.c
index ab1bb479501005265b7cf7dfa3835d743bf58978,858927e2aff5436ee26bc9d40e81a7b7d06ba744..3b48829f0c3f99fdbf04cf00c029898e368e9be2
--- 1/arch/arm/mach-at91/board-cap9adk.c
--- 2/arch/arm/mach-at91/board-cap9adk.c
+++ b/arch/arm/mach-at91/board-cap9adk.c
@@@ -174,16 -172,11 +174,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata cap9adk_nand_data = {
        .ale            = 21,
        .cle            = 22,
 -//    .det_pin        = ... not connected
 -//    .rdy_pin        = ... not connected
 +      .det_pin        = -EINVAL,
 +      .rdy_pin        = -EINVAL,
        .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 = {

diff --cc arch/arm/mach-at91/board-kb9202.c
index fcbe247bb5b2708f59391b5e7864449c82193ce4,94372441c1aa29978d4cb3395db469b899f51e6d..39933efcd1741fa79b8ef46cbea2052685d27914
--- 1/arch/arm/mach-at91/board-kb9202.c
--- 2/arch/arm/mach-at91/board-kb9202.c
+++ b/arch/arm/mach-at91/board-kb9202.c
@@@ -103,16 -100,11 +103,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata kb9202_nand_data = {
        .ale            = 22,
        .cle            = 21,
 -      // .det_pin     = ... not there
 +      .det_pin        = -EINVAL,
        .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)

diff --cc arch/arm/mach-at91/board-neocore926.c
index 0e6b86ee049e0352c86c4faba20e9d8a27812e35,60f0cee074dcc7341210589c516fe2882451e178..d80ec7390880093b867f0d16d5de6e241284c59a
--- 1/arch/arm/mach-at91/board-neocore926.c
--- 2/arch/arm/mach-at91/board-neocore926.c
+++ b/arch/arm/mach-at91/board-neocore926.c
@@@ -195,8 -188,8 +189,9 @@@ static struct atmel_nand_data __initdat
        .rdy_pin                = AT91_PIN_PB19,
        .rdy_pin_active_low     = 1,
        .enable_pin             = AT91_PIN_PD15,
-       .partition_info         = nand_partitions,
 +      .det_pin                = -EINVAL,
+       .parts                  = neocore926_nand_partition,
+       .num_parts              = ARRAY_SIZE(neocore926_nand_partition),
  };
  
  static struct sam9_smc_config __initdata neocore926_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-qil-a9260.c
index 04cba2f3dda0b6be1aff7a0b56331f6668173c43,78d71e45d744660f5d633d7dc0c830d4b04ce9d6..c123c6f9085bc777a9573bee071a93948747c99d
--- 1/arch/arm/mach-at91/board-qil-a9260.c
--- 2/arch/arm/mach-at91/board-qil-a9260.c
+++ b/arch/arm/mach-at91/board-qil-a9260.c
@@@ -134,16 -133,11 +134,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 21,
        .cle            = 22,
 -//    .det_pin        = ... not connected
 +      .det_pin        = -EINVAL,
        .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 = {

diff --cc arch/arm/mach-at91/board-rm9200dk.c
index e34e84e158355b1ff8fcb4251f47b5be699a2b0c,b5f2faf479f6d91c74f25796a944da7ff3e054a1..fe16c27f7c559e5c427c492f2a15725f2d6f4085
--- 1/arch/arm/mach-at91/board-rm9200dk.c
--- 2/arch/arm/mach-at91/board-rm9200dk.c
+++ b/arch/arm/mach-at91/board-rm9200dk.c
@@@ -153,8 -143,9 +147,9 @@@ static struct atmel_nand_data __initdat
        .cle            = 21,
        .det_pin        = AT91_PIN_PB1,
        .rdy_pin        = AT91_PIN_PC2,
 -      // .enable_pin  = ... not there
 +      .enable_pin     = -EINVAL,
-       .partition_info = nand_partitions,
+       .parts          = dk_nand_partition,
+       .num_parts      = ARRAY_SIZE(dk_nand_partition),
  };
  
  #define DK_FLASH_BASE AT91_CHIPSELECT_0

diff --cc arch/arm/mach-at91/board-sam9-l9260.c
index dad4be4d218629455f8863e8901eb48ff7222241,4128f6d8e902118626f170ba78c28c442bba12f6..d8e9cdcbf9f4e032f55f8f2aa3836c8512460d95
--- 1/arch/arm/mach-at91/board-sam9-l9260.c
--- 2/arch/arm/mach-at91/board-sam9-l9260.c
+++ b/arch/arm/mach-at91/board-sam9-l9260.c
@@@ -135,16 -134,11 +135,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 21,
        .cle            = 22,
 -//    .det_pin        = ... not connected
 +      .det_pin        = -EINVAL,
        .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 = {

diff --cc arch/arm/mach-at91/board-sam9260ek.c
index 7463db376c204fe3b0c4fa57d4dfd138effeeceb,2cf7ce25a33eb0a9f71e70308cf7f542b6f99522..605dc0165ff73758b9a70e6ac93cc1a7b1fd3deb
--- 1/arch/arm/mach-at91/board-sam9260ek.c
--- 2/arch/arm/mach-at91/board-sam9260ek.c
+++ b/arch/arm/mach-at91/board-sam9260ek.c
@@@ -177,16 -176,11 +177,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 21,
        .cle            = 22,
 -//    .det_pin        = ... not connected
 +      .det_pin        = -EINVAL,
        .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 = {

diff --cc arch/arm/mach-at91/board-sam9261ek.c
index 0fd2e125ec9f26cc612d00a3443c19eb7727a654,b7f35d0e9e54bff7812ea5bfd241dc1d3bb00eac..364f762d7077bf3edb6e3eb14e810a7d4ff19b20
--- 1/arch/arm/mach-at91/board-sam9261ek.c
--- 2/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@@ -183,16 -182,11 +183,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 22,
        .cle            = 21,
 -//    .det_pin        = ... not connected
 +      .det_pin        = -EINVAL,
        .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 = {

diff --cc arch/arm/mach-at91/board-sam9263ek.c
index aa22eb036b2d25664d3dddd01738c38d9a5e93e7,5d2bd12b41a8f9c4ee58bc6a385df01e5966447b..a3dbdae8a989370be0f8912502895c1db57ffbf5
--- 1/arch/arm/mach-at91/board-sam9263ek.c
--- 2/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@@ -183,16 -183,11 +183,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 21,
        .cle            = 22,
 -//    .det_pin        = ... not connected
 +      .det_pin        = -EINVAL,
        .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 = {

diff --cc arch/arm/mach-at91/board-sam9g20ek.c
index 6f11db3c96249fe193edbba8fb4d3ac8439dd66f,003122772e6390c91bb124f0962a22be1430e4b0..5206701b5ce9f80a074b06c57d56117efe3a83f5
--- 1/arch/arm/mach-at91/board-sam9g20ek.c
--- 2/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@@ -170,8 -163,8 +164,9 @@@ static struct atmel_nand_data __initdat
        .cle            = 22,
        .rdy_pin        = AT91_PIN_PC13,
        .enable_pin     = AT91_PIN_PC14,
-       .partition_info = nand_partitions,
 +      .det_pin        = -EINVAL,
+       .parts          = ek_nand_partition,
+       .num_parts      = ARRAY_SIZE(ek_nand_partition),
  };
  
  static struct sam9_smc_config __initdata ek_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-sam9m10g45ek.c
index 43a071eae430227f9cc6b0491add82d0138db6cd,00d041ca8dbe1d224613dee0130ccc59d06887a4..9ba1adbdc57c1495c71e58b7452accada82205c0
--- 1/arch/arm/mach-at91/board-sam9m10g45ek.c
--- 2/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@@ -150,8 -143,8 +144,9 @@@ static struct atmel_nand_data __initdat
        .cle            = 22,
        .rdy_pin        = AT91_PIN_PC8,
        .enable_pin     = AT91_PIN_PC14,
-       .partition_info = nand_partitions,
 +      .det_pin        = -EINVAL,
+       .parts          = ek_nand_partition,
+       .num_parts      = ARRAY_SIZE(ek_nand_partition),
  };
  
  static struct sam9_smc_config __initdata ek_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-sam9rlek.c
index 5d9a31d86666a01419079c9078f3e453917179b5,6178b4e7f1aaab98127edbfb351ab7004ef099b2..0d5ef5c65753698dd7a6cdf84e1307ff4814a34c
--- 1/arch/arm/mach-at91/board-sam9rlek.c
--- 2/arch/arm/mach-at91/board-sam9rlek.c
+++ b/arch/arm/mach-at91/board-sam9rlek.c
@@@ -91,16 -91,11 +91,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 21,
        .cle            = 22,
 -//    .det_pin        = ... not connected
 +      .det_pin        = -EINVAL,
        .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 = {

diff --cc arch/arm/mach-at91/board-snapper9260.c
index 17dae5003c333fc344437bd91481703ba31dcf0b,0df01c6e2d0c1b458bc89ac41e46740302eda69b..95b403113558d728a7cc0434e58b59ea03da8754
--- 1/arch/arm/mach-at91/board-snapper9260.c
--- 2/arch/arm/mach-at91/board-snapper9260.c
+++ b/arch/arm/mach-at91/board-snapper9260.c
@@@ -111,10 -101,9 +104,11 @@@ static struct atmel_nand_data __initdat
        .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,
 +      .enable_pin     = -EINVAL,
 +      .det_pin        = -EINVAL,
  };
  
  static struct sam9_smc_config __initdata snapper9260_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-usb-a926x.c
index 4f57a33275e8c4b233df45ccaed66caf865962b1,909fd97439500a3edf365870b9d546e2fa4003cf..c9cff9ce1683f61167ca4ca434b5bcb7b0b64c66
--- 1/arch/arm/mach-at91/board-usb-a926x.c
--- 2/arch/arm/mach-at91/board-usb-a9263.c
+++ b/arch/arm/mach-at91/board-usb-a926x.c
@@@ -194,19 -120,14 +194,14 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 21,
        .cle            = 22,
 -//    .det_pin        = ... not connected
 +      .det_pin        = -EINVAL,
        .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 = {
 +static struct sam9_smc_config __initdata usb_a9260_nand_smc_config = {
        .ncs_read_setup         = 0,
        .nrd_setup              = 1,
        .ncs_write_setup        = 0,

diff --cc arch/arm/mach-at91/board-yl-9200.c
index 87aff91f5cdeeb97f544d32eedca1546d6e4fba4,7511fb83865a00aa2487a377c71bec0453eb67e2..1e83a62d717727603313366727d17f634f4131c9
--- 1/arch/arm/mach-at91/board-yl-9200.c
--- 2/arch/arm/mach-at91/board-yl-9200.c
+++ b/arch/arm/mach-at91/board-yl-9200.c
@@@ -177,16 -175,11 +177,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata yl9200_nand_data = {
        .ale            = 6,
        .cle            = 7,
 -      // .det_pin     = ... not connected
 +      .det_pin        = -EINVAL,
        .rdy_pin        = AT91_PIN_PC14,        /* R/!B (Sheet10) */
        .enable_pin     = AT91_PIN_PC15,        /* !CE  (Sheet10) */
-       .partition_info = nand_partitions,
+       .parts          = yl9200_nand_partition,
+       .num_parts      = ARRAY_SIZE(yl9200_nand_partition),
  };
  
  /*

diff --cc arch/arm/mach-at91/include/mach/board.h
Simple merge

diff --cc arch/arm/mach-davinci/board-da830-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-da850-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm355-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm355-leopard.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm365-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm644x-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-mityomapl138.c
Simple merge

diff --cc arch/arm/mach-davinci/board-neuros-osd2.c
Simple merge

diff --cc arch/arm/mach-davinci/board-tnetv107x-evm.c
Simple merge

diff --cc arch/arm/mach-ep93xx/ts72xx.c
Simple merge

diff --cc arch/arm/mach-mmp/aspenite.c
Simple merge

diff --cc arch/arm/mach-orion5x/ts78xx-setup.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x300.c
Simple merge

diff --cc arch/arm/mach-pxa/littleton.c
Simple merge

diff --cc arch/arm/mach-pxa/raumfeld.c
Simple merge

diff --cc arch/arm/mach-pxa/zylonite.c
Simple merge

diff --cc drivers/mtd/Kconfig
Simple merge

diff --cc drivers/mtd/maps/lantiq-flash.c
Simple merge

diff --cc drivers/mtd/mtdchar.c
Simple merge

diff --cc drivers/mtd/nand/Kconfig
Simple merge

diff --cc drivers/mtd/nand/atmel_nand.c
Simple merge

diff --cc drivers/mtd/nand/au1550nd.c
Simple merge

diff --cc drivers/mtd/onenand/omap2.c
Simple merge

diff --cc fs/jffs2/fs.c
Simple merge