vserver 2.0 rc7

[linux-2.6.git] / include / asm-arm / arch-omap / fpga.h

diff --git a/include/asm-arm/arch-omap/fpga.h b/include/asm-arm/arch-omap/fpga.h
index dc9f61a..676807d 100644 (file)
--- a/include/asm-arm/arch-omap/fpga.h
+++ b/include/asm-arm/arch-omap/fpga.h
@@ -38,8 +38,7 @@ extern void omap1510_fpga_init_irq(void);
 #define H2P2_DBG_FPGA_SIZE             SZ_4K           /* SIZE */
 #define H2P2_DBG_FPGA_START            0x04000000      /* PA */
 
-#define H2P2_DBG_FPGA_ETHR_START       H2P2_DBG_FPGA_START
-#define H2P2_DBG_FPGA_ETHR_BASE                H2P2_DBG_FPGA_BASE
+#define H2P2_DBG_FPGA_ETHR_START       (H2P2_DBG_FPGA_START + 0x300)
 #define H2P2_DBG_FPGA_FPGA_REV         (H2P2_DBG_FPGA_BASE + 0x10)     /* FPGA Revision */
 #define H2P2_DBG_FPGA_BOARD_REV                (H2P2_DBG_FPGA_BASE + 0x12)     /* Board Revision */
 #define H2P2_DBG_FPGA_GPIO             (H2P2_DBG_FPGA_BASE + 0x14)     /* GPIO outputs */
@@ -48,12 +47,31 @@ extern void omap1510_fpga_init_irq(void);
 #define H2P2_DBG_FPGA_LAN_STATUS       (H2P2_DBG_FPGA_BASE + 0x1A)     /* LAN Status line */
 #define H2P2_DBG_FPGA_LAN_RESET                (H2P2_DBG_FPGA_BASE + 0x1C)     /* LAN Reset line */
 
-/* LEDs definition on debug board (16 LEDs) */
-#define H2P2_DBG_FPGA_LED_CLAIMRELEASE (1 << 15)
-#define H2P2_DBG_FPGA_LED_STARTSTOP    (1 << 14)
-#define H2P2_DBG_FPGA_LED_HALTED       (1 << 13)
-#define H2P2_DBG_FPGA_LED_IDLE         (1 << 12)
-#define H2P2_DBG_FPGA_LED_TIMER                (1 << 11)
+/* NOTE:  most boards don't have a static mapping for the FPGA ... */
+struct h2p2_dbg_fpga {
+       /* offset 0x00 */
+       u16             smc91x[8];
+       /* offset 0x10 */
+       u16             fpga_rev;
+       u16             board_rev;
+       u16             gpio_outputs;
+       u16             leds;
+       /* offset 0x18 */
+       u16             misc_inputs;
+       u16             lan_status;
+       u16             lan_reset;
+       u16             reserved0;
+       /* offset 0x20 */
+       u16             ps2_data;
+       u16             ps2_ctrl;
+       /* plus also 4 rs232 ports ... */
+};
+
+/* LEDs definition on debug board (16 LEDs, all physically green) */
+#define H2P2_DBG_FPGA_LED_GREEN                (1 << 15)
+#define H2P2_DBG_FPGA_LED_AMBER                (1 << 14)
+#define H2P2_DBG_FPGA_LED_RED          (1 << 13)
+#define H2P2_DBG_FPGA_LED_BLUE         (1 << 12)
 /*  cpu0 load-meter LEDs */
 #define H2P2_DBG_FPGA_LOAD_METER       (1 << 0)        // A bit of fun on our board ...
 #define H2P2_DBG_FPGA_LOAD_METER_SIZE  11
@@ -116,7 +134,6 @@ extern void omap1510_fpga_init_irq(void);
 #define INNOVATOR_FPGA_IMR2                    (OMAP1510_FPGA_BASE + 0x210)
 
 #define OMAP1510_FPGA_ETHR_START               (OMAP1510_FPGA_START + 0x300)
-#define OMAP1510_FPGA_ETHR_BASE                        (OMAP1510_FPGA_BASE + 0x300)
 
 /*
  * Power up Giga UART driver, turn on HID clock.