From owner-svn-src-head@freebsd.org  Fri Aug 28 10:34:38 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 825899C20D4;
 Fri, 28 Aug 2015 10:34:38 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 737BFE90;
 Fri, 28 Aug 2015 10:34:38 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7SAYcam014197;
 Fri, 28 Aug 2015 10:34:38 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7SAYcNG014196;
 Fri, 28 Aug 2015 10:34:38 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201508281034.t7SAYcNG014196@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Fri, 28 Aug 2015 10:34:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287250 - head/sys/dev/mmc/host
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Aug 2015 10:34:38 -0000

Author: andrew
Date: Fri Aug 28 10:34:37 2015
New Revision: 287250
URL: https://svnweb.freebsd.org/changeset/base/287250

Log:
  Only check for the bus frequency if it has not already been set, for
  example through a driver running as a subclass of this.
  
  Sponsored by:	ABT Systems Ltd

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

Modified: head/sys/dev/mmc/host/dwmmc.c
==============================================================================
--- head/sys/dev/mmc/host/dwmmc.c	Fri Aug 28 09:38:18 2015	(r287249)
+++ head/sys/dev/mmc/host/dwmmc.c	Fri Aug 28 10:34:37 2015	(r287250)
@@ -481,10 +481,12 @@ parse_fdt(struct dwmmc_softc *sc)
 	 * what the clock is supplied for our device.
 	 * For now rely on the value specified in FDT.
 	 */
-	if ((len = OF_getproplen(node, "bus-frequency")) <= 0)
-		return (ENXIO);
-	OF_getencprop(node, "bus-frequency", dts_value, len);
-	sc->bus_hz = dts_value[0];
+	if (sc->bus_hz == 0) {
+		if ((len = OF_getproplen(node, "bus-frequency")) <= 0)
+			return (ENXIO);
+		OF_getencprop(node, "bus-frequency", dts_value, len);
+		sc->bus_hz = dts_value[0];
+	}
 
 	/*
 	 * Platform-specific stuff