summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-07-14 14:20:28 -0700
committerOlof Johansson <olof@lixom.net>2018-07-14 14:20:28 -0700
commit0775f498a723067a1fdabd9c03a2bd34a047f5fe (patch)
treef3b0fc7303da3ba3dfcb2ae33e2895ff0281c1ce
parent8291ca5d2a7f70cb541f596142849fee4e6566f0 (diff)
parent29aa59efc6bf91cfa5bfba8375fd730150a19d3f (diff)
Merge tag 'tegra-for-4.19-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
dt-bindings: tegra: Changes for v4.19-rc1 This contains a single update that adds the Carmel CPU found in Tegra194 SoCs to the arm/cpus.txt device tree bindings. * tag 'tegra-for-4.19-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: dt-bindings: arm: Add compatible string for NVIDIA Carmel Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--Documentation/devicetree/bindings/arm/cpus.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index 29e1dc5d506d..c4090c5a4f9f 100644
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -183,6 +183,7 @@ described below.
"marvell,sheeva-v5"
"nvidia,tegra132-denver"
"nvidia,tegra186-denver"
+ "nvidia,tegra194-carmel"
"qcom,krait"
"qcom,kryo"
"qcom,kryo385"