From owner-svn-src-all@FreeBSD.ORG  Wed May  8 20:57:38 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 54E8E55C;
 Wed,  8 May 2013 20:57:38 +0000 (UTC)
 (envelope-from adrian@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 47676CD5;
 Wed,  8 May 2013 20:57:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r48Kvc4i080599;
 Wed, 8 May 2013 20:57:38 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r48Kvbpp080595;
 Wed, 8 May 2013 20:57:37 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201305082057.r48Kvbpp080595@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 8 May 2013 20:57:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250385 - head/sys/mips/conf
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.14
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/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 May 2013 20:57:38 -0000

Author: adrian
Date: Wed May  8 20:57:37 2013
New Revision: 250385
URL: http://svnweb.freebsd.org/changeset/base/250385

Log:
  Modify the routerstation config to use ukswitch for now.
  
  Until an ADM6996 driver shows up, this allows for the two switch
  ports to be used.
  
  Submitted by:	Luiz Otavio O Souza <loos.br@gmail.com>
  Reviewed by:	ray

Modified:
  head/sys/mips/conf/ROUTERSTATION
  head/sys/mips/conf/ROUTERSTATION.hints

Modified: head/sys/mips/conf/ROUTERSTATION
==============================================================================
--- head/sys/mips/conf/ROUTERSTATION	Wed May  8 20:56:43 2013	(r250384)
+++ head/sys/mips/conf/ROUTERSTATION	Wed May  8 20:57:37 2013	(r250385)
@@ -18,5 +18,11 @@ options		GEOM_UZIP
 # For DOS
 options		MSDOSFS
 
+# Etherswitch support
+options		ARGE_MDIO
+device		miiproxy
+device		etherswitch
+device		ukswitch
+
 # Boot path - redboot MFS
 options		ROOTDEVNAME=\"ufs:redboot/rootfs.uzip\"

Modified: head/sys/mips/conf/ROUTERSTATION.hints
==============================================================================
--- head/sys/mips/conf/ROUTERSTATION.hints	Wed May  8 20:56:43 2013	(r250384)
+++ head/sys/mips/conf/ROUTERSTATION.hints	Wed May  8 20:57:37 2013	(r250385)
@@ -5,12 +5,17 @@
 # Uncomment this hint for RS (not PRO)
 # PHY20 = 1 << 20
 hint.arge.0.phymask=0x100000
+hint.arge.0.mdio=mdioproxy1	# .. off of the switch mdiobus
 
 # should be 100 for RS 
 hint.arge.1.media=100
 hint.arge.1.fduplex=1
-# Uncomment this hint for RS (not PRO)
-hint.arge.1.phymask=0x30000
+hint.arge.1.phymask=0x0
+hint.arge.1.mdio=mdioproxy1	# .. off of the switch mdiobus
+
+# ukswitch
+hint.ukswitch.0.at="mdio0"
+hint.ukswitch.0.phymask=0x30000
 
 # RF led
 hint.gpioled.0.at="gpiobus0"