Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf4861cf authored by Peter Ma's avatar Peter Ma Committed by Haavard Skinnemoen
Browse files

avr32: add RTS/CTS/CLK pin selection for the USARTs 



Adds extra parameter to AT32 at32_map_usart(), so as to reserve
RTS/CTS/CLK pins.

All boards under arch/avr32/boards have been updated (trivial change), but
not all have been tested.

Signed-off-by: default avatarPeter Ma <pma@mediamatech.com>
Signed-off-by: default avatarHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
parent a6b6b5ff

arch/avr32/boards/atngw100/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void __init set_hw_addr(struct platform_device *pdev) 


void __init setup_board(void)

{

	at32_map_usart(1, 0);	/* USART 1: /dev/ttyS0, DB9 */

	at32_map_usart(1, 0, 0);	/* USART 1: /dev/ttyS0, DB9 */

	at32_setup_serial_console(0);

}

arch/avr32/boards/atstk1000/atstk1002.c

+3 −3
Original line number Diff line number Diff line
@@ -252,12 +252,12 @@ static void __init atstk1002_setup_extdac(void) 
void __init setup_board(void)

{

#ifdef	CONFIG_BOARD_ATSTK100X_SW2_CUSTOM

	at32_map_usart(0, 1);	/* USART 0/B: /dev/ttyS1, IRDA */

	at32_map_usart(0, 1, 0);	/* USART 0/B: /dev/ttyS1, IRDA */

#else

	at32_map_usart(1, 0);	/* USART 1/A: /dev/ttyS0, DB9 */

	at32_map_usart(1, 0, 0);	/* USART 1/A: /dev/ttyS0, DB9 */

#endif

	/* USART 2/unused: expansion connector */

	at32_map_usart(3, 2);	/* USART 3/C: /dev/ttyS2, DB9 */

	at32_map_usart(3, 2, 0);	/* USART 3/C: /dev/ttyS2, DB9 */



	at32_setup_serial_console(0);

}

arch/avr32/boards/atstk1000/atstk1003.c

+3 −3
Original line number Diff line number Diff line
@@ -115,12 +115,12 @@ static void __init atstk1003_setup_extdac(void) 
void __init setup_board(void)

{

#ifdef	CONFIG_BOARD_ATSTK100X_SW2_CUSTOM

	at32_map_usart(0, 1);	/* USART 0/B: /dev/ttyS1, IRDA */

	at32_map_usart(0, 1, 0);	/* USART 0/B: /dev/ttyS1, IRDA */

#else

	at32_map_usart(1, 0);	/* USART 1/A: /dev/ttyS0, DB9 */

	at32_map_usart(1, 0, 0);	/* USART 1/A: /dev/ttyS0, DB9 */

#endif

	/* USART 2/unused: expansion connector */

	at32_map_usart(3, 2);	/* USART 3/C: /dev/ttyS2, DB9 */

	at32_map_usart(3, 2, 0);	/* USART 3/C: /dev/ttyS2, DB9 */



	at32_setup_serial_console(0);

}

arch/avr32/boards/atstk1000/atstk1004.c

+3 −3
Original line number Diff line number Diff line
@@ -120,12 +120,12 @@ static void __init atstk1004_setup_extdac(void) 
void __init setup_board(void)

{

#ifdef	CONFIG_BOARD_ATSTK100X_SW2_CUSTOM

	at32_map_usart(0, 1);	/* USART 0/B: /dev/ttyS1, IRDA */

	at32_map_usart(0, 1, 0);	/* USART 0/B: /dev/ttyS1, IRDA */

#else

	at32_map_usart(1, 0);	/* USART 1/A: /dev/ttyS0, DB9 */

	at32_map_usart(1, 0, 0);	/* USART 1/A: /dev/ttyS0, DB9 */

#endif

	/* USART 2/unused: expansion connector */

	at32_map_usart(3, 2);	/* USART 3/C: /dev/ttyS2, DB9 */

	at32_map_usart(3, 2, 0);	/* USART 3/C: /dev/ttyS2, DB9 */



	at32_setup_serial_console(0);

}

arch/avr32/boards/favr-32/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static void __init favr32_setup_atmel_pwm_bl(void) 


void __init setup_board(void)

{

	at32_map_usart(3, 0);	/* USART 3 => /dev/ttyS0 */

	at32_map_usart(3, 0, 0);	/* USART 3 => /dev/ttyS0 */

	at32_setup_serial_console(0);

}