From owner-p4-projects@FreeBSD.ORG  Wed Oct  4 01:28:59 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E242D16A416; Wed,  4 Oct 2006 01:28:58 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BB51316A403
	for <perforce@freebsd.org>; Wed,  4 Oct 2006 01:28:58 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8A60C43D4C
	for <perforce@freebsd.org>; Wed,  4 Oct 2006 01:28:58 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k941SwKI069225
	for <perforce@freebsd.org>; Wed, 4 Oct 2006 01:28:58 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k941SwcW069222
	for perforce@freebsd.org; Wed, 4 Oct 2006 01:28:58 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 4 Oct 2006 01:28:58 GMT
Message-Id: <200610040128.k941SwcW069222@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 107233 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Oct 2006 01:28:59 -0000

http://perforce.freebsd.org/chv.cgi?CH=107233

Change 107233 by imp@imp_lighthouse on 2006/10/04 01:28:10

	Be chatty about setting bus width, for the moment
	max freq 30MHz (doubles freq)

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#22 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#22 (text+ko) ====

@@ -195,7 +195,7 @@
 		goto out;
 	}
 	sc->host.f_min = 375000;
-	sc->host.f_max = 25000000;
+	sc->host.f_max = 30000000;
 	sc->host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340;
 	sc->host.caps = MMC_CAP_4_BIT_DATA;
 	child = device_add_child(dev, "mmc", 0);
@@ -290,10 +290,13 @@
 		else
 			clkdiv = (at91_master_clock / ios->clock) / 2;
 	}
-	if (ios->bus_width == bus_width_4 && sc->wire4)
+	if (ios->bus_width == bus_width_4 && sc->wire4) {
+		device_printf(sc->dev, "Setting controller bus width to 4\n");
 		WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) | MCI_SDCR_SDCBUS);
-	else
+	} else {
+		device_printf(sc->dev, "Setting controller bus width to 1\n");
 		WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS);
+	}
 	WR4(sc, MCI_MR, (RD4(sc, MCI_MR) & ~MCI_MR_CLKDIV) | clkdiv);
 #if 0
 	if (sc->vcc_pin) {