Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754799AbdL1ReF (ORCPT ); Thu, 28 Dec 2017 12:34:05 -0500 Received: from mail-ua0-f196.google.com ([209.85.217.196]:39420 "EHLO mail-ua0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753518AbdL1ReA (ORCPT ); Thu, 28 Dec 2017 12:34:00 -0500 X-Google-Smtp-Source: ACJfBosFmaUifowNryy9aeSZ1BDw7EZu9TTJ7H34L/gF5qojUaTDlY4PwlX2hK06myc+xGmAAvhoKqFk5vLW2BTpd6o= MIME-Version: 1.0 In-Reply-To: <20171228162939.3928-6-paul@crapouillou.net> References: <20171228162939.3928-1-paul@crapouillou.net> <20171228162939.3928-6-paul@crapouillou.net> From: Mathieu Malaterre Date: Thu, 28 Dec 2017 18:33:39 +0100 X-Google-Sender-Auth: lWa1Ra2lT3_V0WVFZbqknDtV-BY Message-ID: Subject: Re: [PATCH 5/7] MIPS: jz4780: dts: Fix watchdog node To: Paul Cercueil Cc: Ralf Baechle , Rob Herring , Mark Rutland , Wim Van Sebroeck , Guenter Roeck , devicetree@vger.kernel.org, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2006 Lines: 54 Hi Paul, On Thu, Dec 28, 2017 at 5:29 PM, Paul Cercueil wrote: > - The previous node requested a memory area of 0x100 bytes, while the > driver only manipulates four registers present in the first 0x10 bytes. > > - The driver requests for the "rtc" clock, but the previous node did not > provide any. > > Signed-off-by: Paul Cercueil > --- > arch/mips/boot/dts/ingenic/jz4780.dtsi | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi b/arch/mips/boot/dts/ingenic/jz4780.dtsi > index 9b5794667aee..a52f59bf58c7 100644 > --- a/arch/mips/boot/dts/ingenic/jz4780.dtsi > +++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi > @@ -221,7 +221,10 @@ > > watchdog: watchdog@10002000 { > compatible = "ingenic,jz4780-watchdog"; > - reg = <0x10002000 0x100>; > + reg = <0x10002000 0x10>; > + > + clocks = <&cgu JZ4780_CLK_RTCLK>; > + clock-names = "rtc"; > }; > > nemc: nemc@13410000 { > -- > 2.11.0 > > Looks good, thanks for fixing my mess. Tested on MIPS Creator CI20: Dec 28 17:27:50 ci20 watchdog[17531]: starting daemon (5.14): Dec 28 17:27:50 ci20 watchdog[17531]: int=1s realtime=yes sync=no soft=no mla=0 mem=0 Dec 28 17:27:50 ci20 watchdog[17531]: ping: no machine to check Dec 28 17:27:50 ci20 watchdog[17531]: file: no file to check Dec 28 17:27:50 ci20 watchdog[17531]: pidfile: no server process to check Dec 28 17:27:50 ci20 watchdog[17531]: interface: no interface to check Dec 28 17:27:50 ci20 watchdog[17531]: temperature: no sensors to check Dec 28 17:27:50 ci20 watchdog[17531]: test=none(0) repair=none(0) alive=/dev/watchdog heartbeat=none to=root no_act=no force=no Dec 28 17:27:50 ci20 watchdog[17531]: watchdog now set to 60 seconds Dec 28 17:27:50 ci20 watchdog[17531]: hardware watchdog identity: jz4740 Watchdog pkill + reboot = ok Reviewed-by: Mathieu Malaterre