diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-02 06:43:48 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-02 06:43:48 (GMT) |
| commit | cc49da249cf2f380d2fed5571fad65ce6494fc95 (patch) | |
| tree | 00bf437b6a370c0640d5fafd93780406d3531ebb /include/fdtdec.h | |
| parent | 9637a1bb896efe392a58dd2772e2c3fcb646409d (diff) | |
| parent | 567802bbd6bf1c809d37fef9244fc8a692244e73 (diff) | |
| download | u-boot-cc49da249cf2f380d2fed5571fad65ce6494fc95.tar.xz | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/fdtdec.h')
| -rw-r--r-- | include/fdtdec.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/fdtdec.h b/include/fdtdec.h index 3196cf6..a7e6ee7 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -81,7 +81,7 @@ enum fdt_compat_id { 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_DWMMC, /* Exynos DWMMC controller */ COMPAT_SAMSUNG_EXYNOS_MMC, /* Exynos MMC controller */ COMPAT_SAMSUNG_EXYNOS_SERIAL, /* Exynos UART */ COMPAT_MAXIM_MAX77686_PMIC, /* MAX77686 PMIC */ @@ -92,6 +92,8 @@ enum fdt_compat_id { COMPAT_SAMSUNG_EXYNOS5_I2C, /* Exynos5 High Speed I2C Controller */ COMPAT_SANDBOX_HOST_EMULATION, /* Sandbox emulation of a function */ COMPAT_SANDBOX_LCD_SDL, /* Sandbox LCD emulation with SDL */ + COMPAT_TI_TPS65090, /* Texas Instrument TPS65090 */ + COMPAT_NXP_PTN3460, /* NXP PTN3460 DP/LVDS bridge */ COMPAT_COUNT, }; |