diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-26 10:40:13 +0100 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-26 10:40:13 +0100 |
commit | ebd749da69f423a26222d2cdde9a77007fd8b4b7 (patch) | |
tree | ea0bff7917f8695f31ce4da58b01d298ab2d981a /include/fdtdec.h | |
parent | 412665b46134f93464c09405e02f08ac9c62526d (diff) | |
parent | f789be6086f3e6302fe4b163fa9b7bd6b358c4ce (diff) | |
download | u-boot-imx-ebd749da69f423a26222d2cdde9a77007fd8b4b7.zip u-boot-imx-ebd749da69f423a26222d2cdde9a77007fd8b4b7.tar.gz u-boot-imx-ebd749da69f423a26222d2cdde9a77007fd8b4b7.tar.bz2 |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
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 4fd1b67..cb520a6 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -75,6 +75,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 */ |