diff options
Diffstat (limited to 'arch/avr32/boards/atstk1000/atstk1002.c')
-rw-r--r-- | arch/avr32/boards/atstk1000/atstk1002.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c index 57f610ea30df..000eb4220a12 100644 --- a/arch/avr32/boards/atstk1000/atstk1002.c +++ b/arch/avr32/boards/atstk1000/atstk1002.c | |||
@@ -55,7 +55,7 @@ static struct at73c213_board_info at73c213_data = { | |||
55 | }; | 55 | }; |
56 | #endif | 56 | #endif |
57 | 57 | ||
58 | #ifndef CONFIG_BOARD_ATSTK1002_SW1_CUSTOM | 58 | #ifndef CONFIG_BOARD_ATSTK100X_SW1_CUSTOM |
59 | static struct spi_board_info spi0_board_info[] __initdata = { | 59 | static struct spi_board_info spi0_board_info[] __initdata = { |
60 | #ifdef CONFIG_BOARD_ATSTK1000_EXTDAC | 60 | #ifdef CONFIG_BOARD_ATSTK1000_EXTDAC |
61 | { | 61 | { |
@@ -77,7 +77,7 @@ static struct spi_board_info spi0_board_info[] __initdata = { | |||
77 | }; | 77 | }; |
78 | #endif | 78 | #endif |
79 | 79 | ||
80 | #ifdef CONFIG_BOARD_ATSTK1002_SPI1 | 80 | #ifdef CONFIG_BOARD_ATSTK100X_SPI1 |
81 | static struct spi_board_info spi1_board_info[] __initdata = { { | 81 | static struct spi_board_info spi1_board_info[] __initdata = { { |
82 | /* patch in custom entries here */ | 82 | /* patch in custom entries here */ |
83 | } }; | 83 | } }; |
@@ -175,7 +175,7 @@ static void __init atstk1002_setup_extdac(void) | |||
175 | 175 | ||
176 | void __init setup_board(void) | 176 | void __init setup_board(void) |
177 | { | 177 | { |
178 | #ifdef CONFIG_BOARD_ATSTK1002_SW2_CUSTOM | 178 | #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM |
179 | at32_map_usart(0, 1); /* USART 0/B: /dev/ttyS1, IRDA */ | 179 | at32_map_usart(0, 1); /* USART 0/B: /dev/ttyS1, IRDA */ |
180 | #else | 180 | #else |
181 | at32_map_usart(1, 0); /* USART 1/A: /dev/ttyS0, DB9 */ | 181 | at32_map_usart(1, 0); /* USART 1/A: /dev/ttyS0, DB9 */ |
@@ -212,7 +212,7 @@ static int __init atstk1002_init(void) | |||
212 | 212 | ||
213 | at32_add_system_devices(); | 213 | at32_add_system_devices(); |
214 | 214 | ||
215 | #ifdef CONFIG_BOARD_ATSTK1002_SW2_CUSTOM | 215 | #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM |
216 | at32_add_device_usart(1); | 216 | at32_add_device_usart(1); |
217 | #else | 217 | #else |
218 | at32_add_device_usart(0); | 218 | at32_add_device_usart(0); |
@@ -222,10 +222,10 @@ static int __init atstk1002_init(void) | |||
222 | #ifndef CONFIG_BOARD_ATSTK1002_SW6_CUSTOM | 222 | #ifndef CONFIG_BOARD_ATSTK1002_SW6_CUSTOM |
223 | set_hw_addr(at32_add_device_eth(0, ð_data[0])); | 223 | set_hw_addr(at32_add_device_eth(0, ð_data[0])); |
224 | #endif | 224 | #endif |
225 | #ifndef CONFIG_BOARD_ATSTK1002_SW1_CUSTOM | 225 | #ifndef CONFIG_BOARD_ATSTK100X_SW1_CUSTOM |
226 | at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info)); | 226 | at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info)); |
227 | #endif | 227 | #endif |
228 | #ifdef CONFIG_BOARD_ATSTK1002_SPI1 | 228 | #ifdef CONFIG_BOARD_ATSTK100X_SPI1 |
229 | at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); | 229 | at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); |
230 | #endif | 230 | #endif |
231 | #ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM | 231 | #ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM |
@@ -235,7 +235,7 @@ static int __init atstk1002_init(void) | |||
235 | fbmem_start, fbmem_size); | 235 | fbmem_start, fbmem_size); |
236 | #endif | 236 | #endif |
237 | at32_add_device_usba(0, NULL); | 237 | at32_add_device_usba(0, NULL); |
238 | #ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM | 238 | #ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM |
239 | at32_add_device_ssc(0, ATMEL_SSC_TX); | 239 | at32_add_device_ssc(0, ATMEL_SSC_TX); |
240 | #endif | 240 | #endif |
241 | 241 | ||