diff mbox

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

Message ID 564AFE51.6060601@mblankhorst.nl
State Accepted
Headers show

Commit Message

Maarten Lankhorst Nov. 17, 2015, 10:15 a.m. UTC
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.

Signed-off-by: Maarten Lankhorst <dev@mblankhorst.nl>
---
XXX: Should this be Cc: stable@vger.kernel.org to add the missing device on older kernels?


--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Thierry Reding Feb. 12, 2016, 5:28 p.m. UTC | #1
On Tue, Nov 17, 2015 at 11:15:45AM +0100, Maarten Lankhorst wrote:
> 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.
> 
> Signed-off-by: Maarten Lankhorst <dev@mblankhorst.nl>
> ---
> XXX: Should this be Cc: stable@vger.kernel.org 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
diff mbox

Patch

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