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 /lib | |
| parent | 08798026f24bd7c706e70372f8c323f0702c9a15 (diff) | |
| parent | b627eb461bb281a00b543e72e74edc197b5f7b5e (diff) | |
| download | talos-obmc-uboot-63f347ec4ca94e3b57c6c719e4acaec81b61dc7a.tar.gz talos-obmc-uboot-63f347ec4ca94e3b57c6c719e4acaec81b61dc7a.zip | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fdtdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 1fecab3fbc..be04598902 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -52,8 +52,10 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(SAMSUNG_EXYNOS5_USB3_PHY, "samsung,exynos5250-usb3-phy"), COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"), COMPAT(SAMSUNG_EXYNOS_FIMD, "samsung,exynos-fimd"), + COMPAT(SAMSUNG_EXYNOS_MIPI_DSI, "samsung,exynos-mipi-dsi"), COMPAT(SAMSUNG_EXYNOS5_DP, "samsung,exynos5-dp"), COMPAT(SAMSUNG_EXYNOS5_DWMMC, "samsung,exynos5250-dwmmc"), + COMPAT(SAMSUNG_EXYNOS_MMC, "samsung,exynos-mmc"), COMPAT(SAMSUNG_EXYNOS_SERIAL, "samsung,exynos4210-uart"), COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"), COMPAT(GENERIC_SPI_FLASH, "spi-flash"), |
