summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2021-09-24 20:35:50 -0400
committerTom Rini <[email protected]>2021-09-24 20:35:50 -0400
commitbf0491f8d8c2f259b6b7356744b9e6e05be8f6f2 (patch)
treedecd8c20bc02d9039ce2ea6952e4642a71bc8190 /doc
parent7d1fcaea128ff689aea75deaf7f75d75d1b553d3 (diff)
parentcc5afabc9d32933578536401114f91bbecff158b (diff)
Merge branch '2021-09-24-assorted-updates' into next
- A few minor updates
Diffstat (limited to 'doc')
-rw-r--r--doc/device-tree-bindings/tpm2/tis-tpm2-spi.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/device-tree-bindings/tpm2/tis-tpm2-spi.txt b/doc/device-tree-bindings/tpm2/tis-tpm2-spi.txt
index 3a2ee4bd175..16f870225fd 100644
--- a/doc/device-tree-bindings/tpm2/tis-tpm2-spi.txt
+++ b/doc/device-tree-bindings/tpm2/tis-tpm2-spi.txt
@@ -6,7 +6,8 @@ Required properties:
- reg : SPI Chip select
Optional properties:
-- gpio-reset : Reset GPIO (if not connected to the SoC reset line)
+- reset-gpios : Reset GPIO (if not connected to the SoC reset line)
+- gpio-reset : Reset GPIO (deprecated, use reset-gpios instead)
- spi-max-frequency : See spi-bus.txt
Example: