Skip to contentSkip to conversation

arm/tegra: Enable watchdog support for tegra114 and tegra124.

PATCH In review Maarten Lankhorst 2 participants 2 messages Nov 17, 2015 – Feb 12, 2016 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm/tegra: Enable watchdog support for tegra114 and tegra124.

This allows the watchdog timer to work on my tegra124.

tegra_wdt specifies: compatible = "nvidia,tegra30-timer";

But the dtsi was only setting tegra20-timer, fix this by adding tegra30-timer explicitly. This allows the watchdog to work on my Jetson TK1.

---
XXX: Should this be Cc: [email protected] to add the missing device on older kernels?

arch/arm/boot/dts/tegra114.dtsi +1 -1
index d845bd1448b5..4e05623acc1e 100644
@@ -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
index 68669f791c8b..1d84b8986807 100644
@@ -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>,

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw
Quoted 11 lines · Maarten Lankhorst

This allows the watchdog timer to work on my tegra124.

tegra_wdt specifies: compatible = "nvidia,tegra30-timer";

But the dtsi was only setting tegra20-timer, fix this by adding tegra30-timer explicitly. This allows the watchdog to work on my Jetson TK1.

---
XXX: Should this be Cc: [email protected] to add the missing device on older kernels?

I've applied this with a slightly reworded commit message. I haven't added a Cc: stable because I don't think this qualifies. There is no regression that this fixes, or any bugs. It enables a feature, which is useful, but doesn't need to go to stable in my opinion.

If you or anyone else feels strongly I can be convinced to add it, though.

Thierry