summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx2/mx27ads.c
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2009-01-29 10:07:50 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2009-03-13 10:33:44 +0100
commitccfe30a7c8329e85ae426813a1060e27e2547dd1 (patch)
tree3a1b77c46e084c4ea0236c315d949af72a678bf6 /arch/arm/mach-mx2/mx27ads.c
parent16b71fdf97599f1b1b7f38418ee9922d9f117396 (diff)
downloadop-kernel-dev-ccfe30a7c8329e85ae426813a1060e27e2547dd1.zip
op-kernel-dev-ccfe30a7c8329e85ae426813a1060e27e2547dd1.tar.gz
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/mx27ads.c')
-rw-r--r--arch/arm/mach-mx2/mx27ads.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx2/mx27ads.c b/arch/arm/mach-mx2/mx27ads.c
index 2b5c67f..7721c47 100644
--- a/arch/arm/mach-mx2/mx27ads.c
+++ b/arch/arm/mach-mx2/mx27ads.c
@@ -31,7 +31,7 @@
#include <asm/mach/map.h>
#include <mach/gpio.h>
#include <mach/imx-uart.h>
-#include <mach/iomux-mx1-mx2.h>
+#include <mach/iomux.h>
#include <mach/board-mx27ads.h>
#include "devices.h"
@@ -196,7 +196,7 @@ static int mxc_fec_pins[] = {
PD11_AOUT_FEC_TX_CLK,
PD12_AOUT_FEC_RXD0,
PD13_AOUT_FEC_RX_DV,
- PD14_AOUT_FEC_CLR,
+ PD14_AOUT_FEC_RX_CLK,
PD15_AOUT_FEC_COL,
PD16_AIN_FEC_TX_ER,
PF23_AIN_FEC_TX_EN
OpenPOWER on IntegriCloud