summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/tegra124.dtsi
diff options
context:
space:
mode:
authorMaarten Lankhorst <dev@mblankhorst.nl>2015-11-17 11:15:45 +0100
committerThierry Reding <treding@nvidia.com>2016-04-12 17:10:21 +0200
commitb664129459f529d403d05570115254534611b52d (patch)
tree81b81a558e23c7a099110f6be8e0d3158350dce6 /arch/arm/boot/dts/tegra124.dtsi
parentARM: tegra: Add high speed UARTs to Jetson TK1 device tree (diff)
downloadlinux-b664129459f529d403d05570115254534611b52d.tar.xz
linux-b664129459f529d403d05570115254534611b52d.zip
ARM: tegra: Enable watchdog support for Tegra114 and Tegra124
Watchdog support was added to the timer block with Tegra30. Tegra20 did not have this yet. However, the Tegra114 and Tegra124 DTSI files had an entry in the compatible string list for "nvidia,tegra20-timer", but not for "nvidia,tegra30-timer", which is why watchdog support isn't enabled on them. Fix this by adding an entry for "nvidia,tegra30-timer" to the compatible string list of the timer block on Tegra114 and Tegra124. This allows the watchdog to work on Jetson TK1. Signed-off-by: Maarten Lankhorst <dev@mblankhorst.nl> Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'arch/arm/boot/dts/tegra124.dtsi')
-rw-r--r--arch/arm/boot/dts/tegra124.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 995289b59e11..e4eac1f01e64 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -208,7 +208,7 @@
};
timer@0,60005000 {
- compatible = "nvidia,tegra124-timer", "nvidia,tegra20-timer";
+ compatible = "nvidia,tegra124-timer", "nvidia,tegra30-timer", "nvidia,tegra20-timer";
reg = <0x0 0x60005000 0x0 0x400>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,