diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-10-06 06:12:45 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-10-06 06:12:45 +0200 |
commit | 00d33182e6af7a15b4d3d1d94ad90c73e85f9b9c (patch) | |
tree | 4a798a4325c85e25ddd63ae2c218dbbc3f050fe5 | |
parent | ebde8820a04dd73a09f50ba84b8cf8ec3773d6ba (diff) | |
download | barebox-00d33182e6af7a15b4d3d1d94ad90c73e85f9b9c.tar.gz barebox-00d33182e6af7a15b4d3d1d94ad90c73e85f9b9c.tar.xz |
dts: update to v4.14-rc2
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | dts/Bindings/clock/st,stm32h7-rcc.txt | 2 | ||||
-rw-r--r-- | dts/Bindings/security/tpm/tpm-i2c.txt | 6 | ||||
-rw-r--r-- | dts/Bindings/vendor-prefixes.txt | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/dts/Bindings/clock/st,stm32h7-rcc.txt b/dts/Bindings/clock/st,stm32h7-rcc.txt index a135504c7d..cac24ee10b 100644 --- a/dts/Bindings/clock/st,stm32h7-rcc.txt +++ b/dts/Bindings/clock/st,stm32h7-rcc.txt @@ -32,7 +32,7 @@ Example: compatible = "st,stm32h743-rcc", "st,stm32-rcc"; reg = <0x58024400 0x400>; #reset-cells = <1>; - #clock-cells = <2>; + #clock-cells = <1>; clocks = <&clk_hse>, <&clk_lse>, <&clk_i2s_ckin>; st,syscfg = <&pwrcfg>; diff --git a/dts/Bindings/security/tpm/tpm-i2c.txt b/dts/Bindings/security/tpm/tpm-i2c.txt index 3eca6de636..a65d7b71e8 100644 --- a/dts/Bindings/security/tpm/tpm-i2c.txt +++ b/dts/Bindings/security/tpm/tpm-i2c.txt @@ -8,6 +8,12 @@ Required properties: the firmware event log - linux,sml-size : size of the memory allocated for the firmware event log +Optional properties: + +- powered-while-suspended: present when the TPM is left powered on between + suspend and resume (makes the suspend/resume + callbacks do nothing). + Example (for OpenPower Systems with Nuvoton TPM 2.0 on I2C) ---------------------------------------------------------- diff --git a/dts/Bindings/vendor-prefixes.txt b/dts/Bindings/vendor-prefixes.txt index 1ea1fd4232..1afd298edd 100644 --- a/dts/Bindings/vendor-prefixes.txt +++ b/dts/Bindings/vendor-prefixes.txt @@ -3,8 +3,8 @@ Device tree binding vendor prefix registry. Keep list in alphabetical order. This isn't an exhaustive list, but you should add new prefixes to it before using them to avoid name-space collisions. -abcn Abracon Corporation abilis Abilis Systems +abracon Abracon Corporation actions Actions Semiconductor Co., Ltd. active-semi Active-Semi International Inc ad Avionic Design GmbH |