diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-19 12:53:59 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-19 12:53:59 +0200 |
| commit | 69f14dc2fd64307f012381dd333a06001dec75dc (patch) | |
| tree | 1c520dfb9afd8406230a5382ebaf57b0b8cd6c5d /include/fdtdec.h | |
| parent | 847e6693ccb529bf8346db62876f38f0c4e04ade (diff) | |
| parent | ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f (diff) | |
| download | olio-uboot-2014.01-69f14dc2fd64307f012381dd333a06001dec75dc.tar.xz olio-uboot-2014.01-69f14dc2fd64307f012381dd333a06001dec75dc.zip | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Conflicts:
spl/Makefile
Diffstat (limited to 'include/fdtdec.h')
| -rw-r--r-- | include/fdtdec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/fdtdec.h b/include/fdtdec.h index 4e8032ba6..bc3b89bc0 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -89,6 +89,7 @@ enum fdt_compat_id { COMPAT_SAMSUNG_EXYNOS_TMU, /* Exynos TMU */ COMPAT_SAMSUNG_EXYNOS_FIMD, /* Exynos Display controller */ COMPAT_SAMSUNG_EXYNOS5_DP, /* Exynos Display port controller */ + COMPAT_SAMSUNG_EXYNOS5_DWMMC, /* Exynos5 DWMMC controller */ COMPAT_MAXIM_MAX77686_PMIC, /* MAX77686 PMIC */ COMPAT_GENERIC_SPI_FLASH, /* Generic SPI Flash chip */ COMPAT_MAXIM_98095_CODEC, /* MAX98095 Codec */ |