From owner-svn-src-all@freebsd.org  Fri Apr 15 01:45:06 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 B86DBAECA59;
 Fri, 15 Apr 2016 01:45:06 +0000 (UTC)
 (envelope-from jhibbits@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 618A01078;
 Fri, 15 Apr 2016 01:45:06 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3F1j5bN022824;
 Fri, 15 Apr 2016 01:45:05 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3F1j5xm022823;
 Fri, 15 Apr 2016 01:45:05 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201604150145.u3F1j5xm022823@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Fri, 15 Apr 2016 01:45:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298020 - head/sys/dev/fdt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Apr 2016 01:45:06 -0000

Author: jhibbits
Date: Fri Apr 15 01:45:05 2016
New Revision: 298020
URL: https://svnweb.freebsd.org/changeset/base/298020

Log:
  Add fman and dpaa fixups for powerpc fdt
  
  Obtained from:	Semihalf

Modified:
  head/sys/dev/fdt/fdt_powerpc.c

Modified: head/sys/dev/fdt/fdt_powerpc.c
==============================================================================
--- head/sys/dev/fdt/fdt_powerpc.c	Fri Apr 15 01:20:14 2016	(r298019)
+++ head/sys/dev/fdt/fdt_powerpc.c	Fri Apr 15 01:45:05 2016	(r298020)
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 #include "fdt_common.h"
 
 static void
-fdt_fixup_busfreq(phandle_t root)
+fdt_fixup_busfreq(phandle_t root, uint32_t div)
 {
 	phandle_t sb, cpus, child;
 	pcell_t freq;
@@ -72,12 +72,71 @@ fdt_fixup_busfreq(phandle_t root)
 	    sizeof(freq)) <= 0)
 		return;
 
+	if (div == 0)
+		return;
+
+	freq /= div;
+
 	OF_setprop(sb, "bus-frequency", (void *)&freq, sizeof(freq));
 }
 
+static void
+fdt_fixup_busfreq_mpc85xx(phandle_t root)
+{
+
+	fdt_fixup_busfreq(root, 1);
+}
+
+static void
+fdt_fixup_busfreq_dpaa(phandle_t root)
+{
+
+	fdt_fixup_busfreq(root, 2);
+}
+
+static void
+fdt_fixup_fman(phandle_t root)
+{
+	phandle_t node;
+	pcell_t freq;
+
+	if ((node = fdt_find_compatible(root, "simple-bus", 1)) == 0)
+		return;
+
+	if (OF_getprop(node, "bus-frequency", (void *)&freq,
+	    sizeof(freq)) <= 0)
+		return;
+
+	/*
+	 * Set clock-frequency for FMan nodes (only on QorIQ DPAA targets).
+	 * That frequency is equal to /soc node bus-frequency.
+	 */
+	for (node = OF_child(node); node != 0; node = OF_peer(node)) {
+		if (fdt_is_compatible(node, "fsl,fman") == 0)
+			continue;
+
+		if (OF_setprop(node, "clock-frequency", (void *)&freq,
+		    sizeof(freq)) == -1) {
+			/*
+			 * XXX Shall we take some actions if no clock-frequency
+			 * property was found?
+			 */
+		}
+	}
+}
+
 struct fdt_fixup_entry fdt_fixup_table[] = {
-	{ "fsl,MPC8572DS", &fdt_fixup_busfreq },
-	{ "MPC8555CDS", &fdt_fixup_busfreq },
+	{ "fsl,MPC8572DS", &fdt_fixup_busfreq_mpc85xx },
+	{ "MPC8555CDS", &fdt_fixup_busfreq_mpc85xx },
+	{ "fsl,P2020", &fdt_fixup_busfreq_mpc85xx },
+	{ "fsl,P2041RDB", &fdt_fixup_busfreq_dpaa },
+	{ "fsl,P2041RDB", &fdt_fixup_fman },
+	{ "fsl,P3041DS", &fdt_fixup_busfreq_dpaa },
+	{ "fsl,P3041DS", &fdt_fixup_fman },
+	{ "fsl,P5020DS", &fdt_fixup_busfreq_dpaa },
+	{ "fsl,P5020DS", &fdt_fixup_fman },
+	{ "varisys,CYRUS", &fdt_fixup_busfreq_dpaa },
+	{ "varisys,CYRUS", &fdt_fixup_fman },
 	{ NULL, NULL }
 };