summaryrefslogtreecommitdiffstats
path: root/sys/arm/at91
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2014-05-16 02:21:51 +0000
committerian <ian@FreeBSD.org>2014-05-16 02:21:51 +0000
commit979d09322879c661433d370b8f8f44881d70ea2f (patch)
tree7d5e707d239991534fc6644bdee36afac3a7d110 /sys/arm/at91
parent8e2dd9b5e30117e2cab1d46c1cc0c2dfb4b7647e (diff)
downloadFreeBSD-src-979d09322879c661433d370b8f8f44881d70ea2f.zip
FreeBSD-src-979d09322879c661433d370b8f8f44881d70ea2f.tar.gz
MFC r262534, r262548, r262549, r262552, r262568, r262581, r262583, r262584,
r262585, r262587, r262696, r262712 Replace many pasted identical definitions of cpu_initclocks() with a common implementation in arm/machdep.c. aicasm: Don't complain about missing prototypes to ease bootstrap issues. Vybrid: Add driver for Inter-Integrated Circuit (I2C). imx6: Initialize the Low Power Mode bits to keep the ARM cores running during WFI. All our current ARM multi-core systems have all cores in one package with a shared L2 cache, reflect that in the common cpu_topo() routine. mpcore timer: Supply a DELAY() implementation via weak linkage, so that SoC-specific code can supply a better implementation. imx6: Add some rudimentary voltage control. Add an armv7 implementation of cpu_sleep(). Add __used attribute so that the DELAY implementation doesn't get optimized away as unreferenced, causing linker errors when trying to resolve the weak reference to the missing function.
Diffstat (limited to 'sys/arm/at91')
-rw-r--r--sys/arm/at91/uart_dev_at91usart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/arm/at91/uart_dev_at91usart.c b/sys/arm/at91/uart_dev_at91usart.c
index 3f02a4e..049fff5 100644
--- a/sys/arm/at91/uart_dev_at91usart.c
+++ b/sys/arm/at91/uart_dev_at91usart.c
@@ -279,7 +279,7 @@ at91_usart_init(struct uart_bas *bas, int baudrate, int databits, int stopbits,
* we don't want to hang here forever if the hardware is in a bad state.
*/
if (!(RD4(bas, USART_CSR) & USART_CSR_TXRDY))
- DELAY(1000);
+ DELAY(10000);
at91_usart_param(bas, baudrate, databits, stopbits, parity);
OpenPOWER on IntegriCloud