x86: replace hard coded reservations in 64-bit early boot code with dynamic table

[linux-2.6-omap-h63xx.git] / include / asm-mips / lasat / lasat.h

diff --git a/include/asm-mips/lasat/lasat.h b/include/asm-mips/lasat/lasat.h
index 42077e367a5bbe44dc38b63735aae3c4047812bd..ea04d9262edc903aaa7a2e99877bc125a47cb888 100644 (file)
--- a/include/asm-mips/lasat/lasat.h
+++ b/include/asm-mips/lasat/lasat.h
@@ -102,61 +102,63 @@ struct lasat_eeprom_struct_pre7 {
 
 /* Configuration descriptor encoding - see the doc for details */
 
-#define LASAT_W0_DSCTYPE(v)            ( ( (v)         ) & 0xf )
-#define LASAT_W0_BMID(v)               ( ( (v) >> 0x04 ) & 0xf )
-#define LASAT_W0_CPUTYPE(v)            ( ( (v) >> 0x08 ) & 0xf )
-#define LASAT_W0_BUSSPEED(v)           ( ( (v) >> 0x0c ) & 0xf )
-#define LASAT_W0_CPUCLK(v)             ( ( (v) >> 0x10 ) & 0xf )
-#define LASAT_W0_SDRAMBANKSZ(v)                ( ( (v) >> 0x14 ) & 0xf )
-#define LASAT_W0_SDRAMBANKS(v)         ( ( (v) >> 0x18 ) & 0xf )
-#define LASAT_W0_L2CACHE(v)            ( ( (v) >> 0x1c ) & 0xf )
-
-#define LASAT_W1_EDHAC(v)              ( ( (v)         ) & 0xf )
-#define LASAT_W1_HIFN(v)               ( ( (v) >> 0x04 ) & 0x1 )
-#define LASAT_W1_ISDN(v)               ( ( (v) >> 0x05 ) & 0x1 )
-#define LASAT_W1_IDE(v)                        ( ( (v) >> 0x06 ) & 0x1 )
-#define LASAT_W1_HDLC(v)               ( ( (v) >> 0x07 ) & 0x1 )
-#define LASAT_W1_USVERSION(v)          ( ( (v) >> 0x08 ) & 0x1 )
-#define LASAT_W1_4MACS(v)              ( ( (v) >> 0x09 ) & 0x1 )
-#define LASAT_W1_EXTSERIAL(v)          ( ( (v) >> 0x0a ) & 0x1 )
-#define LASAT_W1_FLASHSIZE(v)          ( ( (v) >> 0x0c ) & 0xf )
-#define LASAT_W1_PCISLOTS(v)           ( ( (v) >> 0x10 ) & 0xf )
-#define LASAT_W1_PCI1OPT(v)            ( ( (v) >> 0x14 ) & 0xf )
-#define LASAT_W1_PCI2OPT(v)            ( ( (v) >> 0x18 ) & 0xf )
-#define LASAT_W1_PCI3OPT(v)            ( ( (v) >> 0x1c ) & 0xf )
+#define LASAT_W0_DSCTYPE(v)            (((v))         & 0xf)
+#define LASAT_W0_BMID(v)               (((v) >> 0x04) & 0xf)
+#define LASAT_W0_CPUTYPE(v)            (((v) >> 0x08) & 0xf)
+#define LASAT_W0_BUSSPEED(v)           (((v) >> 0x0c) & 0xf)
+#define LASAT_W0_CPUCLK(v)             (((v) >> 0x10) & 0xf)
+#define LASAT_W0_SDRAMBANKSZ(v)                (((v) >> 0x14) & 0xf)
+#define LASAT_W0_SDRAMBANKS(v)         (((v) >> 0x18) & 0xf)
+#define LASAT_W0_L2CACHE(v)            (((v) >> 0x1c) & 0xf)
+
+#define LASAT_W1_EDHAC(v)              (((v))         & 0xf)
+#define LASAT_W1_HIFN(v)               (((v) >> 0x04) & 0x1)
+#define LASAT_W1_ISDN(v)               (((v) >> 0x05) & 0x1)
+#define LASAT_W1_IDE(v)                        (((v) >> 0x06) & 0x1)
+#define LASAT_W1_HDLC(v)               (((v) >> 0x07) & 0x1)
+#define LASAT_W1_USVERSION(v)          (((v) >> 0x08) & 0x1)
+#define LASAT_W1_4MACS(v)              (((v) >> 0x09) & 0x1)
+#define LASAT_W1_EXTSERIAL(v)          (((v) >> 0x0a) & 0x1)
+#define LASAT_W1_FLASHSIZE(v)          (((v) >> 0x0c) & 0xf)
+#define LASAT_W1_PCISLOTS(v)           (((v) >> 0x10) & 0xf)
+#define LASAT_W1_PCI1OPT(v)            (((v) >> 0x14) & 0xf)
+#define LASAT_W1_PCI2OPT(v)            (((v) >> 0x18) & 0xf)
+#define LASAT_W1_PCI3OPT(v)            (((v) >> 0x1c) & 0xf)
 
 /* Routines specific to LASAT boards */
 
 #define LASAT_BMID_MASQUERADE2         0
 #define LASAT_BMID_MASQUERADEPRO       1
-#define LASAT_BMID_SAFEPIPE25                  2
-#define LASAT_BMID_SAFEPIPE50                  3
+#define LASAT_BMID_SAFEPIPE25          2
+#define LASAT_BMID_SAFEPIPE50          3
 #define LASAT_BMID_SAFEPIPE100         4
 #define LASAT_BMID_SAFEPIPE5000                5
 #define LASAT_BMID_SAFEPIPE7000                6
 #define LASAT_BMID_SAFEPIPE1000                7
-//#define LASAT_BMID_SAFEPIPE30                7
-//#define LASAT_BMID_SAFEPIPE5100      8
-//#define LASAT_BMID_SAFEPIPE7100      9
-#define LASAT_BMID_UNKNOWN                             0xf
-#define LASAT_MAX_BMID_NAMES                   9   // no larger than 15!
-
-#define LASAT_HAS_EDHAC                        ( 1 << 0 )
-#define LASAT_EDHAC_FAST               ( 1 << 1 )
-#define LASAT_HAS_EADI                 ( 1 << 2 )
-#define LASAT_HAS_HIFN                 ( 1 << 3 )
-#define LASAT_HAS_ISDN                 ( 1 << 4 )
-#define LASAT_HAS_LEASEDLINE_IF                ( 1 << 5 )
-#define LASAT_HAS_HDC                  ( 1 << 6 )
+#if 0
+#define LASAT_BMID_SAFEPIPE30          7
+#define LASAT_BMID_SAFEPIPE5100                8
+#define LASAT_BMID_SAFEPIPE7100                9
+#endif
+#define LASAT_BMID_UNKNOWN             0xf
+#define LASAT_MAX_BMID_NAMES           9   /* no larger than 15! */
+
+#define LASAT_HAS_EDHAC                        (1 << 0)
+#define LASAT_EDHAC_FAST               (1 << 1)
+#define LASAT_HAS_EADI                 (1 << 2)
+#define LASAT_HAS_HIFN                 (1 << 3)
+#define LASAT_HAS_ISDN                 (1 << 4)
+#define LASAT_HAS_LEASEDLINE_IF                (1 << 5)
+#define LASAT_HAS_HDC                  (1 << 6)
 
 #define LASAT_PRID_MASQUERADE2         0
 #define LASAT_PRID_MASQUERADEPRO       1
-#define LASAT_PRID_SAFEPIPE25                  2
-#define LASAT_PRID_SAFEPIPE50                  3
+#define LASAT_PRID_SAFEPIPE25          2
+#define LASAT_PRID_SAFEPIPE50          3
 #define LASAT_PRID_SAFEPIPE100         4
 #define LASAT_PRID_SAFEPIPE5000                5
 #define LASAT_PRID_SAFEPIPE7000                6
-#define LASAT_PRID_SAFEPIPE30                  7
+#define LASAT_PRID_SAFEPIPE30          7
 #define LASAT_PRID_SAFEPIPE5100                8
 #define LASAT_PRID_SAFEPIPE7100                9
 
@@ -224,7 +226,8 @@ extern void lasat_write_eeprom_info(void);
  * early stage of the boot process where ndelay is not calibrated.
  * It is used for the bit-banging rtc and eeprom drivers */
 
-#include <asm/delay.h>
+#include <linux/delay.h>
+
 /* calculating with the slowest board with 100 MHz clock */
 #define LASAT_100_DIVIDER 20
 /* All 200's run at 250 MHz clock */
@@ -234,7 +237,7 @@ extern unsigned int lasat_ndelay_divider;
 
 static inline void lasat_ndelay(unsigned int ns)
 {
-            __delay(ns / lasat_ndelay_divider);
+       __delay(ns / lasat_ndelay_divider);
 }
 
 #endif /* !defined (_LANGUAGE_ASSEMBLY) */