Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754313AbdCOVx6 (ORCPT ); Wed, 15 Mar 2017 17:53:58 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36368 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752035AbdCOVx4 (ORCPT ); Wed, 15 Mar 2017 17:53:56 -0400 Subject: Re: [PATCH v3 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT To: Jon Mason , Hauke Mehrtens , zajec5@gmail.com References: <1488817485-7503-1-git-send-email-jon.mason@broadcom.com> <1488817485-7503-2-git-send-email-jon.mason@broadcom.com> Cc: Rob Herring , Mark Rutland , Florian Fainelli , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Jon Mason From: Florian Fainelli Message-ID: <03eb99e1-f18c-d4a3-32bf-d90640b14ab1@gmail.com> Date: Wed, 15 Mar 2017 14:53:48 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <1488817485-7503-2-git-send-email-jon.mason@broadcom.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 446 Lines: 12 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! -- Florian