From owner-svn-src-head@FreeBSD.ORG  Fri Nov 30 02:32:38 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AA5DED0D;
 Fri, 30 Nov 2012 02:32:38 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 717AE8FC08;
 Fri, 30 Nov 2012 02:32:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAU2WcAb099570;
 Fri, 30 Nov 2012 02:32:38 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAU2WcTA099569;
 Fri, 30 Nov 2012 02:32:38 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201211300232.qAU2WcTA099569@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Fri, 30 Nov 2012 02:32:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243688 - head/sys/arm/broadcom/bcm2835
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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Nov 2012 02:32:38 -0000

Author: gonzo
Date: Fri Nov 30 02:32:37 2012
New Revision: 243688
URL: http://svnweb.freebsd.org/changeset/base/243688

Log:
  Get frequency from "clock-frequency" property of "/axi/sdhci" FDT node

Modified:
  head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c	Fri Nov 30 02:31:08 2012	(r243687)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c	Fri Nov 30 02:32:37 2012	(r243688)
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/intr.h>
 
+#include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
@@ -66,6 +67,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/sdhci/sdhci.h>
 #include "sdhci_if.h"
 
+#define	BCM2835_DEFAULT_SDHCI_FREQ	50
+
 #define	DEBUG
 
 #ifdef DEBUG
@@ -129,10 +132,20 @@ bcm_sdhci_attach(device_t dev)
 {
 	struct bcm_sdhci_softc *sc = device_get_softc(dev);
 	int rid, err;
+	phandle_t node;
+	pcell_t cell;
+	int default_freq;
 
 	sc->sc_dev = dev;
 	sc->sc_req = NULL;
 
+	default_freq = BCM2835_DEFAULT_SDHCI_FREQ;
+	node = ofw_bus_get_node(sc->sc_dev);
+	if ((OF_getprop(node, "clock-frequency", &cell, sizeof(cell))) > 0)
+		default_freq = (int)fdt32_to_cpu(cell)/1000000;
+
+	dprintf("SDHCI frequency: %dMHz\n", default_freq);
+
 	mtx_init(&sc->sc_mtx, "bcm sdhci", "sdhci", MTX_DEF);
 
 	rid = 0;
@@ -168,7 +181,7 @@ bcm_sdhci_attach(device_t dev)
 	}
 
 	sc->sc_slot.caps = SDHCI_CAN_VDD_330 | SDHCI_CAN_VDD_180 | SDHCI_CAN_DO_HISPD;
-	sc->sc_slot.caps |= (50 << SDHCI_CLOCK_BASE_SHIFT);
+	sc->sc_slot.caps |= (default_freq << SDHCI_CLOCK_BASE_SHIFT);
 	sc->sc_slot.quirks = SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK 
 		| SDHCI_QUIRK_BROKEN_TIMEOUT_VAL
 		| SDHCI_QUIRK_MISSING_CAPS;