From: Stephen Rothwell Date: Thu, 3 Nov 2011 03:49:55 +0000 (+1100) Subject: Merge remote-tracking branch 'l2-mtd/master' X-Git-Tag: next-20111103~35 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=45f696f7ce320abca436b5ddb142dfbfa0a5cb6c;p=karo-tx-linux.git 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 --- 45f696f7ce320abca436b5ddb142dfbfa0a5cb6c diff --cc arch/arm/mach-at91/board-afeb-9260v1.c index 2d92043308dc,a053e915c279..8c755c6fdbe2 --- a/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 951e1d9f8830,46f8bab9c943..08a136b039e2 --- a/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 ab1bb4795010,858927e2aff5..3b48829f0c3f --- a/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 fcbe247bb5b2,94372441c1aa..39933efcd174 --- a/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 0e6b86ee049e,60f0cee074dc..d80ec7390880 --- a/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 04cba2f3dda0,78d71e45d744..c123c6f9085b --- a/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 e34e84e15835,b5f2faf479f6..fe16c27f7c55 --- a/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 dad4be4d2186,4128f6d8e902..d8e9cdcbf9f4 --- a/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 7463db376c20,2cf7ce25a33e..605dc0165ff7 --- a/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 0fd2e125ec9f,b7f35d0e9e54..364f762d7077 --- a/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 aa22eb036b2d,5d2bd12b41a8..a3dbdae8a989 --- a/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 6f11db3c9624,003122772e63..5206701b5ce9 --- a/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 43a071eae430,00d041ca8dbe..9ba1adbdc57c --- a/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 5d9a31d86666,6178b4e7f1aa..0d5ef5c65753 --- a/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 17dae5003c33,0df01c6e2d0c..95b403113558 --- a/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 4f57a33275e8,909fd9743950..c9cff9ce1683 --- a/arch/arm/mach-at91/board-usb-a926x.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 87aff91f5cde,7511fb83865a..1e83a62d7177 --- a/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), }; /*