diff options
author | Tom Rini <trini@konsulko.com> | 2015-08-31 11:43:47 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-08-31 11:43:47 -0400 |
commit | 80cd58b99e8690b05e8537dbf76276e24fcfa652 (patch) | |
tree | 0684c14480ab87bb3a74c1c70275b5fdc9c8e3c9 /arch/x86 | |
parent | 7c0e5d865ff0b86dfce492b656238919c659d756 (diff) | |
parent | 897705ec39682ab3bf5bb87bc49d7a491d522051 (diff) | |
download | talos-obmc-uboot-80cd58b99e8690b05e8537dbf76276e24fcfa652.tar.gz talos-obmc-uboot-80cd58b99e8690b05e8537dbf76276e24fcfa652.zip |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/dts/chromebook_link.dts | 5 | ||||
-rw-r--r-- | arch/x86/dts/chromebox_panther.dts | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/dts/chromebook_link.dts b/arch/x86/dts/chromebook_link.dts index ad390bf117..4291141dfe 100644 --- a/arch/x86/dts/chromebook_link.dts +++ b/arch/x86/dts/chromebook_link.dts @@ -237,6 +237,11 @@ }; }; + tpm { + reg = <0xfed40000 0x5000>; + compatible = "infineon,slb9635lpc"; + }; + microcode { update@0 { #include "microcode/m12306a9_0000001b.dtsi" diff --git a/arch/x86/dts/chromebox_panther.dts b/arch/x86/dts/chromebox_panther.dts index 84eae3ab65..36feb96a94 100644 --- a/arch/x86/dts/chromebox_panther.dts +++ b/arch/x86/dts/chromebox_panther.dts @@ -62,4 +62,9 @@ }; }; + tpm { + reg = <0xfed40000 0x5000>; + compatible = "infineon,slb9635lpc"; + }; + }; |