diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-13 18:32:26 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-13 18:32:26 +0100 |
| commit | 63f347ec4ca94e3b57c6c719e4acaec81b61dc7a (patch) | |
| tree | 9391d740c7646cb7808acd6a14d00e6f42cf4fec /include/fdtdec.h | |
| parent | 08798026f24bd7c706e70372f8c323f0702c9a15 (diff) | |
| parent | b627eb461bb281a00b543e72e74edc197b5f7b5e (diff) | |
| download | u-boot-imx-63f347ec4ca94e3b57c6c719e4acaec81b61dc7a.zip u-boot-imx-63f347ec4ca94e3b57c6c719e4acaec81b61dc7a.tar.gz u-boot-imx-63f347ec4ca94e3b57c6c719e4acaec81b61dc7a.tar.bz2 | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/fdtdec.h')
| -rw-r--r-- | include/fdtdec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/fdtdec.h b/include/fdtdec.h index 19bab79..63027bd 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -79,8 +79,10 @@ enum fdt_compat_id { COMPAT_SAMSUNG_EXYNOS5_USB3_PHY,/* Exynos phy controller for usb3.0 */ COMPAT_SAMSUNG_EXYNOS_TMU, /* Exynos TMU */ COMPAT_SAMSUNG_EXYNOS_FIMD, /* Exynos Display controller */ + COMPAT_SAMSUNG_EXYNOS_MIPI_DSI, /* Exynos mipi dsi */ COMPAT_SAMSUNG_EXYNOS5_DP, /* Exynos Display port controller */ COMPAT_SAMSUNG_EXYNOS5_DWMMC, /* Exynos5 DWMMC controller */ + COMPAT_SAMSUNG_EXYNOS_MMC, /* Exynos MMC controller */ COMPAT_SAMSUNG_EXYNOS_SERIAL, /* Exynos UART */ COMPAT_MAXIM_MAX77686_PMIC, /* MAX77686 PMIC */ COMPAT_GENERIC_SPI_FLASH, /* Generic SPI Flash chip */ |