diff options
author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2009-01-29 04:07:50 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-03-13 05:33:44 -0400 |
commit | ccfe30a7c8329e85ae426813a1060e27e2547dd1 (patch) | |
tree | 3a1b77c46e084c4ea0236c315d949af72a678bf6 /arch/arm/mach-mx2/pcm038.c | |
parent | 16b71fdf97599f1b1b7f38418ee9922d9f117396 (diff) |
arm/imx2x: new IOMUX definitions
* removed iomux-mx1-mx2.h completely
* distributes the former contents to four different files (iomux-mx1.h,
iomux-mx21.h, iomux-mx27.h and the file iomux-mx2x.h, which is common to
both i.MX21 and i.MX27).
* adds all documented IOMUX definitions for i.MX21 and i.MX27
* fixes a few that were wrong (PD14_AOUT_FEC_CLR, PE16_AF_RTCK).
* don't silenly include <linux/io.h>
* and fixes all collateral damage from above
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx2/pcm038.c')
-rw-r--r-- | arch/arm/mach-mx2/pcm038.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-mx2/pcm038.c b/arch/arm/mach-mx2/pcm038.c index dfd4156da7d5..534fd9a4ff9f 100644 --- a/arch/arm/mach-mx2/pcm038.c +++ b/arch/arm/mach-mx2/pcm038.c | |||
@@ -20,11 +20,12 @@ | |||
20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
21 | #include <linux/mtd/physmap.h> | 21 | #include <linux/mtd/physmap.h> |
22 | #include <linux/mtd/plat-ram.h> | 22 | #include <linux/mtd/plat-ram.h> |
23 | #include <linux/io.h> | ||
23 | #include <asm/mach/arch.h> | 24 | #include <asm/mach/arch.h> |
24 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
25 | #include <mach/common.h> | 26 | #include <mach/common.h> |
26 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
27 | #include <mach/iomux-mx1-mx2.h> | 28 | #include <mach/iomux.h> |
28 | #include <asm/mach/time.h> | 29 | #include <asm/mach/time.h> |
29 | #include <mach/imx-uart.h> | 30 | #include <mach/imx-uart.h> |
30 | #include <mach/board-pcm038.h> | 31 | #include <mach/board-pcm038.h> |
@@ -170,7 +171,7 @@ static int mxc_fec_pins[] = { | |||
170 | PD11_AOUT_FEC_TX_CLK, | 171 | PD11_AOUT_FEC_TX_CLK, |
171 | PD12_AOUT_FEC_RXD0, | 172 | PD12_AOUT_FEC_RXD0, |
172 | PD13_AOUT_FEC_RX_DV, | 173 | PD13_AOUT_FEC_RX_DV, |
173 | PD14_AOUT_FEC_CLR, | 174 | PD14_AOUT_FEC_RX_CLK, |
174 | PD15_AOUT_FEC_COL, | 175 | PD15_AOUT_FEC_COL, |
175 | PD16_AIN_FEC_TX_ER, | 176 | PD16_AIN_FEC_TX_ER, |
176 | PF23_AIN_FEC_TX_EN | 177 | PF23_AIN_FEC_TX_EN |
@@ -217,7 +218,7 @@ static void __init pcm038_init(void) | |||
217 | mxc_register_device(&mxc_uart_device1, &uart_pdata[1]); | 218 | mxc_register_device(&mxc_uart_device1, &uart_pdata[1]); |
218 | mxc_register_device(&mxc_uart_device2, &uart_pdata[2]); | 219 | mxc_register_device(&mxc_uart_device2, &uart_pdata[2]); |
219 | 220 | ||
220 | mxc_gpio_mode(PE16_AF_RTCK); /* OWIRE */ | 221 | mxc_gpio_mode(PE16_AF_OWIRE); |
221 | mxc_register_device(&mxc_nand_device, &pcm038_nand_board_info); | 222 | mxc_register_device(&mxc_nand_device, &pcm038_nand_board_info); |
222 | 223 | ||
223 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 224 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |