From owner-p4-projects@FreeBSD.ORG  Thu Dec  4 22:45:31 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5825A1065677; Thu,  4 Dec 2008 22:45:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1BA6B1065672
	for <perforce@freebsd.org>; Thu,  4 Dec 2008 22:45:31 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0BE2A8FC1A
	for <perforce@freebsd.org>; Thu,  4 Dec 2008 22:45:31 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB4MjU8F046166
	for <perforce@freebsd.org>; Thu, 4 Dec 2008 22:45:30 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB4MjUDK046164
	for perforce@freebsd.org; Thu, 4 Dec 2008 22:45:30 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 4 Dec 2008 22:45:30 GMT
Message-Id: <200812042245.mB4MjUDK046164@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 154079 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Dec 2008 22:45:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=154079

Change 154079 by sam@sam_ebb on 2008/12/04 22:44:49

	don't calculate register offsets relative to each other;
	just use the absolute addresses in the manual

Affected files ...

.. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425reg.h#6 edit

Differences ...

==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425reg.h#6 (text+ko) ====

@@ -662,23 +662,16 @@
 
 /*
  * IXP435/Gateworks Cambria
- *
- * Octal status LED latch is in upper 256K of CS3
- * Optional RS485 Serial port is next lower 256K
- * Optional GPS Serial port is next lower 256K
- * next lower 768K is reserved
- * Compact flash socket 1 is next lower 256K
- * Compact flash socket 0 is next lower 256K
  */
-#define	CAMBRIA_OCTAL_LED_HWBASE (IXP425_EXP_BUS_CS4_HWBASE - 0x40000)
-#define	CAMBRIA_OCTAL_LED_SIZE	0x40000
-#define	CAMBRIA_RS485_HWBASE	(CAMBRIA_OCTAL_LED_HWBASE - 0x40000)
+#define	CAMBRIA_GPS_HWBASE	0x53FC0000UL	/* optional GPS Serial Port */
+#define	CAMBRIA_GPS_SIZE	0x40000
+#define	CAMBRIA_RS485_HWBASE	0x53F80000UL	/* optional RS485 Serial Port */
 #define	CAMBRIA_RS485_SIZE	0x40000
-#define	CAMBRIA_GPS_HWBASE	(CAMBRIA_RS485_HWBASE - 0x40000)
-#define	CAMBRIA_GPS_SIZE	0x40000
-#define	CAMBRIA_CFSEL1_HWBASE	(CAMBRIA_GPS_HWBASE - 4*0x40000)
+#define	CAMBRIA_OCTAL_LED_HWBASE 0x53F40000UL	/* Octal Status LED Latch */
+#define	CAMBRIA_OCTAL_LED_SIZE	0x1000
+#define	CAMBRIA_CFSEL1_HWBASE	0x53E40000UL	/* Compact Flash Socket Sel 0 */
 #define	CAMBRIA_CFSEL1_SIZE	0x40000
-#define	CAMBRIA_CFSEL0_HWBASE	(CAMBRIA_CFSEL1_HWBASE - 0x40000)
+#define	CAMBRIA_CFSEL0_HWBASE	0x53E00000UL	/* Compact Flash Socket Sel 1 */
 #define	CAMBRIA_CFSEL0_SIZE	0x40000
 
 #define IXP435_USB1_HWBASE	0xcd000000UL	/* USB host controller 1 */