applied patches from Freescale and Ka-Ro

[karo-tx-uboot.git] / include / fsl_esdhc.h

diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h
index 89b8304d5f7b7b24184b9812abf4f034579dcf8a..a0b1f5cf37f0d068c180f84c051fc18c73b520b2 100644 (file)
--- a/include/fsl_esdhc.h
+++ b/include/fsl_esdhc.h
@@ -2,7 +2,7 @@
  * FSL SD/MMC Defines
  *-------------------------------------------------------------------
  *
- * Copyright 2007-2008, Freescale Semiconductor, Inc
+ * Copyright (C) 2007-2008, 2010 Freescale Semiconductor, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -32,7 +32,9 @@
 #define SYSCTL                 0x0002e02c
 #define SYSCTL_INITA           0x08000000
 #define SYSCTL_TIMEOUT_MASK    0x000f0000
-#define SYSCTL_CLOCK_MASK      0x00000fff
+#define SYSCTL_CLOCK_MASK      0x0000fff0
+#define SYSCTL_RSTA                    0x01000000
+#define SYSCTL_SDCLKEN         0x00000008
 #define SYSCTL_PEREN           0x00000004
 #define SYSCTL_HCKEN           0x00000002
 #define SYSCTL_IPGEN           0x00000001
@@ -86,6 +88,7 @@
 #define PRSSTAT_CDPL           (0x00040000)
 #define PRSSTAT_CINS           (0x00010000)
 #define PRSSTAT_BREN           (0x00000800)
+#define PRSSTAT_SDSTB          (0x00000008)
 #define PRSSTAT_DLA            (0x00000004)
 #define PRSSTAT_CICHB          (0x00000002)
 #define PRSSTAT_CIDHB          (0x00000001)
@@ -94,6 +97,7 @@
 #define PROCTL_INIT            0x00000020
 #define PROCTL_DTW_4           0x00000002
 #define PROCTL_DTW_8           0x00000004
+#define PROCTL_D3CD            0x00000008
 
 #define CMDARG                 0x0002e008
 
@@ -112,6 +116,7 @@
 #define XFERTYP_RSPTYP_48_BUSY 0x00030000
 #define XFERTYP_MSBSEL         0x00000020
 #define XFERTYP_DTDSEL         0x00000010
+#define XFERTYP_DDR_EN         0x00000008
 #define XFERTYP_AC12EN         0x00000004
 #define XFERTYP_BCEN           0x00000002
 #define XFERTYP_DMAEN          0x00000001
@@ -133,7 +138,7 @@
 #define BLKATTR                0x2e004
 #define BLKATTR_CNT(x) ((x & 0xffff) << 16)
 #define BLKATTR_SIZE(x)        (x & 0x1fff)
-#define MAX_BLK_CNT    0x7fff  /* so malloc will have enough room with 32M */
+#define MAX_BLK_CNT    0xffff  /* so malloc will have enough room with 32M */
 
 #define ESDHC_HOSTCAPBLT_VS18  0x04000000
 #define ESDHC_HOSTCAPBLT_VS30  0x02000000
@@ -142,8 +147,24 @@
 #define ESDHC_HOSTCAPBLT_DMAS  0x00400000
 #define ESDHC_HOSTCAPBLT_HSS   0x00200000
 
-#ifdef CONFIG_FSL_ESDHC
+#define ESDHC_HOSTVER_VVN_MASK         0x0000ff00
+#define ESDHC_HOSTVER_VVN_SHIFT                8
+#define ESDHC_HOSTVER_DDR_SUPPORT      0x13
+
+#define ESDHC_DLLCTRL_SLV_OVERRIDE_VAL 12
+#define ESDHC_DLLCTRL_SLV_OVERRIDE_VAL_MASK    0x0000FC00
+#define ESDHC_DLLCTRL_SLV_OVERRIDE_VAL_SHIFT           10
+#define ESDHC_DLLCTRL_SLV_OVERRIDE             0x200
+
+struct fsl_esdhc_cfg {
+       u32     esdhc_base;
+       u32     no_snoop;
+       u32     clk_enable;
+};
+
+#if defined(CONFIG_FSL_ESDHC) || defined(CONFIG_IMX_MMC)
 int fsl_esdhc_mmc_init(bd_t *bis);
+int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg);
 void fdt_fixup_esdhc(void *blob, bd_t *bd);
 #else
 static inline int fsl_esdhc_mmc_init(bd_t *bis) { return -ENOSYS; }