We need to remove this from plat for ARM common zImage
support.
Cc: Chris Ball c...@laptop.org
Cc: Venkatraman S svenk...@ti.com
Cc: linux-...@vger.kernel.org
Signed-off-by: Tony Lindgren t...@atomide.com
---
arch/arm/mach-omap1/board-h2-mmc.c |5 +--
arch/arm/mach-omap1/board-h3-mmc.c |3 +-
arch/arm/mach-omap1/board-htcherald.c |2 +
arch/arm/mach-omap1/board-innovator.c |2 +
arch/arm/mach-omap1/board-nokia770.c |2 +
arch/arm/mach-omap1/board-sx1-mmc.c|3 +-
arch/arm/mach-omap1/devices.c |2 +
arch/arm/mach-omap1/mmc.h | 18 +++
arch/arm/mach-omap2/board-4430sdp.c|2 +
arch/arm/mach-omap2/board-n8x0.c |2 +
arch/arm/mach-omap2/board-omap4panda.c |2 +
arch/arm/mach-omap2/board-rm680.c |2 +
arch/arm/mach-omap2/hsmmc.c|2 +
arch/arm/mach-omap2/mmc.h | 23 ++
arch/arm/mach-omap2/msdi.c |2 +
arch/arm/mach-omap2/omap4-common.c |2 +
arch/arm/mach-omap2/omap_hwmod_2420_data.c |2 +
arch/arm/mach-omap2/omap_hwmod_2430_data.c |2 +
arch/arm/mach-omap2/omap_hwmod_33xx_data.c |2 +
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |2 +
arch/arm/mach-omap2/omap_hwmod_44xx_data.c |2 +
drivers/mmc/host/omap.c|3 +-
drivers/mmc/host/omap_hsmmc.c |2 +
include/linux/platform_data/mmc-omap.h | 45 +---
24 files changed, 67 insertions(+), 67 deletions(-)
create mode 100644 arch/arm/mach-omap1/mmc.h
create mode 100644 arch/arm/mach-omap2/mmc.h
rename arch/arm/plat-omap/include/plat/mmc.h =
include/linux/platform_data/mmc-omap.h (80%)
diff --git a/arch/arm/mach-omap1/board-h2-mmc.c
b/arch/arm/mach-omap1/board-h2-mmc.c
index e1362ce..7119ef2 100644
--- a/arch/arm/mach-omap1/board-h2-mmc.c
+++ b/arch/arm/mach-omap1/board-h2-mmc.c
@@ -13,12 +13,11 @@
*/
#include linux/gpio.h
#include linux/platform_device.h
-
+#include linux/platform_data/gpio-omap.h
#include linux/i2c/tps65010.h
-#include plat/mmc.h
-
#include board-h2.h
+#include mmc.h
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
diff --git a/arch/arm/mach-omap1/board-h3-mmc.c
b/arch/arm/mach-omap1/board-h3-mmc.c
index c74daac..17d7791 100644
--- a/arch/arm/mach-omap1/board-h3-mmc.c
+++ b/arch/arm/mach-omap1/board-h3-mmc.c
@@ -16,9 +16,8 @@
#include linux/i2c/tps65010.h
-#include plat/mmc.h
-
#include board-h3.h
+#include mmc.h
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
diff --git a/arch/arm/mach-omap1/board-htcherald.c
b/arch/arm/mach-omap1/board-htcherald.c
index 87ab208..f23200c 100644
--- a/arch/arm/mach-omap1/board-htcherald.c
+++ b/arch/arm/mach-omap1/board-htcherald.c
@@ -43,7 +43,7 @@
#include asm/mach/arch.h
#include mach/omap7xx.h
-#include plat/mmc.h
+#include mmc.h
#include mach/irqs.h
#include mach/usb.h
diff --git a/arch/arm/mach-omap1/board-innovator.c
b/arch/arm/mach-omap1/board-innovator.c
index 06eb4e6..2b8977f 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -36,13 +36,13 @@
#include ../plat-omap/fpga.h
#include mach/tc.h
#include linux/platform_data/keypad-omap.h
-#include plat/mmc.h
#include mach/hardware.h
#include mach/usb.h
#include iomap.h
#include common.h
+#include mmc.h
/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
#define INNOVATOR1610_ETHR_START 0x04000300
diff --git a/arch/arm/mach-omap1/board-nokia770.c
b/arch/arm/mach-omap1/board-nokia770.c
index 7d5c06d..cb72f24 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -29,13 +29,13 @@
#include asm/mach/map.h
#include mach/mux.h
-#include plat/mmc.h
#include plat/clock.h
#include mach/hardware.h
#include mach/usb.h
#include common.h
+#include mmc.h
#define ADS7846_PENDOWN_GPIO 15
diff --git a/arch/arm/mach-omap1/board-sx1-mmc.c
b/arch/arm/mach-omap1/board-sx1-mmc.c
index 5932d56..4fcf19c 100644
--- a/arch/arm/mach-omap1/board-sx1-mmc.c
+++ b/arch/arm/mach-omap1/board-sx1-mmc.c
@@ -16,9 +16,10 @@
#include linux/platform_device.h
#include mach/hardware.h
-#include plat/mmc.h
#include mach/board-sx1.h
+#include mmc.h
+
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
static int mmc_set_power(struct device *dev, int slot, int power_on,
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 552bda0..1cc4e18 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -22,7 +22,6 @@
#include mach/tc.h
#include mach/mux.h
#include plat/dma.h
-#include plat/mmc.h
#include mach/omap7xx.h
#include mach/camera.h
@@ -32,6 +31,7 @@
#include common.h
#include clock.h
+#include mmc.h
#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)
diff --git