Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751367AbdCRKiz (ORCPT ); Sat, 18 Mar 2017 06:38:55 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:33625 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751127AbdCRKix (ORCPT ); Sat, 18 Mar 2017 06:38:53 -0400 Subject: Re: [PATCH v3 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT To: Florian Fainelli , Jon Mason , Hauke Mehrtens References: <1488817485-7503-1-git-send-email-jon.mason@broadcom.com> <1488817485-7503-2-git-send-email-jon.mason@broadcom.com> <03eb99e1-f18c-d4a3-32bf-d90640b14ab1@gmail.com> Cc: Rob Herring , Mark Rutland , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Jon Mason From: =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= Message-ID: Date: Sat, 18 Mar 2017 11:36:02 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <03eb99e1-f18c-d4a3-32bf-d90640b14ab1@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2401 Lines: 46 On 03/15/2017 10:53 PM, Florian Fainelli wrote: > On 03/06/2017 08:24 AM, Jon Mason wrote: >> From: Jon Mason >> >> Add support for the ARM TWD Watchdog to the bcm5301x device tree. The >> ARM TWD timer allocated the register space for the WDT, so this patch >> necessitated shrinking that. Also, the GIC masks were added for these. >> >> Signed-off-by: Jon Mason > > There were some minor conflicts that have been resolved, applied, thanks! Solving conflict by removing a reg property? ;) timer@20600 { compatible = "arm,cortex-a9-twd-timer"; interrupts = ; clocks = <&periph_clk>; }; This may be a bad idea :P [ 0.020330] ------------[ cut here ]------------ [ 0.025280] WARNING: CPU: 0 PID: 0 at arch/arm/kernel/smp_twd.c:412 twd_local_timer_of_register+0x6c/0x80() [ 0.035653] twd_local_timer_of_register failed (-12) [ 0.040924] Modules linked in: [ 0.044171] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.4.53 #0 [ 0.050462] Hardware name: BCM5301X [ 0.054161] Backtrace: [ 0.056781] [] (dump_backtrace) from [] (show_stack+0x18/0x1c) [ 0.064831] r7:0000019c r6:c03ea15e r5:600000d3 r4:00000000 [ 0.070992] [] (show_stack) from [] (dump_stack+0x84/0xa4) [ 0.078688] [] (dump_stack) from [] (warn_slowpath_common+0x8c/0xb8) [ 0.087294] r5:00000009 r4:c0497f48 [ 0.091188] [] (warn_slowpath_common) from [] (warn_slowpath_fmt+0x38/0x40) [ 0.100444] r8:c7ffe700 r7:c04b0a14 r6:c04983c0 r5:00000002 r4:c6de78f0 [ 0.107721] [] (warn_slowpath_fmt) from [] (twd_local_timer_of_register+0x6c/0x80) [ 0.117629] r3:fffffff4 r2:c03ea135 [ 0.121512] [] (twd_local_timer_of_register) from [] (clocksource_probe+0x54/0x94) [ 0.131410] r5:00000002 r4:c6de78f0 [ 0.135299] [] (clocksource_probe) from [] (time_init+0x30/0x38) [ 0.143532] r5:ffffffff r4:00000000 [ 0.147412] [] (time_init) from [] (start_kernel+0x274/0x3f4) [ 0.155376] [] (start_kernel) from [<0000807c>] (0x807c) [ 0.161944] r10:00000000 r9:413fc090 r8:0000406a r7:c049acd4 r6:c0488a24 r5:c0498444 [ 0.170454] r4:c04b0b20 [ 0.173213] ---[ end trace f24b6c88ae00fa9a ]---