summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-01-26 17:26:24 (GMT)
committerTom Rini <trini@konsulko.com>2017-01-26 17:26:24 (GMT)
commitcf4128e53caa4f7b0a6586fc3f10690d5c05db31 (patch)
tree2e953d14e76609fadaf1acb8593b46c38c604cdc /include
parentf59f07ece5ec78a8fc2f0e06a80ff66029002629 (diff)
parente559ef1ae80c1bde942ad9c62932de20e2b68cef (diff)
downloadu-boot-fsl-qoriq-cf4128e53caa4f7b0a6586fc3f10690d5c05db31.tar.xz
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'include')
-rw-r--r--include/configs/mvebu_armada-8k.h3
-rw-r--r--include/configs/mvebu_db-88f3720.h3
-rw-r--r--include/sdhci.h1
3 files changed, 7 insertions, 0 deletions
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 27dc628..58b8801 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -114,6 +114,9 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
+/* MMC/SD IP block */
+#define CONFIG_GENERIC_MMC
+
#define CONFIG_SUPPORT_VFAT
/* DISK Partition support */
diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_db-88f3720.h
index caaad86..49a4d89 100644
--- a/include/configs/mvebu_db-88f3720.h
+++ b/include/configs/mvebu_db-88f3720.h
@@ -126,6 +126,9 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
+/* MMC/SD IP block */
+#define CONFIG_GENERIC_MMC
+
#define CONFIG_SUPPORT_VFAT
/* DISK Partition support */
diff --git a/include/sdhci.h b/include/sdhci.h
index fdef7c4..6a43271 100644
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -235,6 +235,7 @@ struct sdhci_ops {
#endif
int (*get_cd)(struct sdhci_host *host);
void (*set_control_reg)(struct sdhci_host *host);
+ void (*set_ios_post)(struct sdhci_host *host);
void (*set_clock)(struct sdhci_host *host, u32 div);
};