Merge branch 'exynos/pwm-clocksource' into late/multiplatform

[~andy/linux] / arch / arm / plat-samsung / include / plat / sdhci.h

diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h
index 9b87f38fc4f400e24332d00bffabe08e6cfb56cd..1e0aab08c13f36a05f16f54b5be7a1781dda6a5c 100644 (file)
--- a/arch/arm/plat-samsung/include/plat/sdhci.h
+++ b/arch/arm/plat-samsung/include/plat/sdhci.h
@@ -18,62 +18,9 @@
 #ifndef __PLAT_S3C_SDHCI_H
 #define __PLAT_S3C_SDHCI_H __FILE__
 
+#include <linux/platform_data/mmc-sdhci-s3c.h>
 #include <plat/devs.h>
 
-struct platform_device;
-struct mmc_host;
-struct mmc_card;
-struct mmc_ios;
-
-enum cd_types {
-       S3C_SDHCI_CD_INTERNAL,  /* use mmc internal CD line */
-       S3C_SDHCI_CD_EXTERNAL,  /* use external callback */
-       S3C_SDHCI_CD_GPIO,      /* use external gpio pin for CD line */
-       S3C_SDHCI_CD_NONE,      /* no CD line, use polling to detect card */
-       S3C_SDHCI_CD_PERMANENT, /* no CD line, card permanently wired to host */
-};
-
-/**
- * struct s3c_sdhci_platdata() - Platform device data for Samsung SDHCI
- * @max_width: The maximum number of data bits supported.
- * @host_caps: Standard MMC host capabilities bit field.
- * @host_caps2: The second standard MMC host capabilities bit field.
- * @cd_type: Type of Card Detection method (see cd_types enum above)
- * @ext_cd_init: Initialize external card detect subsystem. Called on
- *              sdhci-s3c driver probe when cd_type == S3C_SDHCI_CD_EXTERNAL.
- *              notify_func argument is a callback to the sdhci-s3c driver
- *              that triggers the card detection event. Callback arguments:
- *              dev is pointer to platform device of the host controller,
- *              state is new state of the card (0 - removed, 1 - inserted).
- * @ext_cd_cleanup: Cleanup external card detect subsystem. Called on
- *              sdhci-s3c driver remove when cd_type == S3C_SDHCI_CD_EXTERNAL.
- *              notify_func argument is the same callback as for ext_cd_init.
- * @ext_cd_gpio: gpio pin used for external CD line, valid only if
- *              cd_type == S3C_SDHCI_CD_GPIO
- * @ext_cd_gpio_invert: invert values for external CD gpio line
- * @cfg_gpio: Configure the GPIO for a specific card bit-width
- *
- * Initialisation data specific to either the machine or the platform
- * for the device driver to use or call-back when configuring gpio or
- * card speed information.
-*/
-struct s3c_sdhci_platdata {
-       unsigned int    max_width;
-       unsigned int    host_caps;
-       unsigned int    host_caps2;
-       unsigned int    pm_caps;
-       enum cd_types   cd_type;
-
-       int             ext_cd_gpio;
-       bool            ext_cd_gpio_invert;
-       int     (*ext_cd_init)(void (*notify_func)(struct platform_device *,
-                                                  int state));
-       int     (*ext_cd_cleanup)(void (*notify_func)(struct platform_device *,
-                                                     int state));
-
-       void    (*cfg_gpio)(struct platform_device *dev, int width);
-};
-
 /* s3c_sdhci_set_platdata() - common helper for setting SDHCI platform data
  * @pd: The default platform data for this device.
  * @set: Pointer to the platform data to fill in.
@@ -378,5 +325,4 @@ static inline void s3c_sdhci_setname(int id, char *name)
                break;
        }
 }
-
 #endif /* __PLAT_S3C_SDHCI_H */