diff options
Diffstat (limited to 'arch/avr32/boards')
-rw-r--r-- | arch/avr32/boards/atngw100/setup.c | 2 | ||||
-rw-r--r-- | arch/avr32/boards/atstk1000/atstk1002.c | 6 | ||||
-rw-r--r-- | arch/avr32/boards/atstk1000/atstk1003.c | 6 | ||||
-rw-r--r-- | arch/avr32/boards/atstk1000/atstk1004.c | 6 | ||||
-rw-r--r-- | arch/avr32/boards/favr-32/setup.c | 2 | ||||
-rw-r--r-- | arch/avr32/boards/hammerhead/setup.c | 2 | ||||
-rw-r--r-- | arch/avr32/boards/merisc/setup.c | 8 | ||||
-rw-r--r-- | arch/avr32/boards/mimc200/setup.c | 8 |
8 files changed, 20 insertions, 20 deletions
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c index feac0035800c..5b022aad4bd9 100644 --- a/arch/avr32/boards/atngw100/setup.c +++ b/arch/avr32/boards/atngw100/setup.c | |||
@@ -118,7 +118,7 @@ static void __init set_hw_addr(struct platform_device *pdev) | |||
118 | 118 | ||
119 | void __init setup_board(void) | 119 | void __init setup_board(void) |
120 | { | 120 | { |
121 | at32_map_usart(1, 0); /* USART 1: /dev/ttyS0, DB9 */ | 121 | at32_map_usart(1, 0, 0); /* USART 1: /dev/ttyS0, DB9 */ |
122 | at32_setup_serial_console(0); | 122 | at32_setup_serial_console(0); |
123 | } | 123 | } |
124 | 124 | ||
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c index 1f33a106905c..2adc261c9e3d 100644 --- a/arch/avr32/boards/atstk1000/atstk1002.c +++ b/arch/avr32/boards/atstk1000/atstk1002.c | |||
@@ -252,12 +252,12 @@ static void __init atstk1002_setup_extdac(void) | |||
252 | void __init setup_board(void) | 252 | void __init setup_board(void) |
253 | { | 253 | { |
254 | #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM | 254 | #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM |
255 | at32_map_usart(0, 1); /* USART 0/B: /dev/ttyS1, IRDA */ | 255 | at32_map_usart(0, 1, 0); /* USART 0/B: /dev/ttyS1, IRDA */ |
256 | #else | 256 | #else |
257 | at32_map_usart(1, 0); /* USART 1/A: /dev/ttyS0, DB9 */ | 257 | at32_map_usart(1, 0, 0); /* USART 1/A: /dev/ttyS0, DB9 */ |
258 | #endif | 258 | #endif |
259 | /* USART 2/unused: expansion connector */ | 259 | /* USART 2/unused: expansion connector */ |
260 | at32_map_usart(3, 2); /* USART 3/C: /dev/ttyS2, DB9 */ | 260 | at32_map_usart(3, 2, 0); /* USART 3/C: /dev/ttyS2, DB9 */ |
261 | 261 | ||
262 | at32_setup_serial_console(0); | 262 | at32_setup_serial_console(0); |
263 | } | 263 | } |
diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c index b3a23c88bcfe..ff7e23298827 100644 --- a/arch/avr32/boards/atstk1000/atstk1003.c +++ b/arch/avr32/boards/atstk1000/atstk1003.c | |||
@@ -115,12 +115,12 @@ static void __init atstk1003_setup_extdac(void) | |||
115 | void __init setup_board(void) | 115 | void __init setup_board(void) |
116 | { | 116 | { |
117 | #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM | 117 | #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM |
118 | at32_map_usart(0, 1); /* USART 0/B: /dev/ttyS1, IRDA */ | 118 | at32_map_usart(0, 1, 0); /* USART 0/B: /dev/ttyS1, IRDA */ |
119 | #else | 119 | #else |
120 | at32_map_usart(1, 0); /* USART 1/A: /dev/ttyS0, DB9 */ | 120 | at32_map_usart(1, 0, 0); /* USART 1/A: /dev/ttyS0, DB9 */ |
121 | #endif | 121 | #endif |
122 | /* USART 2/unused: expansion connector */ | 122 | /* USART 2/unused: expansion connector */ |
123 | at32_map_usart(3, 2); /* USART 3/C: /dev/ttyS2, DB9 */ | 123 | at32_map_usart(3, 2, 0); /* USART 3/C: /dev/ttyS2, DB9 */ |
124 | 124 | ||
125 | at32_setup_serial_console(0); | 125 | at32_setup_serial_console(0); |
126 | } | 126 | } |
diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c index 29b35aca96cd..69a9f0f08c6e 100644 --- a/arch/avr32/boards/atstk1000/atstk1004.c +++ b/arch/avr32/boards/atstk1000/atstk1004.c | |||
@@ -120,12 +120,12 @@ static void __init atstk1004_setup_extdac(void) | |||
120 | void __init setup_board(void) | 120 | void __init setup_board(void) |
121 | { | 121 | { |
122 | #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM | 122 | #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM |
123 | at32_map_usart(0, 1); /* USART 0/B: /dev/ttyS1, IRDA */ | 123 | at32_map_usart(0, 1, 0); /* USART 0/B: /dev/ttyS1, IRDA */ |
124 | #else | 124 | #else |
125 | at32_map_usart(1, 0); /* USART 1/A: /dev/ttyS0, DB9 */ | 125 | at32_map_usart(1, 0, 0); /* USART 1/A: /dev/ttyS0, DB9 */ |
126 | #endif | 126 | #endif |
127 | /* USART 2/unused: expansion connector */ | 127 | /* USART 2/unused: expansion connector */ |
128 | at32_map_usart(3, 2); /* USART 3/C: /dev/ttyS2, DB9 */ | 128 | at32_map_usart(3, 2, 0); /* USART 3/C: /dev/ttyS2, DB9 */ |
129 | 129 | ||
130 | at32_setup_serial_console(0); | 130 | at32_setup_serial_console(0); |
131 | } | 131 | } |
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c index cf6e4e5624d0..46c9b0a224cf 100644 --- a/arch/avr32/boards/favr-32/setup.c +++ b/arch/avr32/boards/favr-32/setup.c | |||
@@ -250,7 +250,7 @@ static void __init favr32_setup_atmel_pwm_bl(void) | |||
250 | 250 | ||
251 | void __init setup_board(void) | 251 | void __init setup_board(void) |
252 | { | 252 | { |
253 | at32_map_usart(3, 0); /* USART 3 => /dev/ttyS0 */ | 253 | at32_map_usart(3, 0, 0); /* USART 3 => /dev/ttyS0 */ |
254 | at32_setup_serial_console(0); | 254 | at32_setup_serial_console(0); |
255 | } | 255 | } |
256 | 256 | ||
diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c index a5c2da25c4fe..dd009875a405 100644 --- a/arch/avr32/boards/hammerhead/setup.c +++ b/arch/avr32/boards/hammerhead/setup.c | |||
@@ -165,7 +165,7 @@ static void __init set_hw_addr(struct platform_device *pdev) | |||
165 | 165 | ||
166 | void __init setup_board(void) | 166 | void __init setup_board(void) |
167 | { | 167 | { |
168 | at32_map_usart(1, 0); /* USART 1: /dev/ttyS0, DB9 */ | 168 | at32_map_usart(1, 0, 0); /* USART 1: /dev/ttyS0, DB9 */ |
169 | at32_setup_serial_console(0); | 169 | at32_setup_serial_console(0); |
170 | } | 170 | } |
171 | 171 | ||
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c index 58acdb4fc9b3..20b300cf105a 100644 --- a/arch/avr32/boards/merisc/setup.c +++ b/arch/avr32/boards/merisc/setup.c | |||
@@ -231,9 +231,9 @@ static void detect_merisc_board_id(void) | |||
231 | 231 | ||
232 | void __init setup_board(void) | 232 | void __init setup_board(void) |
233 | { | 233 | { |
234 | at32_map_usart(0, 0); | 234 | at32_map_usart(0, 0, 0); |
235 | at32_map_usart(1, 1); | 235 | at32_map_usart(1, 1, 0); |
236 | at32_map_usart(3, 3); | 236 | at32_map_usart(3, 3, 0); |
237 | at32_setup_serial_console(1); | 237 | at32_setup_serial_console(1); |
238 | } | 238 | } |
239 | 239 | ||
@@ -248,7 +248,7 @@ static int __init merisc_init(void) | |||
248 | at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL | (1 << 26)); | 248 | at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL | (1 << 26)); |
249 | 249 | ||
250 | if (merisc_board_id >= 1) | 250 | if (merisc_board_id >= 1) |
251 | at32_map_usart(2, 2); | 251 | at32_map_usart(2, 2, 0); |
252 | 252 | ||
253 | at32_add_device_usart(0); | 253 | at32_add_device_usart(0); |
254 | at32_add_device_usart(1); | 254 | at32_add_device_usart(1); |
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c index 2b58d61f0afc..c1b2175b4fea 100644 --- a/arch/avr32/boards/mimc200/setup.c +++ b/arch/avr32/boards/mimc200/setup.c | |||
@@ -175,10 +175,10 @@ static void __init set_hw_addr(struct platform_device *pdev) | |||
175 | 175 | ||
176 | void __init setup_board(void) | 176 | void __init setup_board(void) |
177 | { | 177 | { |
178 | at32_map_usart(0, 0); /* USART 0: /dev/ttyS0 (TTL --> Altera) */ | 178 | at32_map_usart(0, 0, 0); /* USART 0: /dev/ttyS0 (TTL --> Altera) */ |
179 | at32_map_usart(1, 1); /* USART 1: /dev/ttyS1 (RS232) */ | 179 | at32_map_usart(1, 1, 0); /* USART 1: /dev/ttyS1 (RS232) */ |
180 | at32_map_usart(2, 2); /* USART 2: /dev/ttyS2 (RS485) */ | 180 | at32_map_usart(2, 2, 0); /* USART 2: /dev/ttyS2 (RS485) */ |
181 | at32_map_usart(3, 3); /* USART 3: /dev/ttyS3 (RS422 Multidrop) */ | 181 | at32_map_usart(3, 3, 0); /* USART 3: /dev/ttyS3 (RS422 Multidrop) */ |
182 | } | 182 | } |
183 | 183 | ||
184 | static struct i2c_gpio_platform_data i2c_gpio_data = { | 184 | static struct i2c_gpio_platform_data i2c_gpio_data = { |