From 77a8d36b902f4f83add3332b6058997dd37fa403 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Sun, 12 Feb 2012 00:35:05 +0800 Subject: [PATCH] at91: at91_register_uart return device this will allow to set the active parameter from C Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- arch/arm/mach-at91/at91rm9200_devices.c | 6 +++--- arch/arm/mach-at91/at91sam9260_devices.c | 6 +++--- arch/arm/mach-at91/at91sam9261_devices.c | 6 +++--- arch/arm/mach-at91/at91sam9263_devices.c | 6 +++--- arch/arm/mach-at91/at91sam9g45_devices.c | 6 +++--- arch/arm/mach-at91/include/mach/board.h | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index 599eb79ee..bda73e604 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -265,7 +265,7 @@ static inline void configure_usart3_pins(unsigned pins) at91_set_B_periph(AT91_PIN_PB0, 0); /* RTS3 */ } -void __init at91_register_uart(unsigned id, unsigned pins) +struct device_d * __init at91_register_uart(unsigned id, unsigned pins) { resource_size_t start; @@ -296,9 +296,9 @@ void __init at91_register_uart(unsigned id, unsigned pins) id = 4; break; default: - return; + return NULL; } - add_generic_device("atmel_usart", id, NULL, start, 4096, + return add_generic_device("atmel_usart", id, NULL, start, 4096, IORESOURCE_MEM, NULL); } diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 3ddd0cfd9..3bdcd4f40 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -282,7 +282,7 @@ static inline void configure_usart5_pins(void) at91_set_A_periph(AT91_PIN_PB13, 0); /* RXD5 */ } -void at91_register_uart(unsigned id, unsigned pins) +struct device_d * __init at91_register_uart(unsigned id, unsigned pins) { resource_size_t start; @@ -323,10 +323,10 @@ void at91_register_uart(unsigned id, unsigned pins) id = 6; break; default: - return; + return NULL; } - add_generic_device("atmel_usart", id, NULL, start, 4096, + return add_generic_device("atmel_usart", id, NULL, start, 4096, IORESOURCE_MEM, NULL); } diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 7805c27b0..d4f7b5eff 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -203,7 +203,7 @@ static inline void configure_usart2_pins(unsigned pins) at91_set_B_periph(AT91_PIN_PA16, 0); /* CTS2 */ } -void at91_register_uart(unsigned id, unsigned pins) +struct device_d * __init at91_register_uart(unsigned id, unsigned pins) { resource_size_t start; @@ -229,10 +229,10 @@ void at91_register_uart(unsigned id, unsigned pins) id = 3; break; default: - return; + return NULL; } - add_generic_device("atmel_usart", id, NULL, start, 4096, + return add_generic_device("atmel_usart", id, NULL, start, 4096, IORESOURCE_MEM, NULL); } diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index fc7dc1432..87a1726d3 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c @@ -253,7 +253,7 @@ static inline void configure_usart2_pins(unsigned pins) at91_set_B_periph(AT91_PIN_PD6, 0); /* CTS2 */ } -void at91_register_uart(unsigned id, unsigned pins) +struct device_d * __init at91_register_uart(unsigned id, unsigned pins) { resource_size_t start; @@ -279,10 +279,10 @@ void at91_register_uart(unsigned id, unsigned pins) id = 3; break; default: - return; + return NULL; } - add_generic_device("atmel_usart", id, NULL, start, 4096, + return add_generic_device("atmel_usart", id, NULL, start, 4096, IORESOURCE_MEM, NULL); } diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index bb252bdd4..6931a3f65 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -182,7 +182,7 @@ static inline void configure_usart3_pins(unsigned pins) at91_set_B_periph(AT91_PIN_PA24, 0); /* CTS3 */ } -void at91_register_uart(unsigned id, unsigned pins) +struct device_d * __init at91_register_uart(unsigned id, unsigned pins) { resource_size_t start; @@ -213,10 +213,10 @@ void at91_register_uart(unsigned id, unsigned pins) id = 4; break; default: - return; + return NULL; } - add_generic_device("atmel_usart", id, NULL, start, 4096, + return add_generic_device("atmel_usart", id, NULL, start, 4096, IORESOURCE_MEM, NULL); } diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h index 755ddc886..9f1abc134 100644 --- a/arch/arm/mach-at91/include/mach/board.h +++ b/arch/arm/mach-at91/include/mach/board.h @@ -83,7 +83,7 @@ void at91_add_device_sdram(u32 size); #define ATMEL_UART_DCD 0x10 #define ATMEL_UART_RI 0x20 -void at91_register_uart(unsigned id, unsigned pins); +struct device_d * __init at91_register_uart(unsigned id, unsigned pins); /* Multimedia Card Interface */ struct atmel_mci_platform_data {