From owner-svn-src-all@FreeBSD.ORG  Wed Jan 21 17:49:24 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 53C42106566B;
	Wed, 21 Jan 2009 17:49:24 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 429498FC20;
	Wed, 21 Jan 2009 17:49:24 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LHnOZg085522;
	Wed, 21 Jan 2009 17:49:24 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0LHnOTm085521;
	Wed, 21 Jan 2009 17:49:24 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200901211749.n0LHnOTm085521@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 21 Jan 2009 17:49:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187551 - head/sys/dev/mmc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2009 17:49:24 -0000

Author: imp
Date: Wed Jan 21 17:49:23 2009
New Revision: 187551
URL: http://svn.freebsd.org/changeset/base/187551

Log:
  Default to normal bus timing mode on SD cards.  In practice, most
  cards people have today support high speed mode, so the timing field
  would be initialized to bus_timing_hs, but there are some slow
  cards...

Modified:
  head/sys/dev/mmc/mmc.c

Modified: head/sys/dev/mmc/mmc.c
==============================================================================
--- head/sys/dev/mmc/mmc.c	Wed Jan 21 17:42:57 2009	(r187550)
+++ head/sys/dev/mmc/mmc.c	Wed Jan 21 17:49:23 2009	(r187551)
@@ -1118,6 +1118,7 @@ mmc_discover_cards(struct mmc_softc *sc)
 			mmc_app_send_scr(sc, ivar->rca, ivar->raw_scr);
 			mmc_app_decode_scr(ivar->raw_scr, &ivar->scr);
 			/* Get card switch capabilities. */
+			ivar->timing = bus_timing_normal;
 			if ((ivar->scr.sda_vsn >= 1) &&
 			    (ivar->csd.ccc & (1<<10))) {
 				mmc_sd_switch(sc, 0, 0, 0xF, switch_res);