diff options
author | Wolfgang Denk <wd@denx.de> | 2011-04-24 22:55:26 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-04-24 22:55:26 (GMT) |
commit | e22ba10107fb2ad4c24634af484363e5dcd65312 (patch) | |
tree | 8197692c139403511bbdc85e348fba3e2ff0babc /include/gdsys_fpga.h | |
parent | c1fa1b7d00712b41a6c710e7ed33782cb3f47191 (diff) | |
parent | 6cfa9eecb4409b1b4e8b4753b2ddfbe33e28bd93 (diff) | |
download | u-boot-e22ba10107fb2ad4c24634af484363e5dcd65312.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'include/gdsys_fpga.h')
-rw-r--r-- | include/gdsys_fpga.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h index 1fccd27..c0b1b5c 100644 --- a/include/gdsys_fpga.h +++ b/include/gdsys_fpga.h @@ -50,6 +50,9 @@ typedef struct ihs_osd { u16 features; u16 control; u16 xy_size; + u16 xy_scale; + u16 x_pos; + u16 y_pos; } ihs_osd_t; #ifdef CONFIG_IO @@ -79,7 +82,7 @@ typedef struct ihs_fpga { u16 reserved_2[93]; /* 0x0044 */ u16 reflection_high; /* 0x00fe */ ihs_osd_t osd; /* 0x0100 */ - u16 reserved_3[892]; /* 0x0108 */ + u16 reserved_3[88]; /* 0x010e */ u16 videomem; /* 0x0800 */ } ihs_fpga_t; #endif @@ -94,13 +97,13 @@ typedef struct ihs_fpga { u16 extended_interrupt; /* 0x001c */ u16 reserved_1[9]; /* 0x001e */ ihs_i2c_t i2c; /* 0x0030 */ - u16 reserved_2[35]; /* 0x0038 */ - u16 reflection_high; /* 0x007e */ - u16 reserved_3[15]; /* 0x0080 */ + u16 reserved_2[16]; /* 0x0038 */ + u16 mpc3w_control; /* 0x0058 */ + u16 reserved_3[34]; /* 0x005a */ u16 videocontrol; /* 0x009e */ u16 reserved_4[176]; /* 0x00a0 */ ihs_osd_t osd; /* 0x0200 */ - u16 reserved_5[764]; /* 0x0208 */ + u16 reserved_5[761]; /* 0x020e */ u16 videomem; /* 0x0800 */ } ihs_fpga_t; #endif |