diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-26 09:51:09 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-26 09:51:09 +0100 |
| commit | 412665b46134f93464c09405e02f08ac9c62526d (patch) | |
| tree | 7d45bfd311e81d2d750c0c67edef17ceba17df3f /lib | |
| parent | b6379e15a70cc2e22486e5962927d9de374d877b (diff) | |
| parent | ce0c1bc13556fbf1bdfa2a4a27ca6744e7beb32a (diff) | |
| download | u-boot-imx-412665b46134f93464c09405e02f08ac9c62526d.zip u-boot-imx-412665b46134f93464c09405e02f08ac9c62526d.tar.gz u-boot-imx-412665b46134f93464c09405e02f08ac9c62526d.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 43f29f5..b232096 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -58,7 +58,9 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(SAMSUNG_EXYNOS_SPI, "samsung,exynos-spi"), COMPAT(SAMSUNG_EXYNOS_EHCI, "samsung,exynos-ehci"), COMPAT(SAMSUNG_EXYNOS_USB_PHY, "samsung,exynos-usb-phy"), + COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"), COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"), + COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"), }; const char *fdtdec_get_compatible(enum fdt_compat_id id) |