CVS: blob/include/blob/proc pxa.h,1.3,1.4

[Abraham vd M. <ab...@us...>]

Update of /cvsroot/blob/blob/include/blob/proc
In directory sc8-pr-cvs1:/tmp/cvs-serv20719/include/blob/proc

Modified Files:
	pxa.h 
Log Message:
Added GPL headers to files I've added and renamed memsetup-pxa250.S to
memsetup-pxa.S


Index: pxa.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/proc/pxa.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pxa.h	7 Aug 2003 19:31:00 -0000	1.3
+++ pxa.h	7 Aug 2003 19:46:54 -0000	1.4
@@ -1,7 +1,9 @@
+
 /*
  * proc/pxa.h - processor specific defines
  * 
  * Copyright (C) 2001  Erik Mouw (J.A...@it...)
+ * Copyright (C) 2003  Abraham van der Merwe <ab...@4d...>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,28 +24,14 @@
 #ifndef BLOB_PXA_PROC_H
 #define BLOB_PXA_PROC_H
 
-/*
- * Intel PXA internal I/O mappings:
- *
- * 0x40000000 - 0x41ffffff <--> 0xf8000000 - 0xf9ffffff
- * 0x44000000 - 0x45ffffff <--> 0xfa000000 - 0xfbffffff
- * 0x48000000 - 0x49ffffff <--> 0xfc000000 - 0xfdffffff
- */
-
-/*
-#define io_p2v(x) ( ((x) | 0xbe000000) ^ (~((x) >> 1) & 0x06000000) )
-#define io_v2p(x) ( ((x) & 0x41ffffff) ^ ( ((x) & 0x06000000) << 1) )
- */
-
 #define io_p2v(x) (x)
 #define io_v2p(x) (x)
 
 #ifndef __ASSEMBLY__
 
+#define __REG(x)	(*((volatile u32 *)io_p2v(x)))
 
-# define __REG(x)	(*((volatile u32 *)io_p2v(x)))
-
-# define __REG2(x,y)	\
+#define __REG2(x,y)	\
 	( __builtin_constant_p(y) ? (__REG((x) + (y))) \
 				  : (*(volatile u32 *)((u32)&__REG(x) + (y))) )