diff options
author | Tom Rini <trini@ti.com> | 2014-11-24 12:02:12 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-11-24 12:02:12 -0500 |
commit | dee332ffb735f65ab922118791a583c17bb0b795 (patch) | |
tree | d07bc0821792831aa4baeb27868252c2d32c7738 /arch/arm/include/asm/arch-mx5 | |
parent | 1739564e753bc3a8097f8937a3cbe738bdaaed5d (diff) | |
parent | e7eb277dced570f177d75d56f40219d9dc599ed1 (diff) | |
download | u-boot-imx-dee332ffb735f65ab922118791a583c17bb0b795.zip u-boot-imx-dee332ffb735f65ab922118791a583c17bb0b795.tar.gz u-boot-imx-dee332ffb735f65ab922118791a583c17bb0b795.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/include/asm/arch-mx5')
-rw-r--r-- | arch/arm/include/asm/arch-mx5/imx-regs.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h index 054c680..f059d0f 100644 --- a/arch/arm/include/asm/arch-mx5/imx-regs.h +++ b/arch/arm/include/asm/arch-mx5/imx-regs.h @@ -202,11 +202,6 @@ */ #define WBED 1 -#define CS0_128 0 -#define CS0_64M_CS1_64M 1 -#define CS0_64M_CS1_32M_CS2_32M 2 -#define CS0_32M_CS1_32M_CS2_32M_CS3_32M 3 - /* * CSPI register definitions */ @@ -414,8 +409,7 @@ struct weim { #if defined(CONFIG_MX51) struct iomuxc { - u32 gpr0; - u32 gpr1; + u32 gpr[2]; u32 omux0; u32 omux1; u32 omux2; @@ -424,9 +418,7 @@ struct iomuxc { }; #elif defined(CONFIG_MX53) struct iomuxc { - u32 gpr0; - u32 gpr1; - u32 gpr2; + u32 gpr[3]; u32 omux0; u32 omux1; u32 omux2; |