diff options
| author | Tom Rini | 2017-01-26 12:26:24 -0500 |
|---|---|---|
| committer | Tom Rini | 2017-01-26 12:26:24 -0500 |
| commit | cf4128e53caa4f7b0a6586fc3f10690d5c05db31 (patch) | |
| tree | 2e953d14e76609fadaf1acb8593b46c38c604cdc /include | |
| parent | f59f07ece5ec78a8fc2f0e06a80ff66029002629 (diff) | |
| parent | e559ef1ae80c1bde942ad9c62932de20e2b68cef (diff) | |
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mvebu_armada-8k.h | 3 | ||||
| -rw-r--r-- | include/configs/mvebu_db-88f3720.h | 3 | ||||
| -rw-r--r-- | include/sdhci.h | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 27dc6282d4e..58b88016e2c 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 caaad862216..49a4d89ab92 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 fdef7c40c9a..6a43271e963 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); }; |