Merge branch 'u-boot/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / fdtdec.h

diff --git a/include/fdtdec.h b/include/fdtdec.h
index 3b363be036acbf6999a7cda4be3cbbbfde2149c7..e7e3ff9e0384f10157a671ff36ee153654ae34bf 100644 (file)
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -77,6 +77,7 @@ enum fdt_compat_id {
        COMPAT_NVIDIA_TEGRA20_SDMMC,    /* Tegra20 SDMMC controller */
        COMPAT_NVIDIA_TEGRA20_SFLASH,   /* Tegra 2 SPI flash controller */
        COMPAT_NVIDIA_TEGRA20_SLINK,    /* Tegra 2 SPI SLINK controller */
+       COMPAT_NVIDIA_TEGRA114_SPI,     /* Tegra 114 SPI controller */
        COMPAT_SMSC_LAN9215,            /* SMSC 10/100 Ethernet LAN9215 */
        COMPAT_SAMSUNG_EXYNOS5_SROMC,   /* Exynos5 SROMC */
        COMPAT_SAMSUNG_S3C2440_I2C,     /* Exynos I2C Controller */
@@ -85,8 +86,10 @@ enum fdt_compat_id {
        COMPAT_SAMSUNG_EXYNOS_SPI,      /* Exynos SPI */
        COMPAT_SAMSUNG_EXYNOS_EHCI,     /* Exynos EHCI controller */
        COMPAT_SAMSUNG_EXYNOS_USB_PHY,  /* Exynos phy controller for usb2.0 */
+       COMPAT_SAMSUNG_EXYNOS_TMU,      /* Exynos TMU */
        COMPAT_MAXIM_MAX77686_PMIC,     /* MAX77686 PMIC */
        COMPAT_GENERIC_SPI_FLASH,       /* Generic SPI Flash chip */
+       COMPAT_MAXIM_98095_CODEC,       /* MAX98095 Codec */
 
        COMPAT_COUNT,
 };