diff options
author | Tom Rini <trini@ti.com> | 2015-02-10 10:40:43 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2015-02-10 10:40:43 -0500 |
commit | 307367eaffc8638e10ba1784fc66bfe623ae79e2 (patch) | |
tree | 087641ed4c29320f8759cda28e377e36ff82cb78 /arch/arm/include/asm/arch-mx6/imx-regs.h | |
parent | a4fb5df214c7e8d5bc949c1068d92252f105427a (diff) | |
parent | aee0013e53b339a573e2a8d66062fe87765aa3bd (diff) | |
download | u-boot-imx-307367eaffc8638e10ba1784fc66bfe623ae79e2.zip u-boot-imx-307367eaffc8638e10ba1784fc66bfe623ae79e2.tar.gz u-boot-imx-307367eaffc8638e10ba1784fc66bfe623ae79e2.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/include/asm/arch-mx6/imx-regs.h')
-rw-r--r-- | arch/arm/include/asm/arch-mx6/imx-regs.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index c968600..ae88b6e 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -88,8 +88,8 @@ #define AIPS2_ARB_BASE_ADDR 0x02100000 #define AIPS2_ARB_END_ADDR 0x021FFFFF #ifdef CONFIG_MX6SX -#define AIPS3_BASE_ADDR 0x02200000 -#define AIPS3_END_ADDR 0x022FFFFF +#define AIPS3_ARB_BASE_ADDR 0x02200000 +#define AIPS3_ARB_END_ADDR 0x022FFFFF #define WEIM_ARB_BASE_ADDR 0x50000000 #define WEIM_ARB_END_ADDR 0x57FFFFFF #define QSPI0_AMBA_BASE 0x60000000 @@ -624,12 +624,16 @@ struct fuse_bank0_regs { u32 rsvd1[3]; u32 uid_high; u32 rsvd2[3]; - u32 rsvd3[4]; - u32 rsvd4[4]; - u32 rsvd5[4]; + u32 cfg2; + u32 rsvd3[3]; + u32 cfg3; + u32 rsvd4[3]; + u32 cfg4; + u32 rsvd5[3]; u32 cfg5; u32 rsvd6[3]; - u32 rsvd7[4]; + u32 cfg6; + u32 rsvd7[3]; }; #ifdef CONFIG_MX6SX |