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

Commit 64393b3a authored by Nicolas Ferre's avatar Nicolas Ferre Committed by Arnd Bergmann
Browse files

AT91: Change nand buswidth logic to match hardware default configuration 



The recently modified nand buswitth configuration is not aligned with
board reality: the double footprint on boards is always populated with 8bits
buswidth nand flashes.
So we have to consider that without particular configuration the 8bits
buswidth is selected by default.
Moreover, the previous logic was always using !board_have_nand_8bit(), we
change it to a simpler: board_have_nand_16bit().

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Tested-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent c5efefac

arch/arm/mach-at91/board-cap9adk.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static void __init cap9adk_add_device_nand(void) 
	csa = at91_sys_read(AT91_MATRIX_EBICSA);

	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_VDDIOMSEL_3_3V);



	cap9adk_nand_data.bus_width_16 = !board_have_nand_8bit();

	cap9adk_nand_data.bus_width_16 = board_have_nand_16bit();

	/* setup bus-width (8 or 16) */

	if (cap9adk_nand_data.bus_width_16)

		cap9adk_nand_smc_config.mode |= AT91_SMC_DBW_16;

arch/arm/mach-at91/board-sam9260ek.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = { 


static void __init ek_add_device_nand(void)

{

	ek_nand_data.bus_width_16 = !board_have_nand_8bit();

	ek_nand_data.bus_width_16 = board_have_nand_16bit();

	/* setup bus-width (8 or 16) */

	if (ek_nand_data.bus_width_16)

		ek_nand_smc_config.mode |= AT91_SMC_DBW_16;

arch/arm/mach-at91/board-sam9261ek.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = { 


static void __init ek_add_device_nand(void)

{

	ek_nand_data.bus_width_16 = !board_have_nand_8bit();

	ek_nand_data.bus_width_16 = board_have_nand_16bit();

	/* setup bus-width (8 or 16) */

	if (ek_nand_data.bus_width_16)

		ek_nand_smc_config.mode |= AT91_SMC_DBW_16;

arch/arm/mach-at91/board-sam9263ek.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = { 


static void __init ek_add_device_nand(void)

{

	ek_nand_data.bus_width_16 = !board_have_nand_8bit();

	ek_nand_data.bus_width_16 = board_have_nand_16bit();

	/* setup bus-width (8 or 16) */

	if (ek_nand_data.bus_width_16)

		ek_nand_smc_config.mode |= AT91_SMC_DBW_16;

arch/arm/mach-at91/board-sam9g20ek.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = { 


static void __init ek_add_device_nand(void)

{

	ek_nand_data.bus_width_16 = !board_have_nand_8bit();

	ek_nand_data.bus_width_16 = board_have_nand_16bit();

	/* setup bus-width (8 or 16) */

	if (ek_nand_data.bus_width_16)

		ek_nand_smc_config.mode |= AT91_SMC_DBW_16;