From owner-svn-src-head@FreeBSD.ORG  Fri Apr  5 02:02:38 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 35BA2F0A;
 Fri,  5 Apr 2013 02:02: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 28F86A35;
 Fri,  5 Apr 2013 02:02: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 r3522cub089947;
 Fri, 5 Apr 2013 02:02:38 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3522cYW089946;
 Fri, 5 Apr 2013 02:02:38 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201304050202.r3522cYW089946@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 5 Apr 2013 02:02:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249126 - head/sys/mips/atheros
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Fri, 05 Apr 2013 02:02:38 -0000

Author: adrian
Date: Fri Apr  5 02:02:37 2013
New Revision: 249126
URL: http://svnweb.freebsd.org/changeset/base/249126

Log:
  Implement USB device reset and poweron.
  
  Tested:
  
  * Atheros AP131, AR9331 SoC

Modified:
  head/sys/mips/atheros/ar933x_chip.c

Modified: head/sys/mips/atheros/ar933x_chip.c
==============================================================================
--- head/sys/mips/atheros/ar933x_chip.c	Fri Apr  5 02:01:05 2013	(r249125)
+++ head/sys/mips/atheros/ar933x_chip.c	Fri Apr  5 02:02:37 2013	(r249126)
@@ -222,43 +222,14 @@ ar933x_chip_get_eth_pll(unsigned int mac
 static void
 ar933x_chip_init_usb_peripheral(void)
 {
-#if 0
-	switch (ar71xx_soc) {
-	case AR71XX_SOC_AR7240:
-		ar71xx_device_stop(AR724X_RESET_MODULE_USB_OHCI_DLL |
-		    AR724X_RESET_USB_HOST);
-		DELAY(1000);
+	ar71xx_device_stop(AR933X_RESET_USBSUS_OVERRIDE);
+	DELAY(100);
 
-		ar71xx_device_start(AR724X_RESET_MODULE_USB_OHCI_DLL |
-		    AR724X_RESET_USB_HOST);
-		DELAY(1000);
+	ar71xx_device_start(AR933X_RESET_USB_HOST);
+	DELAY(100);
 
-		/*
-		 * WAR for HW bug. Here it adjusts the duration
-		 * between two SOFS.
-		 */
-		ATH_WRITE_REG(AR71XX_USB_CTRL_FLADJ,
-		    (3 << USB_CTRL_FLADJ_A0_SHIFT));
-
-		break;
-
-	case AR71XX_SOC_AR7241:
-	case AR71XX_SOC_AR7242:
-		ar71xx_device_start(AR724X_RESET_MODULE_USB_OHCI_DLL);
-		DELAY(100);
-
-		ar71xx_device_start(AR724X_RESET_USB_HOST);
-		DELAY(100);
-
-		ar71xx_device_start(AR724X_RESET_USB_PHY);
-		DELAY(100);
-
-		break;
-
-	default:
-		break;
-	}
-#endif
+	ar71xx_device_start(AR933X_RESET_USB_PHY);
+	DELAY(100);
 }
 
 struct ar71xx_cpu_def ar933x_chip_def = {