aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-11-18 21:35:39 -0500
committerOlof Johansson <olof@lixom.net>2016-11-18 21:35:39 -0500
commit1630ae0a5e8967e7f0f62df6e47f3fbd7bd401ed (patch)
tree051db39f83674af867af526fc915c6f5f75a12b5
parentb4cf33e96aea01225797da0f7f50df2ebfc830a3 (diff)
parent2e002bdedcdcbd6a708f5698a09eb32df568efb8 (diff)
Merge tag 'tegra-for-4.10-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
dt-bindings: Cleanups and additions for v4.10-rc1 Contains two small patches, one fixing a typo and the other adding the compatible string for the Denver CPUs found on the new Tegra186 SoCs. * tag 'tegra-for-4.10-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: dt-bindings: Add documentation for Tegra186 Denver serial: tegra20-hsuart: Fix typo in dmas DT binding description Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--Documentation/devicetree/bindings/arm/cpus.txt1
-rw-r--r--Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index e6782d50cbcd..6b79f8744eaa 100644
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -178,6 +178,7 @@ nodes to be present and contain the properties described below.
178 "marvell,pj4b" 178 "marvell,pj4b"
179 "marvell,sheeva-v5" 179 "marvell,sheeva-v5"
180 "nvidia,tegra132-denver" 180 "nvidia,tegra132-denver"
181 "nvidia,tegra186-denver"
181 "qcom,krait" 182 "qcom,krait"
182 "qcom,kryo" 183 "qcom,kryo"
183 "qcom,scorpion" 184 "qcom,scorpion"
diff --git a/Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt b/Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt
index 845850caf088..c93a2d1c1a65 100644
--- a/Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt
+++ b/Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt
@@ -10,7 +10,7 @@ Required properties:
10 See ../reset/reset.txt for details. 10 See ../reset/reset.txt for details.
11- reset-names : Must include the following entries: 11- reset-names : Must include the following entries:
12 - serial 12 - serial
13- dmas : Must contain an entry for each entry in clock-names. 13- dmas : Must contain an entry for each entry in dma-names.
14 See ../dma/dma.txt for details. 14 See ../dma/dma.txt for details.
15- dma-names : Must include the following entries: 15- dma-names : Must include the following entries:
16 - rx 16 - rx