From owner-svn-src-user@FreeBSD.ORG  Thu Apr 29 07:23:14 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 071561065679;
	Thu, 29 Apr 2010 07:23:14 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EAEBC8FC22;
	Thu, 29 Apr 2010 07:23:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3T7NDbu067579;
	Thu, 29 Apr 2010 07:23:13 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3T7NDKf067577;
	Thu, 29 Apr 2010 07:23:13 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004290723.o3T7NDKf067577@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Thu, 29 Apr 2010 07:23:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207358 - user/jmallett/octeon/sys/contrib/octeon-sdk
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Apr 2010 07:23:14 -0000

Author: jmallett
Date: Thu Apr 29 07:23:13 2010
New Revision: 207358
URL: http://svn.freebsd.org/changeset/base/207358

Log:
  Set vendor-specified rx and tx timings for MR320.

Modified:
  user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c

Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c
==============================================================================
--- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c	Thu Apr 29 07:07:43 2010	(r207357)
+++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c	Thu Apr 29 07:23:13 2010	(r207358)
@@ -206,6 +206,21 @@ int __cvmx_helper_rgmii_enable(int inter
         cvmx_write_csr(CVMX_ASXX_TX_CLK_SETX(port, interface), 26);
         cvmx_write_csr(CVMX_ASXX_RX_CLK_SETX(port, interface), 26);
 #else
+	/*
+	 * Vendor-defined board types.
+	 */
+#if defined(OCTEON_VENDOR_LANNER)
+	switch (cvmx_sysinfo_get()->board_type) {
+	case CVMX_BOARD_TYPE_CUST_LANNER_MR320:
+            if (port == 0) {
+                cvmx_write_csr(CVMX_ASXX_TX_CLK_SETX(port, interface), 4);
+	    } else {
+                cvmx_write_csr(CVMX_ASXX_TX_CLK_SETX(port, interface), 7);
+            }
+            cvmx_write_csr(CVMX_ASXX_RX_CLK_SETX(port, interface), 0);
+	    break;
+	}
+#else
         /*
          * For board types we can determine at runtime.
          */
@@ -220,6 +235,7 @@ int __cvmx_helper_rgmii_enable(int inter
             cvmx_write_csr(CVMX_ASXX_RX_CLK_SETX(port, interface), 24);
         }
 #endif
+#endif
     }
 
     __cvmx_helper_setup_gmx(interface, num_ports);