From owner-svn-src-head@FreeBSD.ORG  Fri Apr  5 00:22:18 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 4310E777;
 Fri,  5 Apr 2013 00:22:18 +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 3566D6C1;
 Fri,  5 Apr 2013 00:22:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r350MIBh059874;
 Fri, 5 Apr 2013 00:22:18 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r350MHin059872;
 Fri, 5 Apr 2013 00:22:17 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201304050022.r350MHin059872@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 5 Apr 2013 00:22:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249118 - 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 00:22:18 -0000

Author: adrian
Date: Fri Apr  5 00:22:17 2013
New Revision: 249118
URL: http://svnweb.freebsd.org/changeset/base/249118

Log:
  * Add AR9330/AR9331 to the soc identifier enum;
  * Set it when probing the CPU type.

Modified:
  head/sys/mips/atheros/ar71xx_setup.c
  head/sys/mips/atheros/ar71xx_setup.h

Modified: head/sys/mips/atheros/ar71xx_setup.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_setup.c	Fri Apr  5 00:21:17 2013	(r249117)
+++ head/sys/mips/atheros/ar71xx_setup.c	Fri Apr  5 00:22:17 2013	(r249118)
@@ -148,11 +148,13 @@ ar71xx_detect_sys_type(void)
 		rev = (id & AR933X_REV_ID_REVISION_MASK);
 		chip = "9330";
 		ar71xx_cpu_ops = &ar933x_chip_def;
+		ar71xx_soc = AR71XX_SOC_AR9330;
 		break;
 	case REV_ID_MAJOR_AR9331:
 		minor = 1;
 		rev = (id & AR933X_REV_ID_REVISION_MASK);
 		chip = "9331";
+		ar71xx_soc = AR71XX_SOC_AR9331;
 		ar71xx_cpu_ops = &ar933x_chip_def;
 		break;
 

Modified: head/sys/mips/atheros/ar71xx_setup.h
==============================================================================
--- head/sys/mips/atheros/ar71xx_setup.h	Fri Apr  5 00:21:17 2013	(r249117)
+++ head/sys/mips/atheros/ar71xx_setup.h	Fri Apr  5 00:22:17 2013	(r249118)
@@ -38,7 +38,9 @@ enum ar71xx_soc_type {
 	AR71XX_SOC_AR7241,
 	AR71XX_SOC_AR7242,
 	AR71XX_SOC_AR9130,
-	AR71XX_SOC_AR9132
+	AR71XX_SOC_AR9132,
+	AR71XX_SOC_AR9330,
+	AR71XX_SOC_AR9331,
 };
 extern enum ar71xx_soc_type ar71xx_soc;