From patchwork Tue Nov 17 10:15:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten Lankhorst X-Patchwork-Id: 545498 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 54E9514141B for ; Tue, 17 Nov 2015 21:21:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750888AbbKQKV1 (ORCPT ); Tue, 17 Nov 2015 05:21:27 -0500 Received: from mblankhorst.nl ([141.105.120.124]:43132 "EHLO mblankhorst.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750835AbbKQKVY (ORCPT ); Tue, 17 Nov 2015 05:21:24 -0500 X-Greylist: delayed 335 seconds by postgrey-1.27 at vger.kernel.org; Tue, 17 Nov 2015 05:21:23 EST To: "linux-tegra@vger.kernel.org" Cc: devicetree@vger.kernel.org From: Maarten Lankhorst Subject: [PATCH] arm/tegra: Enable watchdog support for tegra114 and tegra124. Message-ID: <564AFE51.6060601@mblankhorst.nl> Date: Tue, 17 Nov 2015 11:15:45 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org 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 --- 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 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 = , , 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 = , ,