From patchwork Mon May 28 18:01:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ray Jui X-Patchwork-Id: 10433929 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 F1C7F60327 for ; Mon, 28 May 2018 18:03:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0F6B28485 for ; Mon, 28 May 2018 18:03:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5B8A2848B; Mon, 28 May 2018 18:03:06 +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 7D2E028485 for ; Mon, 28 May 2018 18:03:06 +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=SaaDC/0EhZdLQHE+kY+anM/v4X6/F0EdutO7LUyKTR8=; b=VMR+B54ICg2DeHs9zq1byMW7Aw HQMQy9/POkO7lqU5CcsvB/MIgHmufvhOLqXXYcbgTXC4Xe7kPN3ofVJmvDEgSk51qqg5XgpUp5NQN rkrDAJu34YpVyn0gKdb4BjVRKPwdNFsnz2o62HtZF+BZvgsiCRQPJ0Gnhm1H7X72aA/AwZsjKUkCr hKbqx9muJ8k0MF0XotiPW9AgMwLhxwkJKajHtNsAAW/kOcmd+AsPzLc8uQIUY2vcsy2Om+uU6Hqu1 bFdpAba5uk6tE50X230UPhOBmhwinOSW7MSHYYp9GslmFji8qnW5YHHFL9/Yw5PEubaG1Zu+LpsqV oW1RS+wg==; 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 1fNMTy-0004lP-JJ; Mon, 28 May 2018 18:02:58 +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 1fNMT8-0004L6-Rm for linux-arm-kernel@lists.infradead.org; Mon, 28 May 2018 18:02:09 +0000 Received: by mail-qk0-x243.google.com with SMTP id j80-v6so7941348qke.9 for ; Mon, 28 May 2018 11:01:56 -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=2gc031K8ZZY+WgL+aXQOhlmoFEXSV2F5OupR55+zUZI=; b=c3Oy8xDP9RihNLcGvS/+Yrqap4fuknhKSfWaaEhHDvsMxv2agRs6snttOgo7HTmtHw JAh5XMukqymwwZRqxdrx53rW1kIc0F7RRjPq0ssuX3f74pLRwnzG6j7Lc/nqlqDsO+NU rB35lBEJeIZ6jzLEjdgb8zAOfST8gCaxVG5Nk= 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=2gc031K8ZZY+WgL+aXQOhlmoFEXSV2F5OupR55+zUZI=; b=DHyduXG40Jg6e0+HKbvPLpwPtIpLnUy6qa0HJvMqYupRZOU2dEO+eic4BVOhqATCEe z8H/T0lSu6mi0Z1w9cIWxAyQfW4HgweOun5+M9MCk2DmI9IOdYKJvf6hjedu1jUqYfom fBhtIjSti8zdQXuDfuHpDND6rkTxLX2OprFI52WVky1B8tLQ6W9KethnosFqncCfgvrw EHHCtjCmdBTwQm5jz/PeTfyIb2ke9GqNDkLF+iGuOMpO9UripuWUYq9f+hsm0tKTMepK I+m8jUqk0krH5e5H2UECuiKUucbPyvnqeXjw++f1Ssuj8J8dLZ/zMuxpbRfjxm9eFxzH Eg6g== X-Gm-Message-State: ALKqPwdcB/1TZaAf3zLyrlvPSO3BHJFKVItQ2JsDF4FhgSy3bhrrdLOf XK/9LGI9nqJi5jMXmqwc+O1L2g== X-Google-Smtp-Source: ADUXVKICqs8c2ZX0iZl/cyBNJ6c71aeBxPn+lrM2bl7vEGB5awABjjKT5KKsLqHDJhlOf9ooEGSCwA== X-Received: by 2002:a37:a593:: with SMTP id o141-v6mr11805895qke.292.1527530515626; Mon, 28 May 2018 11:01:55 -0700 (PDT) Received: from lbrmn-lnxub44-1.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id f26-v6sm22340905qtg.50.2018.05.28.11.01.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 May 2018 11:01:54 -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 v4 1/6] Documentation: DT: Consolidate SP805 binding docs Date: Mon, 28 May 2018 11:01:32 -0700 Message-Id: <1527530497-10392-2-git-send-email-ray.jui@broadcom.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1527530497-10392-1-git-send-email-ray.jui@broadcom.com> References: <1527530497-10392-1-git-send-email-ray.jui@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180528_110206_932765_36F7373A X-CRM114-Status: GOOD ( 16.14 ) 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 Reviewed-by: Rob Herring Reviewed-by: Guenter Roeck --- .../devicetree/bindings/watchdog/arm,sp805.txt | 27 ++++++++++++++----- .../devicetree/bindings/watchdog/sp805-wdt.txt | 31 ---------------------- 2 files changed, 20 insertions(+), 38 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..0fa3629 100644 --- a/Documentation/devicetree/bindings/watchdog/arm,sp805.txt +++ b/Documentation/devicetree/bindings/watchdog/arm,sp805.txt @@ -1,17 +1,30 @@ 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. +- compatible: Should be "arm,sp805" & "arm,primecell" +- reg: Should contain location and length for watchdog timer register +- clocks: Clocks driving the watchdog timer hardware. This list should be + 2 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"; - }; -