summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91sam9260_devices.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-02-12 00:35:05 +0800
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-02-16 18:17:34 +0800
commit77a8d36b902f4f83add3332b6058997dd37fa403 (patch)
tree49f0c7e8e8fa9d8d2d13b8d326f6be19871139ab /arch/arm/mach-at91/at91sam9260_devices.c
parent1f22d10f1570ccf83a842886ff016e9781dfed3e (diff)
downloadbarebox-77a8d36b902f4f83add3332b6058997dd37fa403.tar.gz
barebox-77a8d36b902f4f83add3332b6058997dd37fa403.tar.xz
at91: at91_register_uart return device
this will allow to set the active parameter from C Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9260_devices.c')
-rw-r--r--arch/arm/mach-at91/at91sam9260_devices.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index 3ddd0cfd90..3bdcd4f408 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);
}