patch-2.4.19 linux-2.4.19/include/asm-arm/arch-sa1100/hardware.h

• Lines: 88
• Date: Fri Aug 2 17:39:45 2002
• Orig file: linux-2.4.18/include/asm-arm/arch-sa1100/hardware.h
• Orig date: Fri Nov 9 14:11:15 2001

diff -urN linux-2.4.18/include/asm-arm/arch-sa1100/hardware.h linux-2.4.19/include/asm-arm/arch-sa1100/hardware.h
@@ -60,6 +60,7 @@
    ( (((x)&0x00ffffff) | (((x)&(0x30000000>>VIO_SHIFT))<<VIO_SHIFT)) + PIO_START )
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 
 #if 0
 # define __REG(x)	(*((volatile u32 *)io_p2v(x)))
@@ -93,29 +94,38 @@
  * This must be called *before* the corresponding IRQ is registered.
  * Use this instead of directly setting GRER/GFER.
  */
-#define GPIO_FALLING_EDGE       1
-#define GPIO_RISING_EDGE        2
-#define GPIO_BOTH_EDGES         3
+#define GPIO_NO_EDGES		0
+#define GPIO_FALLING_EDGE	1
+#define GPIO_RISING_EDGE	2
+#define GPIO_BOTH_EDGES 	3
 #ifndef __ASSEMBLY__
 extern void set_GPIO_IRQ_edge( int gpio_mask, int edge_mask );
-
-/*
- * Return the current CPU clock frequency in units of 100kHz
- */
-extern unsigned short get_cclk_frequency(void);
-
 #endif
 
 
 /*
  * Implementation specifics.
  *
- * *** NOTE ***
+ *                      *** BIG FAT NOTE ***
+ *
  * Any definitions in these files should be prefixed by an identifier -
  * eg, ASSABET_UCB1300_IRQ  This will allow us to eleminate these
  * ifdefs, and lots of other preprocessor gunk elsewhere.
+ *
+ * Also, please try to add your entry in alphabetical order.  The
+ * initial ones below are the start of the alphabetical list.
+ *
+ * Do NOT add your ifdefs around your file.
  */
 
+#include "badge4.h"
+
+#include "frodo.h"
+
+#include "h3600.h"
+
+#include "system3.h"
+
 #ifdef CONFIG_SA1100_PANGOLIN
 #include "pangolin.h"
 #endif
@@ -145,10 +155,6 @@
 #include "empeg.h"
 #endif
 
-#ifdef CONFIG_SA1100_H3600
-#include "h3600.h"
-#endif
-
 #ifdef CONFIG_SA1100_ITSY
 #include "itsy.h"
 #endif
@@ -211,19 +217,4 @@
 #include "flexanet.h"
 #endif
 
-#ifdef CONFIG_SA1111
-
-/*
- * The SA1111 is always located at virtual 0xf4000000.
- */
-
-#define SA1111_VBASE		0xf4000000
-
-#define SA1111_p2v( x )         ((x) - SA1111_BASE + SA1111_VBASE)
-#define SA1111_v2p( x )         ((x) - SA1111_VBASE + SA1111_BASE)
-
-#include "SA-1111.h"
-
-#endif
-
 #endif  /* _ASM_ARCH_HARDWARE_H */