public inbox for linux-tegra@vger.kernel.org
 help / color / mirror / Atom feed
From: Maarten Lankhorst <dev-FcfepWsj2zOByvU0x3ry2g@public.gmane.org>
To: "linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
	<linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH] arm/tegra: Enable watchdog support for tegra114 and tegra124.
Date: Tue, 17 Nov 2015 11:15:45 +0100	[thread overview]
Message-ID: <564AFE51.6060601@mblankhorst.nl> (raw)

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-FcfepWsj2zOByvU0x3ry2g@public.gmane.org>
---
XXX: Should this be Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org to add the missing device on older kernels?

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>,

             reply	other threads:[~2015-11-17 10:15 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-17 10:15 Maarten Lankhorst [this message]
     [not found] ` <564AFE51.6060601-FcfepWsj2zOByvU0x3ry2g@public.gmane.org>
2016-02-12 17:28   ` [PATCH] arm/tegra: Enable watchdog support for tegra114 and tegra124 Thierry Reding

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=564AFE51.6060601@mblankhorst.nl \
    --to=dev-fcfepwsj2zobyvu0x3ry2g@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox