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: 10422391 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C664B60327 for ; Wed, 23 May 2018 20:39:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B602D29217 for ; Wed, 23 May 2018 20:39:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A8D1B2921B; Wed, 23 May 2018 20:39:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 28E6B29217 for ; Wed, 23 May 2018 20:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=zfMFjqjT3ijvplLT7Erlg4KmKyq9Me2M+W1Kdvz5/0g=; b=QuZK9v1SNFndb+wbmkb8YigigC hfwylDfAu5uRz2kJUEjon7mN8su5BwpQbDns56dB8aXtL2HfwBx4aHeesFZKPw7y8GdQdVDQ+CZTA Ic9Pv/ASJGs58hJ5oYnToue/CRZVrzCib1+v6Z3A5IRxDmREKYeO/9k3l/J70Hsy/3VFhe7CMdL0Q fMdPAJoYuqUcqk9WUM9Sh5UaHGJWDqbHzsea7/SCYNvFQWHvdtNV4d+Ee10PR0aYiBFq6D94tF0dT iHO/hME0hxJP1Ogx/HbucRZwt0S2kRLD6hIXsBmxjMGt86pOcrbrDmgYP7hjVsIqiogiWit/CPKp/ pPbqQTzA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLaXM-0008HR-Lr; Wed, 23 May 2018 20:39:08 +0000 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLaR0-0005Ox-HW for linux-arm-kernel@lists.infradead.org; Wed, 23 May 2018 20:32:47 +0000 Received: by mail-qk0-x243.google.com with SMTP id c23-v6so3569516qkb.5 for ; Wed, 23 May 2018 13:32:24 -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=Q757BgMG/vH82U2CoEdnhSwSA/SXt37qPf8IYAJ1k7hdWXzoQOnQct6DE70WxoaIfu 5jvKUavqMj87ZyE+H13WIVzwzo+piprlLuyy4dwbpq4NsE+KH17NQ4Zp8jkMBo+KN+eG nYK5k6etaJmFuW4zY8vWiD7V/pnuMe/lyy38o0oa9fLjDJIRqx6vylFIJDvS9kzoQi81 a42TvQfabBuZBtXqEg/0nk9z7BYaPDTfk3U1Ysu7/AEcIQVr1bpfbfYaamrHTtDlzmWw mxFQxOJAw9uOLtJr4VOF1BMlUxGQiGYZg4tiGnAm6DykBlp59qj5E8r4BGEIG2lMHpli 0wXg== X-Gm-Message-State: ALKqPwcbr5H+HDsJ7btyGc2K8TcLZKhedG14HYJvoiLQNtNlBpyVCb6/ dBOnbeb9gt2xhwGKzks0a8inDg== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180523_133234_609385_47ED277A X-CRM114-Status: GOOD ( 16.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Ray Jui , bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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"; - }; -