mmc: sdhci-pxa: move platform data to include/linux/platform_data

As suggested by Arnd, move platform data to include/linux/platform_data
in order to improve build coverage for the driver.

Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Chris Ball <cjb@laptop.org>

2 files changed, 1 insertions, 61 deletions

diff --git a/arch/arm/mach-mmp/include/mach/mmp2.h b/arch/arm/mach-mmp/include/mach/mmp2.h
index 2cbf6df09b82..de7b88826ad7 100644
--- a/arch/arm/mach-mmp/include/mach/mmp2.h
+++ b/arch/arm/mach-mmp/include/mach/mmp2.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_MACH_MMP2_H
 #define __ASM_MACH_MMP2_H
 
-#include <plat/sdhci.h>
+#include <linux/platform_data/pxa_sdhci.h>
 
 struct sys_timer;
 
diff --git a/arch/arm/plat-pxa/include/plat/sdhci.h b/arch/arm/plat-pxa/include/plat/sdhci.h
deleted file mode 100644
index 800ebc149fc1..000000000000
--- a/arch/arm/plat-pxa/include/plat/sdhci.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* linux/arch/arm/plat-pxa/include/plat/sdhci.h
- *
- * Copyright 2010 Marvell
- *	Zhangfei Gao <zhangfei.gao@marvell.com>
- *
- * PXA Platform - SDHCI platform data definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __PLAT_PXA_SDHCI_H
-#define __PLAT_PXA_SDHCI_H
-
-/* pxa specific flag */
-/* Require clock free running */
-#define PXA_FLAG_ENABLE_CLOCK_GATING (1<<0)
-/* card always wired to host, like on-chip emmc */
-#define PXA_FLAG_CARD_PERMANENT	(1<<1)
-/* Board design supports 8-bit data on SD/SDIO BUS */
-#define PXA_FLAG_SD_8_BIT_CAPABLE_SLOT (1<<2)
-
-/*
- * struct pxa_sdhci_platdata() - Platform device data for PXA SDHCI
- * @flags: flags for platform requirement
- * @clk_delay_cycles:
- *	mmp2: each step is roughly 100ps, 5bits width
- *	pxa910: each step is 1ns, 4bits width
- * @clk_delay_sel: select clk_delay, used on pxa910
- *	0: choose feedback clk
- *	1: choose feedback clk + delay value
- *	2: choose internal clk
- * @clk_delay_enable: enable clk_delay or not, used on pxa910
- * @ext_cd_gpio: gpio pin used for external CD line
- * @ext_cd_gpio_invert: invert values for external CD gpio line
- * @max_speed: the maximum speed supported
- * @host_caps: Standard MMC host capabilities bit field.
- * @quirks: quirks of platfrom
- * @pm_caps: pm_caps of platfrom
- */
-struct sdhci_pxa_platdata {
-	unsigned int	flags;
-	unsigned int	clk_delay_cycles;
-	unsigned int	clk_delay_sel;
-	bool		clk_delay_enable;
-	unsigned int	ext_cd_gpio;
-	bool		ext_cd_gpio_invert;
-	unsigned int	max_speed;
-	unsigned int	host_caps;
-	unsigned int	quirks;
-	unsigned int	pm_caps;
-};
-
-struct sdhci_pxa {
-	u8	clk_enable;
-	u8	power_mode;
-};
-
-#endif /* __PLAT_PXA_SDHCI_H */