Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6641294 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Thierry Reding
Browse files

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: default avatarMaarten Lankhorst <dev@mblankhorst.nl>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent c90bb7b9

arch/arm/boot/dts/tegra114.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ 
	};



	timer@60005000 {

		compatible = "nvidia,tegra114-timer", "nvidia,tegra20-timer";

		compatible = "nvidia,tegra114-timer", "nvidia,tegra30-timer", "nvidia,tegra20-timer";

		reg = <0x60005000 0x400>;

		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,

arch/arm/boot/dts/tegra124.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -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>,