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 /lib | |
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 'lib')
-rw-r--r-- | lib/fdtdec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index b232096..d2166e6 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -50,6 +50,7 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(NVIDIA_TEGRA20_SDMMC, "nvidia,tegra20-sdhci"), COMPAT(NVIDIA_TEGRA20_SFLASH, "nvidia,tegra20-sflash"), COMPAT(NVIDIA_TEGRA20_SLINK, "nvidia,tegra20-slink"), + COMPAT(NVIDIA_TEGRA114_SPI, "nvidia,tegra114-spi"), COMPAT(SMSC_LAN9215, "smsc,lan9215"), COMPAT(SAMSUNG_EXYNOS5_SROMC, "samsung,exynos-sromc"), COMPAT(SAMSUNG_S3C2440_I2C, "samsung,s3c2440-i2c"), |