Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb9ebd4e authored by Brian Norris's avatar Brian Norris Committed by Artem Bityutskiy
Browse files

mtd: nand: rename NAND_USE_FLASH_BBT 



Recall the recently added prefix requirements:
 * "NAND_" for flags in nand.h, used in nand_chip.options
 * "NAND_BBT_" for flags in bbm.h, used in nand_chip.bbt_options
        or in nand_bbt_descr.options

Thus, I am changing NAND_USE_FLASH_BBT to NAND_BBT_USE_FLASH.

Again, this flag is found in bbm.h and so should NOT be used in the
"nand_chip.options" field.

Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent a40f7341

Documentation/DocBook/mtdnand.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -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 bbt_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

arch/arm/mach-davinci/board-da830-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static struct davinci_nand_pdata da830_evm_nand_pdata = { 
	.nr_parts	= ARRAY_SIZE(da830_evm_nand_partitions),

	.ecc_mode	= NAND_ECC_HW,

	.ecc_bits	= 4,

	.bbt_options	= NAND_USE_FLASH_BBT,

	.bbt_options	= NAND_BBT_USE_FLASH,

	.bbt_td		= &da830_evm_nand_bbt_main_descr,

	.bbt_md		= &da830_evm_nand_bbt_mirror_descr,

	.timing         = &da830_evm_nandflash_timing,

arch/arm/mach-davinci/board-da850-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static struct davinci_nand_pdata da850_evm_nandflash_data = { 
	.nr_parts	= ARRAY_SIZE(da850_evm_nandflash_partition),

	.ecc_mode	= NAND_ECC_HW,

	.ecc_bits	= 4,

	.bbt_options	= NAND_USE_FLASH_BBT,

	.bbt_options	= NAND_BBT_USE_FLASH,

	.timing		= &da850_evm_nandflash_timing,

};

arch/arm/mach-davinci/board-dm355-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static struct davinci_nand_pdata davinci_nand_data = { 
	.parts			= davinci_nand_partitions,

	.nr_parts		= ARRAY_SIZE(davinci_nand_partitions),

	.ecc_mode		= NAND_ECC_HW,

	.bbt_options		= NAND_USE_FLASH_BBT,

	.bbt_options		= NAND_BBT_USE_FLASH,

	.ecc_bits		= 4,

};

arch/arm/mach-davinci/board-dm355-leopard.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static struct davinci_nand_pdata davinci_nand_data = { 
	.parts			= davinci_nand_partitions,

	.nr_parts		= ARRAY_SIZE(davinci_nand_partitions),

	.ecc_mode		= NAND_ECC_HW_SYNDROME,

	.bbt_options		= NAND_USE_FLASH_BBT,

	.bbt_options		= NAND_BBT_USE_FLASH,

};



static struct resource davinci_nand_resources[] = {