summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-mx5/imx-regs.h
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-11-14 11:27:21 -0200
committerStefano Babic <sbabic@denx.de>2014-11-20 10:30:19 +0100
commit32c81ea65cc01103d3a615072690e7b5faf76656 (patch)
tree4b269b8ad31dbfa8136cd3f63cf2019bd1620868 /arch/arm/include/asm/arch-mx5/imx-regs.h
parent53b7f18044c44e7f3ea0ee10bb4cd775df3aaa3c (diff)
imx: consolidate set_chipselect_size function
Move MX5 specific set_chipselect_size function into generic i.MX part, such that MX6 based boards are able to use this function as well. While doing this the iomuxc gpr member needed to be consolidated between MX5 and MX6. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Diffstat (limited to 'arch/arm/include/asm/arch-mx5/imx-regs.h')
-rw-r--r--arch/arm/include/asm/arch-mx5/imx-regs.h12
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 054c680a5a..f059d0f664 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;