Просмотр исходного кода

spi: atmel: default y if DM_SPI && ARCH_AT91

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@amarulasolutions.com>
Acked-by: Wenyou Yang <wenyouya@gmail.com>
Jagan Teki 6 лет назад
Родитель
Сommit
89d4fc153b
58 измененных файлов с 1 добавлено и 58 удалено
  1. 0 1
      configs/at91sam9260ek_dataflash_cs0_defconfig
  2. 0 1
      configs/at91sam9260ek_dataflash_cs1_defconfig
  3. 0 1
      configs/at91sam9260ek_nandflash_defconfig
  4. 0 1
      configs/at91sam9261ek_dataflash_cs0_defconfig
  5. 0 1
      configs/at91sam9261ek_dataflash_cs3_defconfig
  6. 0 1
      configs/at91sam9261ek_nandflash_defconfig
  7. 0 1
      configs/at91sam9263ek_dataflash_cs0_defconfig
  8. 0 1
      configs/at91sam9263ek_dataflash_defconfig
  9. 0 1
      configs/at91sam9263ek_nandflash_defconfig
  10. 0 1
      configs/at91sam9263ek_norflash_boot_defconfig
  11. 0 1
      configs/at91sam9263ek_norflash_defconfig
  12. 0 1
      configs/at91sam9g10ek_dataflash_cs0_defconfig
  13. 0 1
      configs/at91sam9g10ek_dataflash_cs3_defconfig
  14. 0 1
      configs/at91sam9g10ek_nandflash_defconfig
  15. 0 1
      configs/at91sam9g20ek_2mmc_defconfig
  16. 0 1
      configs/at91sam9g20ek_2mmc_nandflash_defconfig
  17. 0 1
      configs/at91sam9g20ek_dataflash_cs0_defconfig
  18. 0 1
      configs/at91sam9g20ek_dataflash_cs1_defconfig
  19. 0 1
      configs/at91sam9g20ek_nandflash_defconfig
  20. 0 1
      configs/at91sam9n12ek_mmc_defconfig
  21. 0 1
      configs/at91sam9n12ek_nandflash_defconfig
  22. 0 1
      configs/at91sam9n12ek_spiflash_defconfig
  23. 0 1
      configs/at91sam9rlek_dataflash_defconfig
  24. 0 1
      configs/at91sam9rlek_mmc_defconfig
  25. 0 1
      configs/at91sam9rlek_nandflash_defconfig
  26. 0 1
      configs/at91sam9x5ek_dataflash_defconfig
  27. 0 1
      configs/at91sam9x5ek_mmc_defconfig
  28. 0 1
      configs/at91sam9x5ek_nandflash_defconfig
  29. 0 1
      configs/at91sam9x5ek_spiflash_defconfig
  30. 0 1
      configs/at91sam9xeek_dataflash_cs0_defconfig
  31. 0 1
      configs/at91sam9xeek_dataflash_cs1_defconfig
  32. 0 1
      configs/at91sam9xeek_nandflash_defconfig
  33. 0 1
      configs/ethernut5_defconfig
  34. 0 1
      configs/gurnard_defconfig
  35. 0 1
      configs/meesc_dataflash_defconfig
  36. 0 1
      configs/meesc_defconfig
  37. 0 1
      configs/pm9261_defconfig
  38. 0 1
      configs/pm9263_defconfig
  39. 0 1
      configs/sama5d27_som1_ek_mmc_defconfig
  40. 0 1
      configs/sama5d2_xplained_mmc_defconfig
  41. 0 1
      configs/sama5d2_xplained_spiflash_defconfig
  42. 0 1
      configs/sama5d36ek_cmp_mmc_defconfig
  43. 0 1
      configs/sama5d36ek_cmp_nandflash_defconfig
  44. 0 1
      configs/sama5d36ek_cmp_spiflash_defconfig
  45. 0 1
      configs/sama5d3xek_mmc_defconfig
  46. 0 1
      configs/sama5d3xek_nandflash_defconfig
  47. 0 1
      configs/sama5d3xek_spiflash_defconfig
  48. 0 1
      configs/sama5d4_xplained_mmc_defconfig
  49. 0 1
      configs/sama5d4_xplained_nandflash_defconfig
  50. 0 1
      configs/sama5d4_xplained_spiflash_defconfig
  51. 0 1
      configs/sama5d4ek_mmc_defconfig
  52. 0 1
      configs/sama5d4ek_nandflash_defconfig
  53. 0 1
      configs/sama5d4ek_spiflash_defconfig
  54. 0 1
      configs/usb_a9263_dataflash_defconfig
  55. 1 1
      drivers/spi/Kconfig
  56. 0 1
      include/configs/ma5d4evk.h
  57. 0 1
      include/configs/taurus.h
  58. 0 1
      include/configs/vinco.h

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 1 - 1
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

+ 0 - 1
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

+ 0 - 1
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
 

+ 0 - 1
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