svn commit: r234863 - head/sys/mips/conf

[Adrian Chadd]

Author: adrian
Date: Tue May  1 06:21:02 2012
New Revision: 234863
URL: http://svn.freebsd.org/changeset/base/234863

Log:
  Convert AP96 to use the mdioproxy and ARGE_MDIO option.
  
  arge1 still works (it's the standalone PHY) but arge0 and the other switch
  ports don't work.  They're enumerated though, demonstrating that the
  mdiobus abstraction is correctly working.

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

Modified: head/sys/mips/conf/AP96
==============================================================================
--- head/sys/mips/conf/AP96	Tue May  1 06:18:30 2012	(r234862)
+++ head/sys/mips/conf/AP96	Tue May  1 06:21:02 2012	(r234863)
@@ -40,3 +40,7 @@ options         ROOTDEVNAME=\"ufs:map/ro
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
+
+# Options required for miiproxy and mdiobus
+options 	ARGE_MDIO		# Export an MDIO bus separate from arge
+device		miiproxy		# MDIO bus <-> MII PHY rendezvous

Modified: head/sys/mips/conf/AP96.hints
==============================================================================
--- head/sys/mips/conf/AP96.hints	Tue May  1 06:18:30 2012	(r234862)
+++ head/sys/mips/conf/AP96.hints	Tue May  1 06:21:02 2012	(r234863)
@@ -1,15 +1,33 @@
 # $FreeBSD$
 
+# arge0 MDIO bus - there's no arge1 MDIO bus for AR71xx
+hint.argemdio.0.at="nexus0"
+hint.argemdio.0.maddr=0x19000000
+hint.argemdio.0.msize=0x1000
+hint.argemdio.0.order=0
+
+# Create two mdioproxy instances - by default only one is created
+# per mdiobus above.
+hint.mdioproxy.0.at="mdio0"
+hint.mdioproxy.1.at="mdio0"
+
 # TODO: RGMII
+# XXX this port currently doesn't work with the current configuration.
 hint.arge.0.phymask=0x0f
 hint.arge.0.media=1000
 hint.arge.0.fduplex=1
+# For now, rendezouvs this on the arge0 mdiobus.
+# Later, this will rendezvous via the AR8316 switch.
+hint.arge.0.mdio=mdioproxy0
 
 # TODO: RGMII
 # TODO: pll_1000 = 0x1f000000
 hint.arge.1.phymask=0x10
 # hint.arge.1.media=1000
 # hint.arge.1.fduplex=1
+# For now, rendezouvs this on the arge0 mdiobus.
+# Later, this will rendezvous via the AR8316 switch.
+hint.arge.1.mdio=mdioproxy1
 
 # ath0 - slot 17
 hint.pcib.0.bus.0.17.0.ath_fixup_addr=0x1fff1000