aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini2018-05-08 13:47:39 -0400
committerTom Rini2018-05-08 13:47:39 -0400
commit14249635b6aa7615f356099cfb349d0a820f9bed (patch)
treee8fcc22be59a77f9dbe200b63f08f9b741706429 /include
parent1ccd3f14ca0a481ce173cd0ce4fd1a66d50a4985 (diff)
parente1fd9e6bb88a3f42e7e89e9c59589dbf904efe23 (diff)
Merge git://git.denx.de/u-boot-mmc
Diffstat (limited to 'include')
-rw-r--r--include/fdtdec.h1
-rw-r--r--include/mmc.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/include/fdtdec.h b/include/fdtdec.h
index eca6e98b33c..5456a17d1a7 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -136,7 +136,6 @@ enum fdt_compat_id {
COMPAT_SAMSUNG_EXYNOS_MIPI_DSI, /* Exynos mipi dsi */
COMPAT_SAMSUNG_EXYNOS_DWMMC, /* Exynos DWMMC controller */
COMPAT_SAMSUNG_EXYNOS_MMC, /* Exynos MMC controller */
- COMPAT_MAXIM_MAX77686_PMIC, /* MAX77686 PMIC */
COMPAT_GENERIC_SPI_FLASH, /* Generic SPI Flash chip */
COMPAT_MAXIM_98095_CODEC, /* MAX98095 Codec */
COMPAT_SAMSUNG_EXYNOS5_I2C, /* Exynos5 High Speed I2C Controller */
diff --git a/include/mmc.h b/include/mmc.h
index d9611a0e9b5..534c317b43c 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -707,6 +707,9 @@ int mmc_voltage_to_mv(enum mmc_voltage voltage);
*/
int mmc_set_clock(struct mmc *mmc, uint clock, bool disable);
+#define MMC_CLK_ENABLE false
+#define MMC_CLK_DISABLE true
+
struct mmc *find_mmc_device(int dev_num);
int mmc_set_dev(int dev_num);
void print_mmc_devices(char separator);