diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-04 15:44:57 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-04 15:44:57 +0200 |
| commit | fed029f3c31b7d5df674b5090a13356b631918c7 (patch) | |
| tree | f1948b23396505a4f5568ab9d37800235b815e0b /lib | |
| parent | be08abc2429c2e9cbce3d0abc1d315171d683520 (diff) | |
| parent | 4fdebefa453a58c7b4ca653ab40f7a9791aba6c9 (diff) | |
| download | u-boot-imx-fed029f3c31b7d5df674b5090a13356b631918c7.zip u-boot-imx-fed029f3c31b7d5df674b5090a13356b631918c7.tar.gz u-boot-imx-fed029f3c31b7d5df674b5090a13356b631918c7.tar.bz2 | |
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 e17dd00..403babd 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -60,6 +60,8 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(SAMSUNG_EXYNOS_EHCI, "samsung,exynos-ehci"), COMPAT(SAMSUNG_EXYNOS_USB_PHY, "samsung,exynos-usb-phy"), COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"), + COMPAT(SAMSUNG_EXYNOS_FIMD, "samsung,exynos-fimd"), + COMPAT(SAMSUNG_EXYNOS5_DP, "samsung,exynos5-dp"), COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"), COMPAT(GENERIC_SPI_FLASH, "spi-flash"), COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"), |