Commit
89d4fc153bb5c3830ab9e75e1690738cccea0322
Committed by
Tom Rini
2018-04-07 04:11:09 +0800
Exists in
smarc_8mq_lf_v2020.04
and in
11 other branches
8qm-imx_v2020.04_5.4.70_2.3.0 , emb_lf_v2022.04 , pitx_8mp_lf_v2020.04 , smarc-8m-android-10.0.0_2.6.0 , smarc-8m-android-11.0.0_2.0.0 , smarc-8mp-android-11.0.0_2.0.0 , smarc_8m-imx_v2019.04_4.19.35_1.1.0 , smarc_8mm-imx_v2019.04_4.19.35_1.1.0 , smarc_8mm-imx_v2020.04_5.4.24_2.1.0 , smarc_8mp_lf_v2020.04 , smarc_8mq-imx_v2020.04_5.4.24_2.1.0
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>
Showing
58 changed files
with
1 additions
and
58 deletions
Side-by-side Diff
...
...
@@ -50,7 +50,6 @@
50
50
CONFIG_DEBUG_UART_ANNOUNCE=y
51
51
CONFIG_ATMEL_USART=y
52
52
CONFIG_DM_SPI=y
53
-CONFIG_ATMEL_SPI=y
54
53
CONFIG_TIMER=y
55
54
CONFIG_ATMEL_PIT_TIMER=y
56
55
CONFIG_USB=y
...
...
@@ -50,7 +50,6 @@
50
50
CONFIG_DEBUG_UART_ANNOUNCE=y
51
51
CONFIG_ATMEL_USART=y
52
52
CONFIG_DM_SPI=y
53
-CONFIG_ATMEL_SPI=y
54
53
CONFIG_TIMER=y
55
54
CONFIG_ATMEL_PIT_TIMER=y
56
55
CONFIG_USB=y
...
...
@@ -50,7 +50,6 @@
50
50
CONFIG_DEBUG_UART_ANNOUNCE=y
51
51
CONFIG_ATMEL_USART=y
52
52
CONFIG_DM_SPI=y
53
-CONFIG_ATMEL_SPI=y
54
53
CONFIG_TIMER=y
55
54
CONFIG_ATMEL_PIT_TIMER=y
56
55
CONFIG_USB=y
...
...
@@ -49,7 +49,6 @@
49
49
CONFIG_DEBUG_UART_ANNOUNCE=y
50
50
CONFIG_ATMEL_USART=y
51
51
CONFIG_DM_SPI=y
52
-CONFIG_ATMEL_SPI=y
53
52
CONFIG_TIMER=y
54
53
CONFIG_ATMEL_PIT_TIMER=y
55
54
CONFIG_USB=y
...
...
@@ -49,7 +49,6 @@
49
49
CONFIG_DEBUG_UART_ANNOUNCE=y
50
50
CONFIG_ATMEL_USART=y
51
51
CONFIG_DM_SPI=y
52
-CONFIG_ATMEL_SPI=y
53
52
CONFIG_TIMER=y
54
53
CONFIG_ATMEL_PIT_TIMER=y
55
54
CONFIG_USB=y
...
...
@@ -49,7 +49,6 @@
49
49
CONFIG_DEBUG_UART_ANNOUNCE=y
50
50
CONFIG_ATMEL_USART=y
51
51
CONFIG_DM_SPI=y
52
-CONFIG_ATMEL_SPI=y
53
52
CONFIG_TIMER=y
54
53
CONFIG_ATMEL_PIT_TIMER=y
55
54
CONFIG_USB=y
...
...
@@ -55,7 +55,6 @@
55
55
CONFIG_DEBUG_UART_ANNOUNCE=y
56
56
CONFIG_ATMEL_USART=y
57
57
CONFIG_DM_SPI=y
58
-CONFIG_ATMEL_SPI=y
59
58
CONFIG_TIMER=y
60
59
CONFIG_ATMEL_PIT_TIMER=y
61
60
CONFIG_USB=y
...
...
@@ -55,7 +55,6 @@
55
55
CONFIG_DEBUG_UART_ANNOUNCE=y
56
56
CONFIG_ATMEL_USART=y
57
57
CONFIG_DM_SPI=y
58
-CONFIG_ATMEL_SPI=y
59
58
CONFIG_TIMER=y
60
59
CONFIG_ATMEL_PIT_TIMER=y
61
60
CONFIG_USB=y
...
...
@@ -55,7 +55,6 @@
55
55
CONFIG_DEBUG_UART_ANNOUNCE=y
56
56
CONFIG_ATMEL_USART=y
57
57
CONFIG_DM_SPI=y
58
-CONFIG_ATMEL_SPI=y
59
58
CONFIG_TIMER=y
60
59
CONFIG_ATMEL_PIT_TIMER=y
61
60
CONFIG_USB=y
...
...
@@ -54,7 +54,6 @@
54
54
CONFIG_DEBUG_UART_ANNOUNCE=y
55
55
CONFIG_ATMEL_USART=y
56
56
CONFIG_DM_SPI=y
57
-CONFIG_ATMEL_SPI=y
58
57
CONFIG_TIMER=y
59
58
CONFIG_ATMEL_PIT_TIMER=y
60
59
CONFIG_USB=y
...
...
@@ -54,7 +54,6 @@
54
54
CONFIG_DEBUG_UART_ANNOUNCE=y
55
55
CONFIG_ATMEL_USART=y
56
56
CONFIG_DM_SPI=y
57
-CONFIG_ATMEL_SPI=y
58
57
CONFIG_TIMER=y
59
58
CONFIG_ATMEL_PIT_TIMER=y
60
59
CONFIG_USB=y
...
...
@@ -49,7 +49,6 @@
49
49
CONFIG_DEBUG_UART_ANNOUNCE=y
50
50
CONFIG_ATMEL_USART=y
51
51
CONFIG_DM_SPI=y
52
-CONFIG_ATMEL_SPI=y
53
52
CONFIG_USB=y
54
53
CONFIG_USB_STORAGE=y
55
54
CONFIG_LCD=y
...
...
@@ -49,7 +49,6 @@
49
49
CONFIG_DEBUG_UART_ANNOUNCE=y
50
50
CONFIG_ATMEL_USART=y
51
51
CONFIG_DM_SPI=y
52
-CONFIG_ATMEL_SPI=y
53
52
CONFIG_USB=y
54
53
CONFIG_USB_STORAGE=y
55
54
CONFIG_LCD=y
...
...
@@ -49,7 +49,6 @@
49
49
CONFIG_DEBUG_UART_ANNOUNCE=y
50
50
CONFIG_ATMEL_USART=y
51
51
CONFIG_DM_SPI=y
52
-CONFIG_ATMEL_SPI=y
53
52
CONFIG_USB=y
54
53
CONFIG_USB_STORAGE=y
55
54
CONFIG_LCD=y
...
...
@@ -52,7 +52,6 @@
52
52
CONFIG_DEBUG_UART_ANNOUNCE=y
53
53
CONFIG_ATMEL_USART=y
54
54
CONFIG_DM_SPI=y
55
-CONFIG_ATMEL_SPI=y
56
55
CONFIG_TIMER=y
57
56
CONFIG_ATMEL_PIT_TIMER=y
58
57
CONFIG_USB=y
...
...
@@ -52,7 +52,6 @@
52
52
CONFIG_DEBUG_UART_ANNOUNCE=y
53
53
CONFIG_ATMEL_USART=y
54
54
CONFIG_DM_SPI=y
55
-CONFIG_ATMEL_SPI=y
56
55
CONFIG_TIMER=y
57
56
CONFIG_ATMEL_PIT_TIMER=y
58
57
CONFIG_USB=y
...
...
@@ -50,7 +50,6 @@
50
50
CONFIG_DEBUG_UART_ANNOUNCE=y
51
51
CONFIG_ATMEL_USART=y
52
52
CONFIG_DM_SPI=y
53
-CONFIG_ATMEL_SPI=y
54
53
CONFIG_TIMER=y
55
54
CONFIG_ATMEL_PIT_TIMER=y
56
55
CONFIG_USB=y
...
...
@@ -50,7 +50,6 @@
50
50
CONFIG_DEBUG_UART_ANNOUNCE=y
51
51
CONFIG_ATMEL_USART=y
52
52
CONFIG_DM_SPI=y
53
-CONFIG_ATMEL_SPI=y
54
53
CONFIG_TIMER=y
55
54
CONFIG_ATMEL_PIT_TIMER=y
56
55
CONFIG_USB=y
...
...
@@ -50,7 +50,6 @@
50
50
CONFIG_DEBUG_UART_ANNOUNCE=y
51
51
CONFIG_ATMEL_USART=y
52
52
CONFIG_DM_SPI=y
53
-CONFIG_ATMEL_SPI=y
54
53
CONFIG_TIMER=y
55
54
CONFIG_ATMEL_PIT_TIMER=y
56
55
CONFIG_USB=y
...
...
@@ -51,7 +51,6 @@
51
51
CONFIG_DEBUG_UART_ANNOUNCE=y
52
52
CONFIG_ATMEL_USART=y
53
53
CONFIG_DM_SPI=y
54
-CONFIG_ATMEL_SPI=y
55
54
CONFIG_TIMER=y
56
55
CONFIG_ATMEL_PIT_TIMER=y
57
56
CONFIG_USB=y
...
...
@@ -51,7 +51,6 @@
51
51
CONFIG_DEBUG_UART_ANNOUNCE=y
52
52
CONFIG_ATMEL_USART=y
53
53
CONFIG_DM_SPI=y
54
-CONFIG_ATMEL_SPI=y
55
54
CONFIG_TIMER=y
56
55
CONFIG_ATMEL_PIT_TIMER=y
57
56
CONFIG_USB=y
...
...
@@ -51,7 +51,6 @@
51
51
CONFIG_DEBUG_UART_ANNOUNCE=y
52
52
CONFIG_ATMEL_USART=y
53
53
CONFIG_DM_SPI=y
54
-CONFIG_ATMEL_SPI=y
55
54
CONFIG_TIMER=y
56
55
CONFIG_ATMEL_PIT_TIMER=y
57
56
CONFIG_USB=y
...
...
@@ -48,7 +48,6 @@
48
48
CONFIG_DEBUG_UART_ANNOUNCE=y
49
49
CONFIG_ATMEL_USART=y
50
50
CONFIG_DM_SPI=y
51
-CONFIG_ATMEL_SPI=y
52
51
CONFIG_TIMER=y
53
52
CONFIG_ATMEL_PIT_TIMER=y
54
53
CONFIG_LCD=y
...
...
@@ -48,7 +48,6 @@
48
48
CONFIG_DEBUG_UART_ANNOUNCE=y
49
49
CONFIG_ATMEL_USART=y
50
50
CONFIG_DM_SPI=y
51
-CONFIG_ATMEL_SPI=y
52
51
CONFIG_TIMER=y
53
52
CONFIG_ATMEL_PIT_TIMER=y
54
53
CONFIG_LCD=y
...
...
@@ -48,7 +48,6 @@
48
48
CONFIG_DEBUG_UART_ANNOUNCE=y
49
49
CONFIG_ATMEL_USART=y
50
50
CONFIG_DM_SPI=y
51
-CONFIG_ATMEL_SPI=y
52
51
CONFIG_TIMER=y
53
52
CONFIG_ATMEL_PIT_TIMER=y
54
53
CONFIG_LCD=y
...
...
@@ -54,7 +54,6 @@
54
54
CONFIG_DEBUG_UART_ANNOUNCE=y
55
55
CONFIG_ATMEL_USART=y
56
56
CONFIG_DM_SPI=y
57
-CONFIG_ATMEL_SPI=y
58
57
CONFIG_TIMER=y
59
58
CONFIG_ATMEL_PIT_TIMER=y
60
59
CONFIG_USB=y
...
...
@@ -54,7 +54,6 @@
54
54
CONFIG_DEBUG_UART_ANNOUNCE=y
55
55
CONFIG_ATMEL_USART=y
56
56
CONFIG_DM_SPI=y
57
-CONFIG_ATMEL_SPI=y
58
57
CONFIG_TIMER=y
59
58
CONFIG_ATMEL_PIT_TIMER=y
60
59
CONFIG_USB=y
...
...
@@ -54,7 +54,6 @@
54
54
CONFIG_DEBUG_UART_ANNOUNCE=y
55
55
CONFIG_ATMEL_USART=y
56
56
CONFIG_DM_SPI=y
57
-CONFIG_ATMEL_SPI=y
58
57
CONFIG_TIMER=y
59
58
CONFIG_ATMEL_PIT_TIMER=y
60
59
CONFIG_USB=y
...
...
@@ -54,7 +54,6 @@
54
54
CONFIG_DEBUG_UART_ANNOUNCE=y
55
55
CONFIG_ATMEL_USART=y
56
56
CONFIG_DM_SPI=y
57
-CONFIG_ATMEL_SPI=y
58
57
CONFIG_TIMER=y
59
58
CONFIG_ATMEL_PIT_TIMER=y
60
59
CONFIG_USB=y
...
...
@@ -50,7 +50,6 @@
50
50
CONFIG_DEBUG_UART_ANNOUNCE=y
51
51
CONFIG_ATMEL_USART=y
52
52
CONFIG_DM_SPI=y
53
-CONFIG_ATMEL_SPI=y
54
53
CONFIG_TIMER=y
55
54
CONFIG_ATMEL_PIT_TIMER=y
56
55
CONFIG_USB=y
...
...
@@ -50,7 +50,6 @@
50
50
CONFIG_DEBUG_UART_ANNOUNCE=y
51
51
CONFIG_ATMEL_USART=y
52
52
CONFIG_DM_SPI=y
53
-CONFIG_ATMEL_SPI=y
54
53
CONFIG_TIMER=y
55
54
CONFIG_ATMEL_PIT_TIMER=y
56
55
CONFIG_USB=y
...
...
@@ -50,7 +50,6 @@
50
50
CONFIG_DEBUG_UART_ANNOUNCE=y
51
51
CONFIG_ATMEL_USART=y
52
52
CONFIG_DM_SPI=y
53
-CONFIG_ATMEL_SPI=y
54
53
CONFIG_TIMER=y
55
54
CONFIG_ATMEL_PIT_TIMER=y
56
55
CONFIG_USB=y
...
...
@@ -61,7 +61,6 @@
61
61
CONFIG_DM_SERIAL=y
62
62
CONFIG_ATMEL_USART=y
63
63
CONFIG_DM_SPI=y
64
-CONFIG_ATMEL_SPI=y
65
64
CONFIG_USB=y
66
65
CONFIG_USB_STORAGE=y
...
...
@@ -27,7 +27,6 @@
27
27
CONFIG_BOOTP_BOOTPATH=y
28
28
CONFIG_BOOTP_GATEWAY=y
29
29
CONFIG_BOOTP_HOSTNAME=y
30
-CONFIG_ATMEL_SPI=y
31
30
CONFIG_PHYLIB=y
32
31
CONFIG_TIMER=y
33
32
CONFIG_ATMEL_PIT_TIMER=y
...
...
@@ -36,5 +36,4 @@
36
36
CONFIG_DM_SERIAL=y
37
37
CONFIG_ATMEL_USART=y
38
38
CONFIG_DM_SPI=y
39
-CONFIG_ATMEL_SPI=y
...
...
@@ -37,5 +37,4 @@
37
37
CONFIG_DM_SERIAL=y
38
38
CONFIG_ATMEL_USART=y
39
39
CONFIG_DM_SPI=y
40
-CONFIG_ATMEL_SPI=y
...
...
@@ -47,7 +47,6 @@
47
47
CONFIG_DM_SERIAL=y
48
48
CONFIG_ATMEL_USART=y
49
49
CONFIG_DM_SPI=y
50
-CONFIG_ATMEL_SPI=y
51
50
CONFIG_USB=y
52
51
CONFIG_USB_STORAGE=y
53
52
CONFIG_LCD=y
...
...
@@ -45,7 +45,6 @@
45
45
CONFIG_DM_SERIAL=y
46
46
CONFIG_ATMEL_USART=y
47
47
CONFIG_DM_SPI=y
48
-CONFIG_ATMEL_SPI=y
49
48
CONFIG_USB=y
50
49
CONFIG_USB_STORAGE=y
51
50
CONFIG_LCD=y
...
...
@@ -77,7 +77,6 @@
77
77
CONFIG_DEBUG_UART_ANNOUNCE=y
78
78
CONFIG_ATMEL_USART=y
79
79
CONFIG_DM_SPI=y
80
-CONFIG_ATMEL_SPI=y
81
80
CONFIG_TIMER=y
82
81
CONFIG_SPL_TIMER=y
83
82
CONFIG_ATMEL_PIT_TIMER=y
...
...
@@ -75,7 +75,6 @@
75
75
CONFIG_DEBUG_UART_ANNOUNCE=y
76
76
CONFIG_ATMEL_USART=y
77
77
CONFIG_DM_SPI=y
78
-CONFIG_ATMEL_SPI=y
79
78
CONFIG_TIMER=y
80
79
CONFIG_SPL_TIMER=y
81
80
CONFIG_ATMEL_PIT_TIMER=y
...
...
@@ -72,7 +72,6 @@
72
72
CONFIG_DEBUG_UART_ANNOUNCE=y
73
73
CONFIG_ATMEL_USART=y
74
74
CONFIG_DM_SPI=y
75
-CONFIG_ATMEL_SPI=y
76
75
CONFIG_TIMER=y
77
76
CONFIG_SPL_TIMER=y
78
77
CONFIG_ATMEL_PIT_TIMER=y
...
...
@@ -54,7 +54,6 @@
54
54
CONFIG_DEBUG_UART_ANNOUNCE=y
55
55
CONFIG_ATMEL_USART=y
56
56
CONFIG_DM_SPI=y
57
-CONFIG_ATMEL_SPI=y
58
57
CONFIG_TIMER=y
59
58
CONFIG_ATMEL_PIT_TIMER=y
60
59
CONFIG_DM_VIDEO=y
...
...
@@ -54,7 +54,6 @@
54
54
CONFIG_DEBUG_UART_ANNOUNCE=y
55
55
CONFIG_ATMEL_USART=y
56
56
CONFIG_DM_SPI=y
57
-CONFIG_ATMEL_SPI=y
58
57
CONFIG_TIMER=y
59
58
CONFIG_ATMEL_PIT_TIMER=y
60
59
CONFIG_DM_VIDEO=y
...
...
@@ -54,7 +54,6 @@
54
54
CONFIG_DEBUG_UART_ANNOUNCE=y
55
55
CONFIG_ATMEL_USART=y
56
56
CONFIG_DM_SPI=y
57
-CONFIG_ATMEL_SPI=y
58
57
CONFIG_TIMER=y
59
58
CONFIG_ATMEL_PIT_TIMER=y
60
59
CONFIG_DM_VIDEO=y
...
...
@@ -76,7 +76,6 @@
76
76
CONFIG_DEBUG_UART_ANNOUNCE=y
77
77
CONFIG_ATMEL_USART=y
78
78
CONFIG_DM_SPI=y
79
-CONFIG_ATMEL_SPI=y
80
79
CONFIG_TIMER=y
81
80
CONFIG_SPL_TIMER=y
82
81
CONFIG_ATMEL_PIT_TIMER=y
...
...
@@ -71,7 +71,6 @@
71
71
CONFIG_DEBUG_UART_ANNOUNCE=y
72
72
CONFIG_ATMEL_USART=y
73
73
CONFIG_DM_SPI=y
74
-CONFIG_ATMEL_SPI=y
75
74
CONFIG_TIMER=y
76
75
CONFIG_SPL_TIMER=y
77
76
CONFIG_ATMEL_PIT_TIMER=y
...
...
@@ -70,7 +70,6 @@
70
70
CONFIG_DEBUG_UART_ANNOUNCE=y
71
71
CONFIG_ATMEL_USART=y
72
72
CONFIG_DM_SPI=y
73
-CONFIG_ATMEL_SPI=y
74
73
CONFIG_TIMER=y
75
74
CONFIG_SPL_TIMER=y
76
75
CONFIG_ATMEL_PIT_TIMER=y
...
...
@@ -71,7 +71,6 @@
71
71
CONFIG_DEBUG_UART_ANNOUNCE=y
72
72
CONFIG_ATMEL_USART=y
73
73
CONFIG_DM_SPI=y
74
-CONFIG_ATMEL_SPI=y
75
74
CONFIG_TIMER=y
76
75
CONFIG_SPL_TIMER=y
77
76
CONFIG_ATMEL_PIT_TIMER=y
...
...
@@ -68,7 +68,6 @@
68
68
CONFIG_DEBUG_UART_ANNOUNCE=y
69
69
CONFIG_ATMEL_USART=y
70
70
CONFIG_DM_SPI=y
71
-CONFIG_ATMEL_SPI=y
72
71
CONFIG_TIMER=y
73
72
CONFIG_SPL_TIMER=y
74
73
CONFIG_ATMEL_PIT_TIMER=y
...
...
@@ -70,7 +70,6 @@
70
70
CONFIG_DEBUG_UART_ANNOUNCE=y
71
71
CONFIG_ATMEL_USART=y
72
72
CONFIG_DM_SPI=y
73
-CONFIG_ATMEL_SPI=y
74
73
CONFIG_TIMER=y
75
74
CONFIG_SPL_TIMER=y
76
75
CONFIG_ATMEL_PIT_TIMER=y
...
...
@@ -71,7 +71,6 @@
71
71
CONFIG_DEBUG_UART_ANNOUNCE=y
72
72
CONFIG_ATMEL_USART=y
73
73
CONFIG_DM_SPI=y
74
-CONFIG_ATMEL_SPI=y
75
74
CONFIG_TIMER=y
76
75
CONFIG_SPL_TIMER=y
77
76
CONFIG_ATMEL_PIT_TIMER=y
...
...
@@ -68,7 +68,6 @@
68
68
CONFIG_DEBUG_UART_ANNOUNCE=y
69
69
CONFIG_ATMEL_USART=y
70
70
CONFIG_DM_SPI=y
71
-CONFIG_ATMEL_SPI=y
72
71
CONFIG_TIMER=y
73
72
CONFIG_SPL_TIMER=y
74
73
CONFIG_ATMEL_PIT_TIMER=y
...
...
@@ -67,7 +67,6 @@
67
67
CONFIG_DEBUG_UART_ANNOUNCE=y
68
68
CONFIG_ATMEL_USART=y
69
69
CONFIG_DM_SPI=y
70
-CONFIG_ATMEL_SPI=y
71
70
CONFIG_TIMER=y
72
71
CONFIG_SPL_TIMER=y
73
72
CONFIG_ATMEL_PIT_TIMER=y
...
...
@@ -42,5 +42,4 @@
42
42
CONFIG_DM_SERIAL=y
43
43
CONFIG_ATMEL_USART=y
44
44
CONFIG_DM_SPI=y
45
-CONFIG_ATMEL_SPI=y
...
...
@@ -41,7 +41,7 @@
41
41
42
42
config ATMEL_SPI
43
43
bool "Atmel SPI driver"
44
- depends on ARCH_AT91
44
+ default y if ARCH_AT91
45
45
help
46
46
This enables driver for the Atmel SPI Controller, present on
47
47
many AT91 (ARM) chips. This driver can be used to access
...
...
@@ -86,7 +86,6 @@
86
86
* SPI NOR (boot memory)
87
87
*/
88
88
#ifdef CONFIG_CMD_SF
89
-#define CONFIG_ATMEL_SPI
90
89
#define CONFIG_SPI_FLASH_ATMEL
91
90
#define CONFIG_SF_DEFAULT_BUS 0
92
91
#define CONFIG_SF_DEFAULT_CS 0
...
...
@@ -118,7 +118,6 @@
118
118
119
119
/* SPI EEPROM */
120
120
#define CONFIG_SPI
121
-#define CONFIG_ATMEL_SPI
122
121
#define TAURUS_SPI_MASK (1 << 4)
123
122
#define TAURUS_SPI_CS_PIN AT91_PIN_PA3
124
123
...
...
@@ -38,7 +38,6 @@
38
38
/* SerialFlash */
39
39
40
40
#ifdef CONFIG_CMD_SF
41
-#define CONFIG_ATMEL_SPI
42
41
#define CONFIG_SPI_FLASH_STMICRO
43
42
#define CONFIG_SF_DEFAULT_BUS 0
44
43
#define CONFIG_SF_DEFAULT_CS 0