ARM: MXS: move iomux definitions to iomux.h

mach/gpio.h is for the gpio API, so move unrelated stuff
away.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

arch/arm/boards/chumby_falconwing/falconwing.c

@@ -30,6 +30,7 @@
 #include <mach/mci.h>
 #include <mach/fb.h>
 #include <mach/usb.h>
+#include <mach/iomux.h>
 
 static struct mxs_mci_platform_data mci_pdata = {
 	.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED,

arch/arm/boards/freescale-mx23-evk/mx23-evk.c

@@ -26,6 +26,7 @@
 #include <mach/mci.h>
 #include <usb/fsl_usb2.h>
 #include <mach/usb.h>
+#include <mach/iomux.h>
 
 static struct mxs_mci_platform_data mci_pdata = {
 	.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED,

arch/arm/boards/freescale-mx28-evk/mx28-evk.c

@@ -29,6 +29,7 @@
 #include <mach/iomux-imx28.h>
 #include <mach/mci.h>
 #include <mach/fb.h>
+#include <mach/iomux.h>
 #include <mach/ocotp.h>
 #include <mach/devices.h>
 #include <spi/spi.h>

arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c

@@ -35,6 +35,7 @@
 #include <mach/imx-regs.h>
 #include <mach/clock.h>
 #include <mach/mci.h>
+#include <mach/iomux.h>
 
 static struct mxs_mci_platform_data mci_pdata = {
 	.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED,

arch/arm/boards/karo-tx28/tx28-stk5.c

@@ -28,6 +28,7 @@
 #include <mach/mci.h>
 #include <mach/fb.h>
 #include <mach/ocotp.h>
+#include <mach/iomux.h>
 
 static struct mxs_mci_platform_data mci_pdata = {
 	.caps = MMC_CAP_4_BIT_DATA,

arch/arm/boards/karo-tx28/tx28.c

@@ -22,6 +22,7 @@
 #include <generated/mach-types.h>
 #include <mach/imx-regs.h>
 #include <mach/devices.h>
+#include <mach/iomux.h>
 #include <asm/mmu.h>
 
 /* setup the CPU card internal signals */

arch/arm/mach-mxs/include/mach/gpio.h

@@ -16,17 +16,6 @@
 #ifndef __ASM_MACH_GPIO_H
 #define __ASM_MACH_GPIO_H
 
-#include <types.h>
-
-#if defined CONFIG_ARCH_IMX23
-# include <mach/iomux-imx23.h>
-#endif
-#if defined CONFIG_ARCH_IMX28
-# include <mach/iomux-imx28.h>
-#endif
-
 #include <asm-generic/gpio.h>
 
-void imx_gpio_mode(uint32_t);
-
 #endif /* __ASM_MACH_GPIO_H */

arch/arm/mach-mxs/include/mach/iomux.h

@@ -0,0 +1,30 @@
+/*
+ * (C) Copyright 2010 Juergen Beisert - Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __ASM_MACH_IOMUX_H
+#define __ASM_MACH_IOMUX_H
+
+#include <types.h>
+
+#if defined CONFIG_ARCH_IMX23
+# include <mach/iomux-imx23.h>
+#endif
+#if defined CONFIG_ARCH_IMX28
+# include <mach/iomux-imx28.h>
+#endif
+
+void imx_gpio_mode(uint32_t);
+
+#endif /* __ASM_MACH_IOMUX_H */

arch/arm/mach-mxs/iomux-imx.c

@@ -18,6 +18,7 @@
 #include <gpio.h>
 #include <errno.h>
 #include <io.h>
+#include <mach/iomux.h>
 #include <stmp-device.h>
 #include <mach/imx-regs.h>