diff options
| author | cognet <cognet@FreeBSD.org> | 2010-10-06 22:25:21 +0000 |
|---|---|---|
| committer | cognet <cognet@FreeBSD.org> | 2010-10-06 22:25:21 +0000 |
| commit | 2edabad8a47c024ddbf097f91202a71b88cff6fc (patch) | |
| tree | c231f180320438f262879021e2e02bbace0911b3 /sys/arm/at91/uart_cpu_at91rm9200usart.c | |
| parent | 87987160d6251c2bc94a904a9995d519ac8df5fd (diff) | |
| download | FreeBSD-src-2edabad8a47c024ddbf097f91202a71b88cff6fc.zip FreeBSD-src-2edabad8a47c024ddbf097f91202a71b88cff6fc.tar.gz | |
if_ate.c:
* Support for sam9 "EMAC" controller.
* Support for rmii interface to phy.
at91.c & at91sam9.c:
* Eliminate separate at91sam9.c file.
* Add new devices to at91sam9_devs table.
at91_machdep.c & at at91sam9_machdep.c:
* Automatic chip type determination.
* Remove compile time chip dependencies.
* Eliminate separate at91sam9_machdep.c file.
at91_pmc.c:
* Corrected support for all of the sam926? and sam9g20 chips.
* Remove compile time chip dependencies.
My apologies to Greg for taking so long to take care of it.
Diffstat (limited to 'sys/arm/at91/uart_cpu_at91rm9200usart.c')
| -rw-r--r-- | sys/arm/at91/uart_cpu_at91rm9200usart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arm/at91/uart_cpu_at91rm9200usart.c b/sys/arm/at91/uart_cpu_at91rm9200usart.c index d290c28..9e9baa2 100644 --- a/sys/arm/at91/uart_cpu_at91rm9200usart.c +++ b/sys/arm/at91/uart_cpu_at91rm9200usart.c @@ -64,7 +64,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) struct uart_class *class; class = &at91_usart_class; - if (class->uc_rclk == 0) + if (class->uc_rclk == 0 && at91_master_clock != 0) class->uc_rclk = at91_master_clock; di->ops = uart_getops(class); di->bas.chan = 0; @@ -77,7 +77,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) di->bas.bsh = AT91RM92_BASE + AT91RM92_USART0_BASE; di->baudrate = 38400; #else - di->bas.bsh = AT91RM92_BASE + AT91RM92_SYS_BASE + DBGU; + di->bas.bsh = AT91RM92_BASE + AT91RM92_DBGU_BASE; di->baudrate = 115200; #endif di->bas.regshft = 0; |
