SPDX: Convert all of our single license tags to Linux Kernel style

[u-boot] / include / gdsys_fpga.h

diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h
index 69d248f170eb3008ef290bb1b74a94e370691902..db4424d3f8a6597a11c93da4dc18a57a8177a443 100644 (file)
--- a/include/gdsys_fpga.h
+++ b/include/gdsys_fpga.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2010
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  */
 
 #ifndef __GDSYS_FPGA_H
@@ -17,7 +16,6 @@ enum {
 };
 
 int get_fpga_state(unsigned dev);
-void print_fpga_state(unsigned dev);
 
 int fpga_set_reg(u32 fpga, u16 *reg, off_t regoff, u16 data);
 int fpga_get_reg(u32 fpga, u16 *reg, off_t regoff, u16 *data);
@@ -157,13 +155,13 @@ struct ihs_fpga {
        u16 mc_rx_data;         /* 0x0072 */
        u16 reserved_5[69];     /* 0x0074 */
        u16 reflection_high;    /* 0x00fe */
-       struct ihs_osd osd;     /* 0x0100 */
+       struct ihs_osd osd0;    /* 0x0100 */
        u16 reserved_6[889];    /* 0x010e */
-       u16 videomem[31736];    /* 0x0800 */
+       u16 videomem0[2048];    /* 0x0800 */
 };
 #endif
 
-#ifdef CONFIG_HRCON
+#if defined(CONFIG_HRCON) || defined(CONFIG_STRIDER_CON_DP)
 struct ihs_fpga {
        u16 reflection_low;     /* 0x0000 */
        u16 versions;           /* 0x0002 */
@@ -171,7 +169,9 @@ struct ihs_fpga {
        u16 fpga_features;      /* 0x0006 */
        u16 reserved_0[1];      /* 0x0008 */
        u16 top_interrupt;      /* 0x000a */
-       u16 reserved_1[4];      /* 0x000c */
+       u16 reserved_1[2];      /* 0x000c */
+       u16 control;            /* 0x0010 */
+       u16 extended_control;   /* 0x0012 */
        struct ihs_gpio gpio;   /* 0x0014 */
        u16 mpc3w_control;      /* 0x001a */
        u16 reserved_2[2];      /* 0x001c */
@@ -191,9 +191,19 @@ struct ihs_fpga {
        u16 mc_rx_data;         /* 0x0072 */
        u16 reserved_5[69];     /* 0x0074 */
        u16 reflection_high;    /* 0x00fe */
-       struct ihs_osd osd;     /* 0x0100 */
+       struct ihs_osd osd0;    /* 0x0100 */
+#ifdef CONFIG_SYS_OSD_DH
+       u16 reserved_6[57];     /* 0x010e */
+       struct ihs_osd osd1;    /* 0x0180 */
+       u16 reserved_7[9];      /* 0x018e */
+       struct ihs_i2c i2c1;    /* 0x01a0 */
+       u16 reserved_8[1834];   /* 0x01ac */
+       u16 videomem0[2048];    /* 0x1000 */
+       u16 videomem1[2048];    /* 0x2000 */
+#else
        u16 reserved_6[889];    /* 0x010e */
-       u16 videomem[31736];    /* 0x0800 */
+       u16 videomem0[2048];    /* 0x0800 */
+#endif
 };
 #endif
 
@@ -254,9 +264,9 @@ struct ihs_fpga {
        u16 mc_rx_cmd_status;   /* 0x0070 */
        u16 mc_rx_data;         /* 0x0072 */
        u16 reserved_5[70];     /* 0x0074 */
-       struct ihs_osd osd;     /* 0x0100 */
+       struct ihs_osd osd0;    /* 0x0100 */
        u16 reserved_6[889];    /* 0x010e */
-       u16 videomem[31736];    /* 0x0800 */
+       u16 videomem0[2048];    /* 0x0800 */
 };
 #endif
 
@@ -275,9 +285,9 @@ struct ihs_fpga {
        u16 reserved_3[2];      /* 0x006c */
        struct ihs_i2c i2c1;    /* 0x0070 */
        u16 reserved_4[194];    /* 0x007c */
-       struct ihs_osd osd;     /* 0x0200 */
+       struct ihs_osd osd0;    /* 0x0200 */
        u16 reserved_5[761];    /* 0x020e */
-       u16 videomem[31736];    /* 0x0800 */
+       u16 videomem0[2048];    /* 0x0800 */
 };
 #endif