From patchwork Wed May 23 20:32:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ray Jui X-Patchwork-Id: 919397 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=broadcom.com header.i=@broadcom.com header.b="PG6G8OeH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rkkn0f8Tz9s0q for ; Thu, 24 May 2018 06:34:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934884AbeEWUc2 (ORCPT ); Wed, 23 May 2018 16:32:28 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:39042 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933518AbeEWUcY (ORCPT ); Wed, 23 May 2018 16:32:24 -0400 Received: by mail-qk0-f193.google.com with SMTP id z75-v6so18576291qkb.6 for ; Wed, 23 May 2018 13:32:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=i4mgA36heZG++cve2ct+wCj4fl8pq+VRcpnAXGQLJWw=; b=PG6G8OeHW7PEACiPjvFkTLXmWZUy4fFGtFM6qH41vNaqfyoYpn41pi4NjxkQkLcsHl IyXL/BYer81M0xrcBhjAWmHVicbuVHocJrJERPVcrd6eiOL70/QvwILm8tELJj7za9Yd lmbRI/U2mUncBKMJAggIefd+j5FlaKqP4A+ko= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=i4mgA36heZG++cve2ct+wCj4fl8pq+VRcpnAXGQLJWw=; b=nD/H7uYTB3fqPykAGQBB+Ja+AzzablM0zCqWvS9thkWUNIF2wERroxK0NryX3qbeo3 m/1qHHn+7vJ3gRxm5WE3eme5OW84hzr/OYjlUOF5o+g/XHWWTlK3xmWSSNhvOQaR5Q9y ahmGm1j1hjNU4g4OZEg+B7OKKFzy30Bb1TlrlEehMqLtvXijM/e5IztrJS5mZkoTk+GN mdbcjwAXcqUxa34EiWEg+C7Tzg3pdVwwgkiqGfsQkm7aWlk5M5I556Se+645VqWCtITj 5J4j/Q/EGwN1daT+a0rNBlPupUuhyBdn7Pg2K9r1I5Hi85puktd5YdiakjUxgTExnEG1 Z/dA== X-Gm-Message-State: ALKqPwdUqGbR7GoPt/gVOl/HFnSsRwJgkS2qlJu8MaOoMPmViKkJGy0Z e91pb9nnyUiQTYPEOy6Bdm1now== X-Google-Smtp-Source: AB8JxZo4qlR2Xu+TRaBhC5pK/28IcaH+tzAhdmpjxpGrF0HboMqc01XPtoY6IXktDMkUlnpQccHlQg== X-Received: by 2002:a37:4708:: with SMTP id u8-v6mr3973965qka.299.1527107543191; Wed, 23 May 2018 13:32:23 -0700 (PDT) Received: from lbrmn-lnxub44-1.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id z64-v6sm14598151qke.66.2018.05.23.13.32.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 May 2018 13:32:22 -0700 (PDT) From: Ray Jui To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Mark Rutland , Frank Rowand , Catalin Marinas , Will Deacon , Robin Murphy Cc: linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Ray Jui Subject: [PATCH v2 1/6] Documentation: DT: Consolidate SP805 binding docs Date: Wed, 23 May 2018 13:32:02 -0700 Message-Id: <1527107527-8093-2-git-send-email-ray.jui@broadcom.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1527107527-8093-1-git-send-email-ray.jui@broadcom.com> References: <1527107527-8093-1-git-send-email-ray.jui@broadcom.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Consolidate two SP805 binding documents "arm,sp805.txt" and "sp805-wdt.txt" into "arm,sp805.txt" that matches the naming of the desired compatible string to be used Signed-off-by: Ray Jui --- .../devicetree/bindings/watchdog/arm,sp805.txt | 20 +++++++++++--- .../devicetree/bindings/watchdog/sp805-wdt.txt | 31 ---------------------- 2 files changed, 16 insertions(+), 35 deletions(-) delete mode 100644 Documentation/devicetree/bindings/watchdog/sp805-wdt.txt diff --git a/Documentation/devicetree/bindings/watchdog/arm,sp805.txt b/Documentation/devicetree/bindings/watchdog/arm,sp805.txt index ca99d64..de93a4d 100644 --- a/Documentation/devicetree/bindings/watchdog/arm,sp805.txt +++ b/Documentation/devicetree/bindings/watchdog/arm,sp805.txt @@ -1,17 +1,29 @@ ARM AMBA Primecell SP805 Watchdog +SP805 WDT is a ARM Primecell Peripheral and has a standard-id register that +can be used to identify the peripheral type, vendor, and revision. +This value can be used for driver matching. + +As SP805 WDT is a primecell IP, it follows the base bindings specified in +'arm/primecell.txt' + Required properties: - compatible: Should be "arm,sp805" & "arm,primecell" - reg: Should contain location and length for watchdog timer register. -- interrupts: Should contain the list of watchdog timer interrupts. - clocks: clocks driving the watchdog timer hardware. This list should be 2 - clocks. With 2 clocks, the order is wdogclk clock, apb_pclk. + clocks. With 2 clocks, the order is wdog_clk, apb_pclk. + wdog_clk can be equal to or be a sub-multiple of the apb_pclk frequency +- clock-names : Shall be "wdog_clk" for first clock and "apb_pclk" for the + second one. + +Optional properties: +- interrupts : Should specify WDT interrupt number. Example: watchdog@66090000 { compatible = "arm,sp805", "arm,primecell"; reg = <0x66090000 0x1000>; interrupts = ; - clocks = <&apb_pclk>,<&apb_pclk>; - clock-names = "wdogclk", "apb_pclk"; + clocks = <&wdt_clk>, <&apb_pclk>; + clock-names = "wdog_clk", "apb_pclk"; }; diff --git a/Documentation/devicetree/bindings/watchdog/sp805-wdt.txt b/Documentation/devicetree/bindings/watchdog/sp805-wdt.txt deleted file mode 100644 index edc4f0e..0000000 --- a/Documentation/devicetree/bindings/watchdog/sp805-wdt.txt +++ /dev/null @@ -1,31 +0,0 @@ -* ARM SP805 Watchdog Timer (WDT) Controller - -SP805 WDT is a ARM Primecell Peripheral and has a standard-id register that -can be used to identify the peripheral type, vendor, and revision. -This value can be used for driver matching. - -As SP805 WDT is a primecell IP, it follows the base bindings specified in -'arm/primecell.txt' - -Required properties: -- compatible : Should be "arm,sp805-wdt", "arm,primecell" -- reg : Base address and size of the watchdog timer registers. -- clocks : From common clock binding. - First clock is PCLK and the second is WDOGCLK. - WDOGCLK can be equal to or be a sub-multiple of the PCLK frequency. -- clock-names : From common clock binding. - Shall be "apb_pclk" for first clock and "wdog_clk" for the - second one. - -Optional properties: -- interrupts : Should specify WDT interrupt number. - -Examples: - - cluster1_core0_watchdog: wdt@c000000 { - compatible = "arm,sp805-wdt", "arm,primecell"; - reg = <0x0 0xc000000 0x0 0x1000>; - clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; - }; -