Commit 76b2ab76 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

at91: remove MTD_NAND_ATMEL_BUSWIDTH_16 option 



no board configure it as 'n' and it's an issue to merge all defconfigs
in one

On AT91SAM926x boards both types of NAND flash can be present
(8 and 16 bit data bus width).

so will pass it via system_rev

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
parent 4a7df24d

arch/arm/mach-at91/Kconfig

+0 −19
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ if ARCH_AT91 
config HAVE_AT91_DATAFLASH_CARD

	bool



config HAVE_NAND_ATMEL_BUSWIDTH_16

	bool



config HAVE_AT91_USART3

	bool
@@ -209,7 +206,6 @@ comment "AT91SAM9260 / AT91SAM9XE Board Type" 
config MACH_AT91SAM9260EK

	bool "Atmel AT91SAM9260-EK / AT91SAM9XE Evaluation Kit"

	select HAVE_AT91_DATAFLASH_CARD

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>
@@ -270,7 +266,6 @@ comment "AT91SAM9261 Board Type" 
config MACH_AT91SAM9261EK

	bool "Atmel AT91SAM9261-EK Evaluation Kit"

	select HAVE_AT91_DATAFLASH_CARD

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit.

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820>
@@ -286,7 +281,6 @@ comment "AT91SAM9G10 Board Type" 
config MACH_AT91SAM9G10EK

	bool "Atmel AT91SAM9G10-EK Evaluation Kit"

	select HAVE_AT91_DATAFLASH_CARD

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit.

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588>
@@ -302,7 +296,6 @@ comment "AT91SAM9263 Board Type" 
config MACH_AT91SAM9263EK

	bool "Atmel AT91SAM9263-EK Evaluation Kit"

	select HAVE_AT91_DATAFLASH_CARD

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91SAM9263-EK Evaluation Kit.

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4057>
@@ -343,7 +336,6 @@ comment "AT91SAM9G20 Board Type" 
config MACH_AT91SAM9G20EK

	bool "Atmel AT91SAM9G20-EK Evaluation Kit"

	select HAVE_AT91_DATAFLASH_CARD

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit

	  that embeds only one SD/MMC slot.
@@ -351,7 +343,6 @@ config MACH_AT91SAM9G20EK 
config MACH_AT91SAM9G20EK_2MMC

	depends on MACH_AT91SAM9G20EK

	bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots"

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using an Atmel AT91SAM9G20-EK Evaluation Kit

	  with 2 SD/MMC Slots. This is the case for AT91SAM9G20-EK rev. C and
@@ -416,7 +407,6 @@ comment "AT91SAM9G45 Board Type" 


config MACH_AT91SAM9M10G45EK

	bool "Atmel AT91SAM9M10G45-EK Evaluation Kits"

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91SAM9G45-EKES Evaluation Kit.

	  "ES" at the end of the name means that this board is an
@@ -433,7 +423,6 @@ comment "AT91CAP9 Board Type" 
config MACH_AT91CAP9ADK

	bool "Atmel AT91CAP9A-DK Evaluation Kit"

	select HAVE_AT91_DATAFLASH_CARD

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91CAP9A-DK Evaluation Kit.

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4138>
@@ -450,7 +439,6 @@ config MACH_AT572D940HFEB 
	bool "AT572D940HF-EK"

	depends on ARCH_AT572D940HF

	select HAVE_AT91_DATAFLASH_CARD

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT572D940HF-EK evaluation kit.

	  <http://www.atmel.com/products/diopsis/default.asp>
@@ -483,13 +471,6 @@ config MTD_AT91_DATAFLASH_CARD 
	help

	  Enable support for the DataFlash card.



config MTD_NAND_ATMEL_BUSWIDTH_16

	bool "Enable 16-bit data bus interface to NAND flash"

	depends on HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  On AT91SAM926x boards both types of NAND flash can be present

	  (8 and 16 bit data bus width).



# ----------------------------------------------------------



comment "AT91 Feature Selections"

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

+2 −5
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <mach/board.h>

#include <mach/gpio.h>

#include <mach/at91sam9_smc.h>

#include <mach/system_rev.h>



#include "sam9_smc.h"

#include "generic.h"
@@ -216,11 +217,6 @@ static struct atmel_nand_data __initdata eb_nand_data = { 
/*	.rdy_pin	= AT91_PIN_PC16, */

	.enable_pin	= AT91_PIN_PA15,

	.partition_info	= nand_partitions,

#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)

	.bus_width_16	= 1,

#else

	.bus_width_16	= 0,

#endif

};



static struct sam9_smc_config __initdata eb_nand_smc_config = {
@@ -243,6 +239,7 @@ static struct sam9_smc_config __initdata eb_nand_smc_config = { 


static void __init eb_add_device_nand(void)

{

	ek_nand_data.bus_width_16 = !board_have_nand_8bit();

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

	if (eb_nand_data.bus_width_16)

		eb_nand_smc_config.mode |= AT91_SMC_DBW_16;

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

+2 −5
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <mach/gpio.h>

#include <mach/at91cap9_matrix.h>

#include <mach/at91sam9_smc.h>

#include <mach/system_rev.h>



#include "sam9_smc.h"

#include "generic.h"
@@ -187,11 +188,6 @@ static struct atmel_nand_data __initdata cap9adk_nand_data = { 
//	.rdy_pin	= ... not connected

	.enable_pin	= AT91_PIN_PD15,

	.partition_info	= nand_partitions,

#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)

	.bus_width_16	= 1,

#else

	.bus_width_16	= 0,

#endif

};



static struct sam9_smc_config __initdata cap9adk_nand_smc_config = {
@@ -219,6 +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();

	/* 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

+2 −5
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <mach/gpio.h>

#include <mach/at91sam9_smc.h>

#include <mach/at91_shdwc.h>

#include <mach/system_rev.h>



#include "sam9_smc.h"

#include "generic.h"
@@ -191,11 +192,6 @@ static struct atmel_nand_data __initdata ek_nand_data = { 
	.rdy_pin	= AT91_PIN_PC13,

	.enable_pin	= AT91_PIN_PC14,

	.partition_info	= nand_partitions,

#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)

	.bus_width_16	= 1,

#else

	.bus_width_16	= 0,

#endif

};



static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -218,6 +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();

	/* 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

+2 −5
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <mach/gpio.h>

#include <mach/at91sam9_smc.h>

#include <mach/at91_shdwc.h>

#include <mach/system_rev.h>



#include "sam9_smc.h"

#include "generic.h"
@@ -197,11 +198,6 @@ static struct atmel_nand_data __initdata ek_nand_data = { 
	.rdy_pin	= AT91_PIN_PC15,

	.enable_pin	= AT91_PIN_PC14,

	.partition_info	= nand_partitions,

#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)

	.bus_width_16	= 1,

#else

	.bus_width_16	= 0,

#endif

};



static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -224,6 +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();

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

	if (ek_nand_data.bus_width_16)

		ek_nand_smc_config.mode |= AT91_SMC_DBW_16;

CRA Git | Maintained and supported by SUSTech CRA and CCSE