[U-Boot] [PATCH 14/14] spi: atmel: default y if DM_SPI && ARCH_AT91

Wed Mar 21 04:13:17 UTC 2018


On 3/14/2018 9:16 PM, Jagan Teki wrote:
> ATMEL_SPI is now fully converted to driver-model and
> respective boards switch to DM_SPI as well,
> so make default y for ARCH_AT91
>
> Signed-off-by: Jagan Teki <jagan at amarulasolutions.com>
Acked-by: Wenyou Yang <wenyouya at gmail.com>

> ---
>   configs/at91sam9260ek_dataflash_cs0_defconfig  | 1 -
>   configs/at91sam9260ek_dataflash_cs1_defconfig  | 1 -
>   configs/at91sam9260ek_nandflash_defconfig      | 1 -
>   configs/at91sam9261ek_dataflash_cs0_defconfig  | 1 -
>   configs/at91sam9261ek_dataflash_cs3_defconfig  | 1 -
>   configs/at91sam9261ek_nandflash_defconfig      | 1 -
>   configs/at91sam9263ek_dataflash_cs0_defconfig  | 1 -
>   configs/at91sam9263ek_dataflash_defconfig      | 1 -
>   configs/at91sam9263ek_nandflash_defconfig      | 1 -
>   configs/at91sam9263ek_norflash_boot_defconfig  | 1 -
>   configs/at91sam9263ek_norflash_defconfig       | 1 -
>   configs/at91sam9g10ek_dataflash_cs0_defconfig  | 1 -
>   configs/at91sam9g10ek_dataflash_cs3_defconfig  | 1 -
>   configs/at91sam9g10ek_nandflash_defconfig      | 1 -
>   configs/at91sam9g20ek_2mmc_defconfig           | 1 -
>   configs/at91sam9g20ek_2mmc_nandflash_defconfig | 1 -
>   configs/at91sam9g20ek_dataflash_cs0_defconfig  | 1 -
>   configs/at91sam9g20ek_dataflash_cs1_defconfig  | 1 -
>   configs/at91sam9g20ek_nandflash_defconfig      | 1 -
>   configs/at91sam9n12ek_mmc_defconfig            | 1 -
>   configs/at91sam9n12ek_nandflash_defconfig      | 1 -
>   configs/at91sam9n12ek_spiflash_defconfig       | 1 -
>   configs/at91sam9rlek_dataflash_defconfig       | 1 -
>   configs/at91sam9rlek_mmc_defconfig             | 1 -
>   configs/at91sam9rlek_nandflash_defconfig       | 1 -
>   configs/at91sam9x5ek_dataflash_defconfig       | 1 -
>   configs/at91sam9x5ek_mmc_defconfig             | 1 -
>   configs/at91sam9x5ek_nandflash_defconfig       | 1 -
>   configs/at91sam9x5ek_spiflash_defconfig        | 1 -
>   configs/at91sam9xeek_dataflash_cs0_defconfig   | 1 -
>   configs/at91sam9xeek_dataflash_cs1_defconfig   | 1 -
>   configs/at91sam9xeek_nandflash_defconfig       | 1 -
>   configs/ethernut5_defconfig                    | 1 -
>   configs/gurnard_defconfig                      | 1 -
>   configs/meesc_dataflash_defconfig              | 1 -
>   configs/meesc_defconfig                        | 1 -
>   configs/pm9261_defconfig                       | 1 -
>   configs/pm9263_defconfig                       | 1 -
>   configs/sama5d27_som1_ek_mmc_defconfig         | 1 -
>   configs/sama5d2_xplained_mmc_defconfig         | 1 -
>   configs/sama5d2_xplained_spiflash_defconfig    | 1 -
>   configs/sama5d36ek_cmp_mmc_defconfig           | 1 -
>   configs/sama5d36ek_cmp_nandflash_defconfig     | 1 -
>   configs/sama5d36ek_cmp_spiflash_defconfig      | 1 -
>   configs/sama5d3xek_mmc_defconfig               | 1 -
>   configs/sama5d3xek_nandflash_defconfig         | 1 -
>   configs/sama5d3xek_spiflash_defconfig          | 1 -
>   configs/sama5d4_xplained_mmc_defconfig         | 1 -
>   configs/sama5d4_xplained_nandflash_defconfig   | 1 -
>   configs/sama5d4_xplained_spiflash_defconfig    | 1 -
>   configs/sama5d4ek_mmc_defconfig                | 1 -
>   configs/sama5d4ek_nandflash_defconfig          | 1 -
>   configs/sama5d4ek_spiflash_defconfig           | 1 -
>   configs/usb_a9263_dataflash_defconfig          | 1 -
>   drivers/spi/Kconfig                            | 2 +-
>   include/configs/ma5d4evk.h                     | 1 -
>   include/configs/taurus.h                       | 1 -
>   include/configs/vinco.h                        | 1 -
>   58 files changed, 1 insertion(+), 58 deletions(-)
>
> diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
> index b41fe5b5fe..ae2293db3e 100644
> --- a/configs/at91sam9260ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
> @@ -50,7 +50,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
> index a30a4f6f73..93f76126a6 100644
> --- a/configs/at91sam9260ek_dataflash_cs1_defconfig
> +++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
> @@ -50,7 +50,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig
> index 58a3431019..f7585d0565 100644
> --- a/configs/at91sam9260ek_nandflash_defconfig
> +++ b/configs/at91sam9260ek_nandflash_defconfig
> @@ -50,7 +50,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
> index 575e217f3a..bf06d32f55 100644
> --- a/configs/at91sam9261ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
> @@ -49,7 +49,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
> index 7be7becb1f..ad7791ac45 100644
> --- a/configs/at91sam9261ek_dataflash_cs3_defconfig
> +++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
> @@ -49,7 +49,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
> index 353dc0dc7f..079c6955b0 100644
> --- a/configs/at91sam9261ek_nandflash_defconfig
> +++ b/configs/at91sam9261ek_nandflash_defconfig
> @@ -49,7 +49,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
> index 418bbfc9e1..06390dce6b 100644
> --- a/configs/at91sam9263ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
> @@ -55,7 +55,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
> index 418bbfc9e1..06390dce6b 100644
> --- a/configs/at91sam9263ek_dataflash_defconfig
> +++ b/configs/at91sam9263ek_dataflash_defconfig
> @@ -55,7 +55,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
> index 1b3ef9b47c..5c3959e24b 100644
> --- a/configs/at91sam9263ek_nandflash_defconfig
> +++ b/configs/at91sam9263ek_nandflash_defconfig
> @@ -55,7 +55,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
> index 39abe2db76..a26da0064a 100644
> --- a/configs/at91sam9263ek_norflash_boot_defconfig
> +++ b/configs/at91sam9263ek_norflash_boot_defconfig
> @@ -54,7 +54,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
> index 04267354ff..4f08450384 100644
> --- a/configs/at91sam9263ek_norflash_defconfig
> +++ b/configs/at91sam9263ek_norflash_defconfig
> @@ -54,7 +54,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig
> index 2382b25cf3..c6cc752728 100644
> --- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
> @@ -49,7 +49,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
>   CONFIG_LCD=y
> diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig
> index 531dde84a4..81b291efab 100644
> --- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
> +++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
> @@ -49,7 +49,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
>   CONFIG_LCD=y
> diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig
> index 4973519da6..9a539315bd 100644
> --- a/configs/at91sam9g10ek_nandflash_defconfig
> +++ b/configs/at91sam9g10ek_nandflash_defconfig
> @@ -49,7 +49,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
>   CONFIG_LCD=y
> diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig
> index c9ef79b6ff..5f8824ca42 100644
> --- a/configs/at91sam9g20ek_2mmc_defconfig
> +++ b/configs/at91sam9g20ek_2mmc_defconfig
> @@ -52,7 +52,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
> index 982ddfd9e7..324f3acf57 100644
> --- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig
> +++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
> @@ -52,7 +52,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
> index 36bb9905f4..25bd456e65 100644
> --- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
> @@ -50,7 +50,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
> index de6d39d703..c8cb0af1a4 100644
> --- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
> +++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
> @@ -50,7 +50,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig
> index f8d9107025..b4ddf9cdd0 100644
> --- a/configs/at91sam9g20ek_nandflash_defconfig
> +++ b/configs/at91sam9g20ek_nandflash_defconfig
> @@ -50,7 +50,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig
> index f1fc70b41e..a253d448e5 100644
> --- a/configs/at91sam9n12ek_mmc_defconfig
> +++ b/configs/at91sam9n12ek_mmc_defconfig
> @@ -51,7 +51,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
> index 966d54475f..dc9514592e 100644
> --- a/configs/at91sam9n12ek_nandflash_defconfig
> +++ b/configs/at91sam9n12ek_nandflash_defconfig
> @@ -51,7 +51,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig
> index 634e3de83c..acd4a89e2c 100644
> --- a/configs/at91sam9n12ek_spiflash_defconfig
> +++ b/configs/at91sam9n12ek_spiflash_defconfig
> @@ -51,7 +51,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig
> index e80d43c79d..7f3fd4d2f0 100644
> --- a/configs/at91sam9rlek_dataflash_defconfig
> +++ b/configs/at91sam9rlek_dataflash_defconfig
> @@ -48,7 +48,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_LCD=y
> diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig
> index b18f2d42b0..84c9fa597f 100644
> --- a/configs/at91sam9rlek_mmc_defconfig
> +++ b/configs/at91sam9rlek_mmc_defconfig
> @@ -48,7 +48,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_LCD=y
> diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig
> index 5e8c97d6f7..21b19587af 100644
> --- a/configs/at91sam9rlek_nandflash_defconfig
> +++ b/configs/at91sam9rlek_nandflash_defconfig
> @@ -48,7 +48,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_LCD=y
> diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
> index b4b25022ab..069cd2a6ae 100644
> --- a/configs/at91sam9x5ek_dataflash_defconfig
> +++ b/configs/at91sam9x5ek_dataflash_defconfig
> @@ -54,7 +54,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
> index c8c027e94b..b7e050feb1 100644
> --- a/configs/at91sam9x5ek_mmc_defconfig
> +++ b/configs/at91sam9x5ek_mmc_defconfig
> @@ -54,7 +54,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
> index 1fb3ff4f4e..3ad4729160 100644
> --- a/configs/at91sam9x5ek_nandflash_defconfig
> +++ b/configs/at91sam9x5ek_nandflash_defconfig
> @@ -54,7 +54,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
> index 6848bccf29..fa400c898a 100644
> --- a/configs/at91sam9x5ek_spiflash_defconfig
> +++ b/configs/at91sam9x5ek_spiflash_defconfig
> @@ -54,7 +54,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
> index c935a0ce7c..216ef83d94 100644
> --- a/configs/at91sam9xeek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
> @@ -50,7 +50,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
> index db34a9247f..42ff46ca5c 100644
> --- a/configs/at91sam9xeek_dataflash_cs1_defconfig
> +++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
> @@ -50,7 +50,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig
> index 179ab02e26..0e2b544b08 100644
> --- a/configs/at91sam9xeek_nandflash_defconfig
> +++ b/configs/at91sam9xeek_nandflash_defconfig
> @@ -50,7 +50,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_USB=y
> diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
> index 888bed9b00..80ca4acfd7 100644
> --- a/configs/ethernut5_defconfig
> +++ b/configs/ethernut5_defconfig
> @@ -61,6 +61,5 @@ CONFIG_PINCTRL_AT91=y
>   CONFIG_DM_SERIAL=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
> diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig
> index ce51a0348f..95ccbdefea 100644
> --- a/configs/gurnard_defconfig
> +++ b/configs/gurnard_defconfig
> @@ -27,7 +27,6 @@ CONFIG_ENV_IS_IN_NAND=y
>   CONFIG_BOOTP_BOOTPATH=y
>   CONFIG_BOOTP_GATEWAY=y
>   CONFIG_BOOTP_HOSTNAME=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_PHYLIB=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
> diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig
> index f4b20fbf6a..4aa9602900 100644
> --- a/configs/meesc_dataflash_defconfig
> +++ b/configs/meesc_dataflash_defconfig
> @@ -36,4 +36,3 @@ CONFIG_PINCTRL_AT91=y
>   CONFIG_DM_SERIAL=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
> diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig
> index e1e549693b..9d38247221 100644
> --- a/configs/meesc_defconfig
> +++ b/configs/meesc_defconfig
> @@ -37,4 +37,3 @@ CONFIG_PINCTRL_AT91=y
>   CONFIG_DM_SERIAL=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
> diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
> index 9570438aba..cd11aec4f5 100644
> --- a/configs/pm9261_defconfig
> +++ b/configs/pm9261_defconfig
> @@ -47,7 +47,6 @@ CONFIG_PINCTRL_AT91=y
>   CONFIG_DM_SERIAL=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
>   CONFIG_LCD=y
> diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
> index 38102dcb0d..7d9b3d235c 100644
> --- a/configs/pm9263_defconfig
> +++ b/configs/pm9263_defconfig
> @@ -45,7 +45,6 @@ CONFIG_SPI_FLASH_DATAFLASH=y
>   CONFIG_DM_SERIAL=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_USB=y
>   CONFIG_USB_STORAGE=y
>   CONFIG_LCD=y
> diff --git a/configs/sama5d27_som1_ek_mmc_defconfig b/configs/sama5d27_som1_ek_mmc_defconfig
> index b90a10c7d3..f0cbba06e8 100644
> --- a/configs/sama5d27_som1_ek_mmc_defconfig
> +++ b/configs/sama5d27_som1_ek_mmc_defconfig
> @@ -77,7 +77,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_SPL_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
> diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig
> index e112c31532..a6aa683e6a 100644
> --- a/configs/sama5d2_xplained_mmc_defconfig
> +++ b/configs/sama5d2_xplained_mmc_defconfig
> @@ -75,7 +75,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_SPL_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
> diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig
> index 232b6bfc6a..c9e0a2746e 100644
> --- a/configs/sama5d2_xplained_spiflash_defconfig
> +++ b/configs/sama5d2_xplained_spiflash_defconfig
> @@ -72,7 +72,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_SPL_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
> diff --git a/configs/sama5d36ek_cmp_mmc_defconfig b/configs/sama5d36ek_cmp_mmc_defconfig
> index 5377f6da49..186f9f4bdb 100644
> --- a/configs/sama5d36ek_cmp_mmc_defconfig
> +++ b/configs/sama5d36ek_cmp_mmc_defconfig
> @@ -54,7 +54,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_DM_VIDEO=y
> diff --git a/configs/sama5d36ek_cmp_nandflash_defconfig b/configs/sama5d36ek_cmp_nandflash_defconfig
> index be75fb35b1..83bea11571 100644
> --- a/configs/sama5d36ek_cmp_nandflash_defconfig
> +++ b/configs/sama5d36ek_cmp_nandflash_defconfig
> @@ -54,7 +54,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_DM_VIDEO=y
> diff --git a/configs/sama5d36ek_cmp_spiflash_defconfig b/configs/sama5d36ek_cmp_spiflash_defconfig
> index fd9bf0c549..4d3b83c4f8 100644
> --- a/configs/sama5d36ek_cmp_spiflash_defconfig
> +++ b/configs/sama5d36ek_cmp_spiflash_defconfig
> @@ -54,7 +54,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
>   CONFIG_DM_VIDEO=y
> diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig
> index f9aff19e0c..e643eb39e6 100644
> --- a/configs/sama5d3xek_mmc_defconfig
> +++ b/configs/sama5d3xek_mmc_defconfig
> @@ -76,7 +76,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_SPL_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
> diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig
> index 49b229ca08..775fbb51d9 100644
> --- a/configs/sama5d3xek_nandflash_defconfig
> +++ b/configs/sama5d3xek_nandflash_defconfig
> @@ -71,7 +71,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_SPL_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
> diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig
> index 607e997f79..1f0dbc3c22 100644
> --- a/configs/sama5d3xek_spiflash_defconfig
> +++ b/configs/sama5d3xek_spiflash_defconfig
> @@ -70,7 +70,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_SPL_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
> diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig
> index e850a2dd43..ece2b449c6 100644
> --- a/configs/sama5d4_xplained_mmc_defconfig
> +++ b/configs/sama5d4_xplained_mmc_defconfig
> @@ -71,7 +71,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_SPL_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
> diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig
> index 9c8eedfbaa..b9a4930680 100644
> --- a/configs/sama5d4_xplained_nandflash_defconfig
> +++ b/configs/sama5d4_xplained_nandflash_defconfig
> @@ -68,7 +68,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_SPL_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
> diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig
> index a2411abe7d..e96bc73dfb 100644
> --- a/configs/sama5d4_xplained_spiflash_defconfig
> +++ b/configs/sama5d4_xplained_spiflash_defconfig
> @@ -70,7 +70,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_SPL_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
> diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig
> index 12b73138c0..7dc1a7ae35 100644
> --- a/configs/sama5d4ek_mmc_defconfig
> +++ b/configs/sama5d4ek_mmc_defconfig
> @@ -71,7 +71,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_SPL_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
> diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig
> index ed24e1724a..8e845586a2 100644
> --- a/configs/sama5d4ek_nandflash_defconfig
> +++ b/configs/sama5d4ek_nandflash_defconfig
> @@ -68,7 +68,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_SPL_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
> diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig
> index 9e63c4fb25..e533fd6ef2 100644
> --- a/configs/sama5d4ek_spiflash_defconfig
> +++ b/configs/sama5d4ek_spiflash_defconfig
> @@ -67,7 +67,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
>   CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
>   CONFIG_TIMER=y
>   CONFIG_SPL_TIMER=y
>   CONFIG_ATMEL_PIT_TIMER=y
> diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig
> index fc0ed319f2..ac3f3e2e58 100644
> --- a/configs/usb_a9263_dataflash_defconfig
> +++ b/configs/usb_a9263_dataflash_defconfig
> @@ -42,4 +42,3 @@ CONFIG_PINCTRL_AT91=y
>   CONFIG_DM_SERIAL=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
> -CONFIG_ATMEL_SPI=y
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index a3b4a0b2f0..12dde8fb95 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -41,7 +41,7 @@ config ATH79_SPI
>   
>   config ATMEL_SPI
>   	bool "Atmel SPI driver"
> -	depends on ARCH_AT91
> +	default y if ARCH_AT91
>   	help
>   	  This enables driver for the Atmel SPI Controller, present on
>   	  many AT91 (ARM) chips. This driver can be used to access
> diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
> index 4cba7580a2..68fe3bd67f 100644
> --- a/include/configs/ma5d4evk.h
> +++ b/include/configs/ma5d4evk.h
> @@ -86,7 +86,6 @@
>    * SPI NOR (boot memory)
>    */
>   #ifdef CONFIG_CMD_SF
> -#define CONFIG_ATMEL_SPI
>   #define CONFIG_SPI_FLASH_ATMEL
>   #define CONFIG_SF_DEFAULT_BUS		0
>   #define CONFIG_SF_DEFAULT_CS		0
> diff --git a/include/configs/taurus.h b/include/configs/taurus.h
> index 51e3987ab3..f138bd2238 100644
> --- a/include/configs/taurus.h
> +++ b/include/configs/taurus.h
> @@ -118,7 +118,6 @@
>   
>   /* SPI EEPROM */
>   #define CONFIG_SPI
> -#define CONFIG_ATMEL_SPI
>   #define TAURUS_SPI_MASK (1 << 4)
>   #define TAURUS_SPI_CS_PIN	AT91_PIN_PA3
>   
> diff --git a/include/configs/vinco.h b/include/configs/vinco.h
> index 3ae7e9e75b..d1b56ac037 100644
> --- a/include/configs/vinco.h
> +++ b/include/configs/vinco.h
> @@ -38,7 +38,6 @@
>   /* SerialFlash */
>   
>   #ifdef CONFIG_CMD_SF
> -#define CONFIG_ATMEL_SPI
>   #define CONFIG_SPI_FLASH_STMICRO
>   #define CONFIG_SF_DEFAULT_BUS		0
>   #define CONFIG_SF_DEFAULT_CS		0