From owner-svn-src-head@FreeBSD.ORG  Tue Aug 31 04:18:47 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E06DC10656A9;
	Tue, 31 Aug 2010 04:18:47 +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 D02F98FC15;
	Tue, 31 Aug 2010 04:18:47 +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 o7V4IlU8017880;
	Tue, 31 Aug 2010 04:18:47 GMT
	(envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7V4IlsR017878;
	Tue, 31 Aug 2010 04:18:47 GMT
	(envelope-from jchandra@svn.freebsd.org)
Message-Id: <201008310418.o7V4IlsR017878@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Tue, 31 Aug 2010 04:18:47 +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: r212045 - head/sys/mips/rmi
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 31 Aug 2010 04:18:48 -0000

Author: jchandra
Date: Tue Aug 31 04:18:47 2010
New Revision: 212045
URL: http://svn.freebsd.org/changeset/base/212045

Log:
  Add the workaround for 4xx lite boards after it was lost in the last
  board.c update.

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

Modified: head/sys/mips/rmi/board.c
==============================================================================
--- head/sys/mips/rmi/board.c	Tue Aug 31 02:07:13 2010	(r212044)
+++ head/sys/mips/rmi/board.c	Tue Aug 31 04:18:47 2010	(r212045)
@@ -188,6 +188,23 @@ xls_board_specific_overrides(struct xlr_
 		blk1->gmac_port[1].mdint_id = 0;
 		blk1->gmac_port[2].mdint_id = 0;
 		blk1->gmac_port[3].mdint_id = 0;
+
+		/* If we have a 4xx lite chip, don't enable the 
+		 * GMACs which are disabled in hardware */
+		if (xlr_is_xls4xx_lite()) {
+			xlr_reg_t *mmio = xlr_io_mmio(XLR_IO_GPIO_OFFSET);
+			uint32_t tmp;
+
+			/* Port 6 & 7 are not enabled on the condor 4xx, figure
+			 * this out from the GPIO fuse bank */
+			tmp = xlr_read_reg(mmio, 35);
+			if ((tmp & (3 << 28)) != 0) {
+				blk1->enabled = 0x3;
+				blk1->gmac_port[2].valid = 0;
+				blk1->gmac_port[3].valid = 0;
+				blk1->num_ports = 2;
+			}
+		}
 		break;
 
 	case RMI_XLR_BOARD_ARIZONA_VIII: