From bkoenig@alpha-tierchen.de  Tue Nov 18 11:26:41 2008
Return-Path: <bkoenig@alpha-tierchen.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 91280106567A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Nov 2008 11:26:41 +0000 (UTC)
	(envelope-from bkoenig@alpha-tierchen.de)
Received: from mail.liberty-hosting.de (mail.smartterra.de [195.225.132.203])
	by mx1.freebsd.org (Postfix) with ESMTP id 56CE48FC1E
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Nov 2008 11:26:41 +0000 (UTC)
	(envelope-from bkoenig@alpha-tierchen.de)
Received: from home.alpha-tierchen.de (port-87-234-81-35.dynamic.qsc.de [87.234.81.35])
	by mail.liberty-hosting.de (Postfix) with ESMTP id 955943E8F46
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Nov 2008 12:20:18 +0100 (CET)
Received: by home.alpha-tierchen.de (Postfix, from userid 2000)
	id 6724128A19; Tue, 18 Nov 2008 12:26:36 +0100 (CET)
Message-Id: <20081118112636.6724128A19@home.alpha-tierchen.de>
Date: Tue, 18 Nov 2008 12:26:36 +0100 (CET)
From: Bjrn Knig <bkoenig@alpha-tierchen.de>
Reply-To: Bjrn Knig <bkoenig@alpha-tierchen.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] Fix broken code for AT91.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         128959
>Category:       arm
>Synopsis:       [patch] Fix broken code for AT91.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    stas
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 18 11:30:01 UTC 2008
>Closed-Date:    Tue Nov 18 12:48:31 UTC 2008
>Last-Modified:  Tue Nov 18 12:48:31 UTC 2008
>Originator:     Bjrn Knig
>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:
Responsible-Changed-From-To: freebsd-arm->stas 
Responsible-Changed-By: stas 
Responsible-Changed-When: Tue Nov 18 12:30:29 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128959 
State-Changed-From-To: open->closed 
State-Changed-By: stas 
State-Changed-When: Tue Nov 18 12:48:30 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128959 
>Unformatted:
