diff options
author | Tom Rini <trini@ti.com> | 2014-01-13 08:41:04 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-01-13 08:41:04 -0500 |
commit | d104a0c6a19da2d35cfae447e909b5bda727895a (patch) | |
tree | e0ebd05d262e3dd3e19628c67503727f2ab9bcd7 | |
parent | 3603e31db54ddba820b7a7b9c7659e272f8c65de (diff) | |
parent | d47c961695dd60ed7e54dc61c16ef3f3173fe3ea (diff) | |
download | u-boot-imx-d104a0c6a19da2d35cfae447e909b5bda727895a.zip u-boot-imx-d104a0c6a19da2d35cfae447e909b5bda727895a.tar.gz u-boot-imx-d104a0c6a19da2d35cfae447e909b5bda727895a.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-video
-rw-r--r-- | drivers/video/ipu_regs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/ipu_regs.h b/drivers/video/ipu_regs.h index 73e57ea..21e9c99 100644 --- a/drivers/video/ipu_regs.h +++ b/drivers/video/ipu_regs.h @@ -171,7 +171,7 @@ struct ipu_cm { u32 gpr; u32 reserved0[26]; u32 ch_db_mode_sel[2]; - u32 reserved1[16]; + u32 reserved1[4]; u32 alt_ch_db_mode_sel[2]; u32 reserved2[2]; u32 ch_trb_mode_sel[2]; @@ -188,7 +188,7 @@ struct ipu_idmac { u32 sub_addr[5]; u32 bndm_en[2]; u32 sc_cord[2]; - u32 reserved[45]; + u32 reserved[44]; u32 ch_busy[2]; }; |