From owner-svn-src-all@FreeBSD.ORG  Fri Jul  2 13:30:27 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7EC6F106566C;
	Fri,  2 Jul 2010 13:30:27 +0000 (UTC)
	(envelope-from jchandra@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6E10A8FC13;
	Fri,  2 Jul 2010 13:30:27 +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 o62DURo1006770;
	Fri, 2 Jul 2010 13:30:27 GMT (envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o62DUR19006767;
	Fri, 2 Jul 2010 13:30:27 GMT (envelope-from jchandra@svn.freebsd.org)
Message-Id: <201007021330.o62DUR19006767@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Fri, 2 Jul 2010 13:30:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209646 - head/sys/mips/rmi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jul 2010 13:30:27 -0000

Author: jchandra
Date: Fri Jul  2 13:30:26 2010
New Revision: 209646
URL: http://svn.freebsd.org/changeset/base/209646

Log:
  Add support for XLS 108 chips - update board.c/board.h to setup GMAC
  driver parameters correctly.
  
  Approved by:	rrs (mentor)
  Obtained from:	Sriram Gorti <srgorti@netlogicmicro.com>

Modified:
  head/sys/mips/rmi/board.c
  head/sys/mips/rmi/board.h

Modified: head/sys/mips/rmi/board.c
==============================================================================
--- head/sys/mips/rmi/board.c	Fri Jul  2 12:01:46 2010	(r209645)
+++ head/sys/mips/rmi/board.c	Fri Jul  2 13:30:26 2010	(r209646)
@@ -127,7 +127,7 @@ xlr_board_info_setup()
 
 		/* network block 1 */
 		xlr_board_info.gmac_block[1].type = XLR_GMAC;
-		xlr_board_info.gmac_block[1].enabled = 0xf;
+		xlr_board_info.gmac_block[1].enabled = xlr_is_xls1xx() ? 0 : 0xf;
 		if (xlr_is_xls4xx_lite()) {
 			xlr_reg_t *mmio = xlr_io_mmio(XLR_IO_GPIO_OFFSET);
 			uint32_t tmp;

Modified: head/sys/mips/rmi/board.h
==============================================================================
--- head/sys/mips/rmi/board.h	Fri Jul  2 12:01:46 2010	(r209645)
+++ head/sys/mips/rmi/board.h	Fri Jul  2 13:30:26 2010	(r209646)
@@ -77,7 +77,8 @@ xlr_is_xls(void)
 {
 	uint32_t prid = mips_rd_prid();
 
-	return (prid & 0xf000) == 0x8000 || (prid & 0xf000) == 0x4000;
+	return ((prid & 0xf000) == 0x8000 || (prid & 0xf000) == 0x4000 ||
+	    (prid & 0xf000) == 0xc000);
 }
 
 /*
@@ -110,6 +111,14 @@ xlr_board_pci(void)
 }
 
 static __inline__ int
+xlr_is_xls1xx(void)
+{
+	uint32_t chipid = xlr_processor_id();
+
+	return (chipid == 0xce || chipid == 0xcf);
+}
+
+static __inline__ int
 xlr_is_xls2xx(void)
 {
 	uint32_t chipid = xlr_processor_id();