From owner-svn-src-head@freebsd.org  Thu May 26 06:37:34 2016
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 D57F4B4A2AF;
 Thu, 26 May 2016 06:37:34 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 A6D2E1A14;
 Thu, 26 May 2016 06:37:34 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4Q6bXkO098141;
 Thu, 26 May 2016 06:37:33 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4Q6bXH1098140;
 Thu, 26 May 2016 06:37:33 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201605260637.u4Q6bXH1098140@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 26 May 2016 06:37:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300712 - head/sys/dev/spibus
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.22
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: Thu, 26 May 2016 06:37:34 -0000

Author: adrian
Date: Thu May 26 06:37:33 2016
New Revision: 300712
URL: https://svnweb.freebsd.org/changeset/base/300712

Log:
  [spibus] implement maximum clock frequency lookup from ofw.
  
  Obtained from:	loos

Modified:
  head/sys/dev/spibus/ofw_spibus.c

Modified: head/sys/dev/spibus/ofw_spibus.c
==============================================================================
--- head/sys/dev/spibus/ofw_spibus.c	Thu May 26 06:36:58 2016	(r300711)
+++ head/sys/dev/spibus/ofw_spibus.c	Thu May 26 06:37:33 2016	(r300712)
@@ -78,7 +78,7 @@ ofw_spibus_attach(device_t dev)
 	struct spibus_softc *sc = device_get_softc(dev);
 	struct ofw_spibus_devinfo *dinfo;
 	phandle_t child;
-	pcell_t paddr;
+	pcell_t clock, paddr;
 	device_t childdev;
 
 	sc->dev = dev;
@@ -103,6 +103,14 @@ ofw_spibus_attach(device_t dev)
 		}
 
 		/*
+		 * Get the maximum clock frequency for device, zero means
+		 * use the default bus speed.
+		 */
+		if (OF_getencprop(child, "spi-max-frequency", &clock,
+		    sizeof(clock)) == -1)
+			clock = 0;
+
+		/*
 		 * Now set up the SPI and OFW bus layer devinfo and add it
 		 * to the bus.
 		 */
@@ -111,6 +119,7 @@ ofw_spibus_attach(device_t dev)
 		if (dinfo == NULL)
 			continue;
 		dinfo->opd_dinfo.cs = paddr;
+		dinfo->opd_dinfo.clock = clock;
 		if (ofw_bus_gen_setup_devinfo(&dinfo->opd_obdinfo, child) !=
 		    0) {
 			free(dinfo, M_DEVBUF);