From patchwork Sat Jul 28 19:43:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1251841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id F3E693FE35 for ; Sat, 28 Jul 2012 19:47:34 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SvCvV-0006ws-9Q; Sat, 28 Jul 2012 19:43:49 +0000 Received: from mail-gh0-f177.google.com ([209.85.160.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SvCvN-0006we-KT for linux-arm-kernel@lists.infradead.org; Sat, 28 Jul 2012 19:43:42 +0000 Received: by ghbf11 with SMTP id f11so4173114ghb.36 for ; Sat, 28 Jul 2012 12:43:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=D2lMjJIlvRLP18UCY9H0m2VDGj5JviVyZd5Mwo5PEmw=; b=Mylyv4J3MDQ3JMweLq+pZfNMjwgWEKVfj0qWuz8flOZmJ8/DB6W1EaIeaz1ggaZi90 p58bXQiS+Z7aq67Pq1DMWgSblEa83PVS5M1egHY1+YDpbN4MZ01G37yHM+B/4WkoRAEs sLNlZx6AYUZyO1OMaK8nN0M2lltTgzkFFOl/6ME/28up01MV6jCT5hsLFPwoLOc4QdcU 5Ltt6w8R+TsQZq69mjmNI9KWS4y4t/d1cTkUGafko+Tn51qCdHLqDL6gRW9Nm/RWnkyl /fUUJUA93J94xGBhKcfGWIy+wHtpA4sGWwTcs6mpXczDXTMgyd7GpzCyzldvWvRBAntp K2xg== Received: by 10.236.181.65 with SMTP id k41mr4422840yhm.14.1343504618696; Sat, 28 Jul 2012 12:43:38 -0700 (PDT) Received: from localhost.localdomain ([189.5.6.233]) by mx.google.com with ESMTPS id q28sm10744653yhj.12.2012.07.28.12.43.36 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 28 Jul 2012 12:43:38 -0700 (PDT) From: Fabio Estevam To: shawn.guo@linaro.org Subject: [PATCH v2] ARM: dts: imx: Always enable the watchdog Date: Sat, 28 Jul 2012 16:43:30 -0300 Message-Id: <1343504610-2417-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.1 X-Spam-Note: CRM114 invocation failed X-Spam-Note: SpamAssassin invocation failed Cc: Fabio Estevam , kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Fabio Estevam Instead of enabling the watchdog in each individual dts file, select in the SoC dtsi file instead. Signed-off-by: Fabio Estevam --- Changes since v1: - Remove the wdog setting in imx27-phytec-phycore.dts arch/arm/boot/dts/imx27-phytec-phycore.dts | 4 ---- arch/arm/boot/dts/imx27.dtsi | 2 +- arch/arm/boot/dts/imx51-babbage.dts | 4 ---- arch/arm/boot/dts/imx51.dtsi | 2 +- arch/arm/boot/dts/imx53-ard.dts | 4 ---- arch/arm/boot/dts/imx53-evk.dts | 4 ---- arch/arm/boot/dts/imx53-qsb.dts | 4 ---- arch/arm/boot/dts/imx53-smd.dts | 4 ---- arch/arm/boot/dts/imx53.dtsi | 2 +- arch/arm/boot/dts/imx6q.dtsi | 2 +- 10 files changed, 4 insertions(+), 28 deletions(-) diff --git a/arch/arm/boot/dts/imx27-phytec-phycore.dts b/arch/arm/boot/dts/imx27-phytec-phycore.dts index 2b0ff60..777caa3 100644 --- a/arch/arm/boot/dts/imx27-phytec-phycore.dts +++ b/arch/arm/boot/dts/imx27-phytec-phycore.dts @@ -23,10 +23,6 @@ soc { aipi@10000000 { /* aipi */ - wdog@10002000 { - status = "okay"; - }; - serial@1000a000 { fsl,uart-has-rtscts; status = "okay"; diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi index 00bae3a..9422187 100644 --- a/arch/arm/boot/dts/imx27.dtsi +++ b/arch/arm/boot/dts/imx27.dtsi @@ -56,7 +56,7 @@ compatible = "fsl,imx27-wdt", "fsl,imx21-wdt"; reg = <0x10002000 0x4000>; interrupts = <27>; - status = "disabled"; + status = "okay"; }; uart1: serial@1000a000 { diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts index de065b5..f7caa08 100644 --- a/arch/arm/boot/dts/imx51-babbage.dts +++ b/arch/arm/boot/dts/imx51-babbage.dts @@ -169,10 +169,6 @@ }; }; - wdog@73f98000 { /* WDOG1 */ - status = "okay"; - }; - iomuxc@73fa8000 { compatible = "fsl,imx51-iomuxc-babbage"; reg = <0x73fa8000 0x4000>; diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index 3af176c..974357e 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi @@ -170,7 +170,7 @@ compatible = "fsl,imx51-wdt", "fsl,imx21-wdt"; reg = <0x73f98000 0x4000>; interrupts = <58>; - status = "disabled"; + status = "okay"; }; wdog@73f9c000 { /* WDOG2 */ diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts index 5b8eafc..1854145 100644 --- a/arch/arm/boot/dts/imx53-ard.dts +++ b/arch/arm/boot/dts/imx53-ard.dts @@ -31,10 +31,6 @@ }; }; - wdog@53f98000 { /* WDOG1 */ - status = "okay"; - }; - iomuxc@53fa8000 { compatible = "fsl,imx53-iomuxc-ard"; reg = <0x53fa8000 0x4000>; diff --git a/arch/arm/boot/dts/imx53-evk.dts b/arch/arm/boot/dts/imx53-evk.dts index 9c79803..5d36dde 100644 --- a/arch/arm/boot/dts/imx53-evk.dts +++ b/arch/arm/boot/dts/imx53-evk.dts @@ -62,10 +62,6 @@ }; }; - wdog@53f98000 { /* WDOG1 */ - status = "okay"; - }; - iomuxc@53fa8000 { compatible = "fsl,imx53-iomuxc-evk"; reg = <0x53fa8000 0x4000>; diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts index 2d803a9..3bfa6f1 100644 --- a/arch/arm/boot/dts/imx53-qsb.dts +++ b/arch/arm/boot/dts/imx53-qsb.dts @@ -41,10 +41,6 @@ }; }; - wdog@53f98000 { /* WDOG1 */ - status = "okay"; - }; - iomuxc@53fa8000 { compatible = "fsl,imx53-iomuxc-qsb"; reg = <0x53fa8000 0x4000>; diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts index 0809102..45848af 100644 --- a/arch/arm/boot/dts/imx53-smd.dts +++ b/arch/arm/boot/dts/imx53-smd.dts @@ -77,10 +77,6 @@ }; }; - wdog@53f98000 { /* WDOG1 */ - status = "okay"; - }; - iomuxc@53fa8000 { compatible = "fsl,imx53-iomuxc-smd"; reg = <0x53fa8000 0x4000>; diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index d161901..4c599f0 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi @@ -172,7 +172,7 @@ compatible = "fsl,imx53-wdt", "fsl,imx21-wdt"; reg = <0x53f98000 0x4000>; interrupts = <58>; - status = "disabled"; + status = "okay"; }; wdog@53f9c000 { /* WDOG2 */ diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 3d3c64b..085744f 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -355,7 +355,7 @@ compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt"; reg = <0x020bc000 0x4000>; interrupts = <0 80 0x04>; - status = "disabled"; + status = "okay"; }; wdog@020c0000 { /* WDOG2 */