diff options
author | Tom Rini <trini@ti.com> | 2013-04-15 07:45:07 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-04-15 07:45:07 -0400 |
commit | 277f037074fbb73be10a7bff27079b6eb0a3bfbb (patch) | |
tree | fda7a8df71f7ac5b1a4082dd612d3f4cfd17bcf1 /lib/fdtdec.c | |
parent | e303be2d2819699a443b5eece5a04ecc380a9b61 (diff) | |
parent | 8732b0700d21588b4954d0f1b182f4c60725d228 (diff) | |
download | u-boot-imx-277f037074fbb73be10a7bff27079b6eb0a3bfbb.zip u-boot-imx-277f037074fbb73be10a7bff27079b6eb0a3bfbb.tar.gz u-boot-imx-277f037074fbb73be10a7bff27079b6eb0a3bfbb.tar.bz2 |
Merge branch 'tpm' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'lib/fdtdec.c')
-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 e17dd00..e93743c 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -63,6 +63,7 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"), COMPAT(GENERIC_SPI_FLASH, "spi-flash"), COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"), + COMPAT(INFINEON_SLB9635_TPM, "infineon,slb9635-tpm"), }; const char *fdtdec_get_compatible(enum fdt_compat_id id) |