global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace

[platform/kernel/u-boot.git] / arch / arm / include / asm / omap_mmc.h

diff --git a/arch/arm/include/asm/omap_mmc.h b/arch/arm/include/asm/omap_mmc.h
index 635ce1e..7933ad5 100644 (file)
--- a/arch/arm/include/asm/omap_mmc.h
+++ b/arch/arm/include/asm/omap_mmc.h
@@ -26,6 +26,9 @@
 #define OMAP_MMC_H_
 
 #include <mmc.h>
+#ifndef __ASSEMBLY__
+#include <linux/bitops.h>
+#endif
 
 struct hsmmc {
 #ifndef CONFIG_OMAP34XX
@@ -67,9 +70,9 @@ struct hsmmc {
 struct omap_hsmmc_plat {
        struct mmc_config cfg;
        struct hsmmc *base_addr;
-       struct mmc mmc;
-       bool cd_inverted;
+       struct mmc *mmc;
        u32 controller_flags;
+       const char *hw_rev;
 };
 
 /*
@@ -171,10 +174,6 @@ struct omap_hsmmc_plat {
 #define VS30_3V0SUP                    BIT(25)
 #define VS18_1V8SUP                    BIT(26)
 
-#define IOV_3V3                                3300000
-#define IOV_3V0                                3000000
-#define IOV_1V8                                1800000
-
 #define AC12_ET                                BIT(22)
 #define AC12_V1V8_SIGEN                        BIT(19)
 #define AC12_SCLK_SEL                  BIT(23)
@@ -202,7 +201,11 @@ struct omap_hsmmc_plat {
 #define MMC_CMD0       (INDEX(0)  | RSP_TYPE_NONE | DP_NO_DATA | DDIR_WRITE)
 
 /* Clock Configurations and Macros */
+#ifdef CONFIG_OMAP54XX
+#define MMC_CLOCK_REFERENCE    192 /* MHz */
+#else
 #define MMC_CLOCK_REFERENCE    96 /* MHz */
+#endif
 
 /* DLL */
 #define DLL_SWT                        BIT(20)
@@ -223,6 +226,12 @@ struct omap_hsmmc_plat {
                IE_DTO | IE_CIE | IE_CEB | IE_CCRC | IE_ADMAE | IE_CTO |\
                IE_BRR | IE_BWR | IE_TC | IE_CC)
 
+#define CON_CLKEXTFREE         BIT(16)
+#define CON_PADEN              BIT(15)
+#define PSTATE_CLEV            BIT(24)
+#define PSTATE_DLEV            (0xF << 20)
+#define PSTATE_DLEV_DAT0       (0x1 << 20)
+
 int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
                int wp_gpio);