From owner-svn-src-all@FreeBSD.ORG  Wed Jul  7 15:05:44 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 92F4C1065670;
	Wed,  7 Jul 2010 15:05:44 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4B1498FC0A;
	Wed,  7 Jul 2010 15:05:44 +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 o67F5ivA024422;
	Wed, 7 Jul 2010 15:05:44 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o67F5iMV024420;
	Wed, 7 Jul 2010 15:05:44 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201007071505.o67F5iMV024420@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 7 Jul 2010 15:05:44 +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: r209769 - head/sys/mips/atheros
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 07 Jul 2010 15:05:44 -0000

Author: adrian
Date: Wed Jul  7 15:05:44 2010
New Revision: 209769
URL: http://svn.freebsd.org/changeset/base/209769

Log:
  Fix the CS line definitions. These bits are for the CS2/CS1 lines
  rather than CS1/CS0.
  
  This has been tested on the Ubiqiti Routerstation Pro board.

Modified:
  head/sys/mips/atheros/ar71xxreg.h

Modified: head/sys/mips/atheros/ar71xxreg.h
==============================================================================
--- head/sys/mips/atheros/ar71xxreg.h	Wed Jul  7 14:24:48 2010	(r209768)
+++ head/sys/mips/atheros/ar71xxreg.h	Wed Jul  7 15:05:44 2010	(r209769)
@@ -151,10 +151,10 @@
 #define		AR71XX_GPIO_FUNCTION		0x28
 #define			GPIO_FUNC_STEREO_EN     (1 << 17)
 #define			GPIO_FUNC_SLIC_EN       (1 << 16)
-#define			GPIO_FUNC_SPI_CS1_EN    (1 << 15)
-				/* CS1 is shared with GPIO_1 */
-#define			GPIO_FUNC_SPI_CS0_EN    (1 << 14)
-				/* CS0 is shared with GPIO_0 */
+#define			GPIO_FUNC_SPI_CS2_EN    (1 << 15)
+				/* CS2 is shared with GPIO_1 */
+#define			GPIO_FUNC_SPI_CS1_EN    (1 << 14)
+				/* CS1 is shared with GPIO_0 */
 #define			GPIO_FUNC_SPI_EN        (1 << 13)
 #define			GPIO_FUNC_UART_EN       (1 << 8)
 #define			GPIO_FUNC_USB_OC_EN     (1 << 4)