arm/128959: [patch] Fix broken code for AT91.

[Björn König]

>Number:         128959
>Category:       arm
>Synopsis:       [patch] Fix broken code for AT91.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-arm
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 18 11:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Björn König
>Release:        
>Organization:
>Environment:
>Description:
	The AT91 code is broken, i.e. it doesn't build because of minor bugs.

>How-To-Repeat:
>Fix:

--- src-sys-arm-at91.diff begins here ---
diff --git a/src/sys/arm/at91/at91_mci.c b/src/sys/arm/at91/at91_mci.c
index 1e8b4a4..678cb14 100644
--- a/src/sys/arm/at91/at91_mci.c
+++ b/src/sys/arm/at91/at91_mci.c
@@ -176,7 +176,7 @@ at91_mci_attach(device_t dev)
 	 * Allocate DMA tags and maps
 	 */
 	err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0,
-	    BUS_SPACE_MAXADDR_32BIT, US_SPACE_MAXADDR, NULL, NULL, MAXPHYS, 1,
+	    BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MAXPHYS, 1,
 	    MAXPHYS, BUS_DMA_ALLOCNOW, NULL, NULL, &sc->dmatag);
 	if (err != 0)
 		goto out;
diff --git a/src/sys/arm/at91/uart_dev_at91usart.c b/src/sys/arm/at91/uart_dev_at91usart.c
index 9c598a4..d5d13c6 100644
--- a/src/sys/arm/at91/uart_dev_at91usart.c
+++ b/src/sys/arm/at91/uart_dev_at91usart.c
@@ -350,7 +350,7 @@ at91_usart_bus_attach(struct uart_softc *sc)
 	/*
 	 * Allocate DMA tags and maps
 	 */
-	err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0,
+	err = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0,
 	    BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
 	    USART_BUFFER_SIZE, 1, USART_BUFFER_SIZE, BUS_DMA_ALLOCNOW, NULL,
 	    NULL, &atsc->dmatag);
--- src-sys-arm-at91.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: