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

Commit 71b149b3 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre
Browse files

ARM: at91: do not pin mux the UARTs in init_early 



There is no need to pinmux the UART so early in the kernel.
Move it to the board init.

This will also allow to finally move the gpio driver to platform device/driver.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent a27fa581

arch/arm/mach-at91/board-1arm.c

+10 −11
Original line number Diff line number Diff line
@@ -47,17 +47,6 @@ static void __init onearm_init_early(void) 


	/* Initialize processor: 18.432 MHz crystal */

	at91_initialize(18432000);



	/* DBGU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);



	/* USART0 on ttyS1 (Rx, Tx, CTS, RTS) */

	at91_register_uart(AT91RM9200_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS);



	/* USART1 on ttyS2 (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */

	at91_register_uart(AT91RM9200_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS

			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD

			   | ATMEL_UART_RI);

}



static struct macb_platform_data __initdata onearm_eth_data = {
@@ -79,6 +68,16 @@ static struct at91_udc_data __initdata onearm_udc_data = { 
static void __init onearm_board_init(void)

{

	/* Serial */

	/* DBGU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);



	/* USART0 on ttyS1 (Rx, Tx, CTS, RTS) */

	at91_register_uart(AT91RM9200_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS);



	/* USART1 on ttyS2 (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */

	at91_register_uart(AT91RM9200_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS

			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD

			   | ATMEL_UART_RI);

	at91_add_device_serial();

	/* Ethernet */

	at91_add_device_eth(&onearm_eth_data);

arch/arm/mach-at91/board-afeb-9260v1.c

+12 −13
Original line number Diff line number Diff line
@@ -52,19 +52,6 @@ static void __init afeb9260_init_early(void) 
{

	/* Initialize processor: 18.432 MHz crystal */

	at91_initialize(18432000);



	/* DBGU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);



	/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */

	at91_register_uart(AT91SAM9260_ID_US0, 1,

			     ATMEL_UART_CTS | ATMEL_UART_RTS

			   | ATMEL_UART_DTR | ATMEL_UART_DSR

			   | ATMEL_UART_DCD | ATMEL_UART_RI);



	/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */

	at91_register_uart(AT91SAM9260_ID_US1, 2,

			ATMEL_UART_CTS | ATMEL_UART_RTS);

}



/*
@@ -180,6 +167,18 @@ static struct at91_cf_data afeb9260_cf_data = { 
static void __init afeb9260_board_init(void)

{

	/* Serial */

	/* DBGU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);



	/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */

	at91_register_uart(AT91SAM9260_ID_US0, 1,

			     ATMEL_UART_CTS | ATMEL_UART_RTS

			   | ATMEL_UART_DTR | ATMEL_UART_DSR

			   | ATMEL_UART_DCD | ATMEL_UART_RI);



	/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */

	at91_register_uart(AT91SAM9260_ID_US1, 2,

			ATMEL_UART_CTS | ATMEL_UART_RTS);

	at91_add_device_serial();

	/* USB Host */

	at91_add_device_usbh(&afeb9260_usbh_data);

arch/arm/mach-at91/board-cam60.c

+2 −3
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ static void __init cam60_init_early(void) 
{

	/* Initialize processor: 10 MHz crystal */

	at91_initialize(10000000);



	/* DBGU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);

}



/*
@@ -172,6 +169,8 @@ static void __init cam60_add_device_nand(void) 
static void __init cam60_board_init(void)

{

	/* Serial */

	/* DBGU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);

	at91_add_device_serial();

	/* SPI */

	at91_add_device_spi(cam60_spi_devices, ARRAY_SIZE(cam60_spi_devices));

arch/arm/mach-at91/board-carmeva.c

+7 −8
Original line number Diff line number Diff line
@@ -44,14 +44,6 @@ static void __init carmeva_init_early(void) 
{

	/* Initialize processor: 20.000 MHz crystal */

	at91_initialize(20000000);



	/* DBGU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);



	/* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */

	at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS

			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD

			   | ATMEL_UART_RI);

}



static struct macb_platform_data __initdata carmeva_eth_data = {
@@ -136,6 +128,13 @@ static struct gpio_led carmeva_leds[] = { 
static void __init carmeva_board_init(void)

{

	/* Serial */

	/* DBGU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);



	/* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */

	at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS

			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD

			   | ATMEL_UART_RI);

	at91_add_device_serial();

	/* Ethernet */

	at91_add_device_eth(&carmeva_eth_data);

arch/arm/mach-at91/board-cpu9krea.c

+24 −25
Original line number Diff line number Diff line
@@ -52,31 +52,6 @@ static void __init cpu9krea_init_early(void) 
{

	/* Initialize processor: 18.432 MHz crystal */

	at91_initialize(18432000);



	/* DGBU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);



	/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */

	at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS |

		ATMEL_UART_RTS | ATMEL_UART_DTR | ATMEL_UART_DSR |

		ATMEL_UART_DCD | ATMEL_UART_RI);



	/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */

	at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS |

		ATMEL_UART_RTS);



	/* USART2 on ttyS3. (Rx, Tx, RTS, CTS) */

	at91_register_uart(AT91SAM9260_ID_US2, 3, ATMEL_UART_CTS |

		ATMEL_UART_RTS);



	/* USART3 on ttyS4. (Rx, Tx) */

	at91_register_uart(AT91SAM9260_ID_US3, 4, 0);



	/* USART4 on ttyS5. (Rx, Tx) */

	at91_register_uart(AT91SAM9260_ID_US4, 5, 0);



	/* USART5 on ttyS6. (Rx, Tx) */

	at91_register_uart(AT91SAM9260_ID_US5, 6, 0);

}



/*
@@ -349,6 +324,30 @@ static void __init cpu9krea_board_init(void) 
	/* NOR */

	cpu9krea_add_device_nor();

	/* Serial */

	/* DGBU on ttyS0. (Rx & Tx only) */

	at91_register_uart(0, 0, 0);



	/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */

	at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS |

		ATMEL_UART_RTS | ATMEL_UART_DTR | ATMEL_UART_DSR |

		ATMEL_UART_DCD | ATMEL_UART_RI);



	/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */

	at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS |

		ATMEL_UART_RTS);



	/* USART2 on ttyS3. (Rx, Tx, RTS, CTS) */

	at91_register_uart(AT91SAM9260_ID_US2, 3, ATMEL_UART_CTS |

		ATMEL_UART_RTS);



	/* USART3 on ttyS4. (Rx, Tx) */

	at91_register_uart(AT91SAM9260_ID_US3, 4, 0);



	/* USART4 on ttyS5. (Rx, Tx) */

	at91_register_uart(AT91SAM9260_ID_US4, 5, 0);



	/* USART5 on ttyS6. (Rx, Tx) */

	at91_register_uart(AT91SAM9260_ID_US5, 6, 0);

	at91_add_device_serial();

	/* USB Host */

	at91_add_device_usbh(&cpu9krea_usbh_data);