From patchwork Thu Oct 28 09:30:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 12589637 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4675BC433EF for ; Thu, 28 Oct 2021 09:31:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2FDD7610E7 for ; Thu, 28 Oct 2021 09:31:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229835AbhJ1Jdi (ORCPT ); Thu, 28 Oct 2021 05:33:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229626AbhJ1Jdi (ORCPT ); Thu, 28 Oct 2021 05:33:38 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0643C061570; Thu, 28 Oct 2021 02:31:11 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id b32so9051958lfv.0; Thu, 28 Oct 2021 02:31:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GJtTeFua6lj9e76ebkvIivdZ4sX1YjABoZmJlmyJ+/0=; b=nDe/JuovQzaDd3onwK8nvQ84ElOBguBnuH3PSYdw1Ybt/WiMzcd7yP7PZgdonxWMWa uf0rA5R7FfsG1dIbzHw9s7jxcnvhCl8opEmCRoyPfo6PMXift0fN/L6LCHRfXhTU1RV+ R8jaPLf2oBLtMpFMj83oa/0w5QQ6dCF+ecrPOirFrLJIsokKMX8isphE/ecYn+i+BRf8 RbuHPU+e/Dc+IWRXUXBUMQFKekBFcc9Q42WpWRUQzL3PsgigVmONn2YISA5b02Kg7s/N FY0i4pGzEO0IKq+Cgwj0L3bZuF45hQu/1EOGucChLVk7eiuL155AaDakwVx4DNrLznng cY8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GJtTeFua6lj9e76ebkvIivdZ4sX1YjABoZmJlmyJ+/0=; b=VgLrPDjMa/W+lcyGe9FETF9bJclPKiyOuCma2f50srZJEY+uIF9aZC8/mMhCeiFQvq rS8RZo5JZsO4pE/4LYcet80lOF63pFtIxRXv7C5Rc9ZUWqcq084v7n3StGlulCdU2BNg nmwMD9D4iUq9Uvs5DMK/CN41ZelHIDp90LktL0bBauJC/iQ6jdpa8GLtWPbnFEcn3j+/ 5GQHCYMM0ocKF3BusZCp9m8Jlh1M5AsHFsP/+U09qhGhvSxc5NeyAIK0YaNGa0ltl8zb QZkeuIwyJo0gf3egPlIEQON9isSnOpH4Hp3Vp+Y5pXzTLsCMdTXwRZ60NQY/EoCKmBM9 +NPA== X-Gm-Message-State: AOAM532aeOx3xJyvoIh0zgTdgW/aqcvy1N4/0E8IFP79LyuF+heDl6aH 7Siznm7GKftGkBnl3E+d+qA= X-Google-Smtp-Source: ABdhPJwD/Nmz+HPNfdTuek7uwHRScDFKgOUBd0NBJdoD1GL1DnpA/2l4Mi5CwPF4XTuDQu2bB8/peA== X-Received: by 2002:a05:6512:260e:: with SMTP id bt14mr3078320lfb.129.1635413470075; Thu, 28 Oct 2021 02:31:10 -0700 (PDT) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id o26sm231548ljg.92.2021.10.28.02.31.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 02:31:09 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Wim Van Sebroeck , Guenter Roeck , Rob Herring Cc: Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-mips@vger.kernel.org, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH 1/3] dt-bindings: watchdog: convert Broadcom's WDT to the json-schema Date: Thu, 28 Oct 2021 11:30:57 +0200 Message-Id: <20211028093059.32535-1-zajec5@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org From: Rafał Miłecki This helps validating DTS files. While at it also rename it to bcm63xx. It's the first SoC with that hardware block and it's a naming schema used for other Broadcom blocks. It's common for some (originally) bcm63xx blocks to be reused in newer SoCs (like 7038 or 4908). Signed-off-by: Rafał Miłecki --- .../bindings/watchdog/brcm,bcm63xx-wdt.yaml | 38 +++++++++++++++++++ .../bindings/watchdog/brcm,bcm7038-wdt.txt | 19 ---------- 2 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm63xx-wdt.yaml delete mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt diff --git a/Documentation/devicetree/bindings/watchdog/brcm,bcm63xx-wdt.yaml b/Documentation/devicetree/bindings/watchdog/brcm,bcm63xx-wdt.yaml new file mode 100644 index 000000000000..9d468026550f --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/brcm,bcm63xx-wdt.yaml @@ -0,0 +1,38 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/watchdog/brcm,bcm63xx-wdt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: BCM63xx watchdog timer + +allOf: + - $ref: "watchdog.yaml#" + +maintainers: + - Rafał Miłecki + +properties: + compatible: + const: brcm,bcm7038-wdt + + reg: + maxItems: 1 + + clocks: + description: > + The clock running the watchdog. If no clock is found the driver will + default to 27000000 Hz. + +unevaluatedProperties: false + +required: + - reg + +examples: + - | + watchdog@f040a7e8 { + compatible = "brcm,bcm7038-wdt"; + reg = <0xf040a7e8 0x16>; + clocks = <&upg_fixed>; + }; diff --git a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt deleted file mode 100644 index 84122270be8f..000000000000 --- a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt +++ /dev/null @@ -1,19 +0,0 @@ -BCM7038 Watchdog timer - -Required properties: - -- compatible : should be "brcm,bcm7038-wdt" -- reg : Specifies base physical address and size of the registers. - -Optional properties: - -- clocks: The clock running the watchdog. If no clock is found the - driver will default to 27000000 Hz. - -Example: - -watchdog@f040a7e8 { - compatible = "brcm,bcm7038-wdt"; - clocks = <&upg_fixed>; - reg = <0xf040a7e8 0x16>; -}; From patchwork Thu Oct 28 09:30:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 12589639 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D3A2C4332F for ; Thu, 28 Oct 2021 09:31:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 250AB60E78 for ; Thu, 28 Oct 2021 09:31:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230093AbhJ1Jdm (ORCPT ); Thu, 28 Oct 2021 05:33:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230088AbhJ1Jdl (ORCPT ); Thu, 28 Oct 2021 05:33:41 -0400 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76E97C061570; Thu, 28 Oct 2021 02:31:14 -0700 (PDT) Received: by mail-lj1-x229.google.com with SMTP id 205so9551379ljf.9; Thu, 28 Oct 2021 02:31:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xmZKVrMbuwj9PIbfM/9dtEHCrT9YdEntWT50WYrakpc=; b=DXQgOR1Ay9+kyvZHUoTPZJHgETrMcIxpg0h44kk8X0jTJ9GMEVXs9bMmOi9XSvbq1Z OWDXluKsLUyPFGePPWBmndcBenJNipPhr25okQKChxd6Jyn05ZQathAM7pyBVsHYyhji yw0/+rFLWN+8SrFWABKfba+Jj702WosTGW3gX8h2yHJ5xL7tbPLrzed0SE9yGWRAObfo vWAz6iNMR4UeMUfomJfXYc3wBx7PdqTnVGQJ3TcE5GYXk7P+4/mhE/OBd098NlSNA+JA +P5JoWxgA++KMoaYZXrHY6Kfo71ABJKc5ef7WTGdlQWq+JiY2TzE1qhVr68d8IDKgSZ3 Bfdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xmZKVrMbuwj9PIbfM/9dtEHCrT9YdEntWT50WYrakpc=; b=zhWTUlSDNSvkXUgYOZprD5LS5F2wSX6uQKggPMVNfqGcM3KtkQrkjVhCHOie4zFYdA ++g5oqw5uukasoQK8as9/YhD7KUrOfgkoYk7QWVw/MK9kaKpBR7HA58uXSyhi4e9EtdJ 8di8eVS5kisoyjU1u0ex1/82mxZsJpGbATUC5caz0kqPP5qoNWPa8vY2czKcGWP7R1YB W9Bsz5bRRg7I03gH+zb39RZE3UheaczAnfPvHRPF0C6QL4Fk2OcZS9LQMa68OP2PC7mS 237kdhAGVBksYZ4BcLkDyxRDRBQC/Woph85GfubhWr8IFxOKKYpHZPYye7yq2xLPGiZ8 NUoA== X-Gm-Message-State: AOAM533znCcQZCvGYo3P4hVXJ12FzHh0JXOSc68EF3GHXa/aVRaBv0Hv IWkDBWzI+QHZjGS/dMNMG8OUdfit8pM= X-Google-Smtp-Source: ABdhPJwV3txWjWJsSgBLiFcV1rPPej4Z2ZiHKIEFlNkZKv83v+j7ie1EZ2FtWOdloVZMG8EBx4IhkQ== X-Received: by 2002:a05:651c:1194:: with SMTP id w20mr3533842ljo.303.1635413472870; Thu, 28 Oct 2021 02:31:12 -0700 (PDT) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id o26sm231548ljg.92.2021.10.28.02.31.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 02:31:12 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Wim Van Sebroeck , Guenter Roeck , Rob Herring Cc: Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-mips@vger.kernel.org, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH 2/3] dt-bindings: watchdog: brcm,bcm63xx-wdt: add BCM4908 compatibility Date: Thu, 28 Oct 2021 11:30:58 +0200 Message-Id: <20211028093059.32535-2-zajec5@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028093059.32535-1-zajec5@gmail.com> References: <20211028093059.32535-1-zajec5@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org From: Rafał Miłecki BCM4908 is another SoC with the same hardware block. It just uses a slightly different registers layout. Signed-off-by: Rafał Miłecki --- .../devicetree/bindings/watchdog/brcm,bcm63xx-wdt.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/watchdog/brcm,bcm63xx-wdt.yaml b/Documentation/devicetree/bindings/watchdog/brcm,bcm63xx-wdt.yaml index 9d468026550f..4391af0c9698 100644 --- a/Documentation/devicetree/bindings/watchdog/brcm,bcm63xx-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/brcm,bcm63xx-wdt.yaml @@ -14,7 +14,9 @@ maintainers: properties: compatible: - const: brcm,bcm7038-wdt + enum: + - brcm,bcm4908-wdt + - brcm,bcm7038-wdt reg: maxItems: 1 From patchwork Thu Oct 28 09:30:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 12589641 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9F0DC433FE for ; Thu, 28 Oct 2021 09:31:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 94600610F8 for ; Thu, 28 Oct 2021 09:31:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230105AbhJ1Jdo (ORCPT ); Thu, 28 Oct 2021 05:33:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230098AbhJ1Jdo (ORCPT ); Thu, 28 Oct 2021 05:33:44 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F63CC061570; Thu, 28 Oct 2021 02:31:17 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id u21so12213318lff.8; Thu, 28 Oct 2021 02:31:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5SCRR+E6hGA2qUYlZFUC09MM/t1uJnD/XLaVJ8yfNfk=; b=DIPttbwdnzYKTfXlI6MpZLACsySVnJjafi/Cj4futVxmFjkow5Tup11a5aSutu7COq FatUpMi61V6yWEoPZzhaBLMIXpJWkOFJ4R+UESLPOZ+yCzoPeZQZ67U6ElGS2o2lr7rE fMtMgxdDn0w3ksR0+aWxjPBJOlR548utKKa4PAuURNr4s35RCgHTMCjB3Wn4lAe5U2cZ jR4DTITlTVOjxWRBvn0JNWcPycCnS9KJm8vkHqYSeb6oVj1a3+klyPhFaTeiSiT+TYO4 3gJ54Mz2nm1fC7pQOAYxjRhgP+vOvEV4mdPOK/sRPID8Q/nkyXa77hGmLf8w7wffQy5/ /7Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5SCRR+E6hGA2qUYlZFUC09MM/t1uJnD/XLaVJ8yfNfk=; b=6hlUpvT6CClcYTKlpuW7JswIbrlPpz+HVNFrzw4xBVQ0AgeC07vQ7havNIgxrcMwSP J60jKR5CKQa7Q/Zdrb9KcYFL7vSImV3LKkHyAocgzES1nbg/0MosW6mLlGYRM2qTI5/E Ib8K5/RRuMacLyvwsh/YEI21RAkRIFO88ig13fVrUQYKs//VWajWq8oUehTaIGzzQcL7 jlLEjcHPSTOhZvlCndCuX3RazI5IrZAmpbuZqrzVa3CCQQo3s6ZD04rlD/2aR42ojp6A Sp8HSthPDybrdiS9XlujbK56SY5gCpnXIBXtS9rXtq46QZQbsbAKACZmjllcoNTox97L DrwA== X-Gm-Message-State: AOAM533YrF0QmnvsYJYj+q6TtjQJOaIvnBlO3fIp9D+XmbCwxNvreVoH +RtRnJ5/RYTs5jT+DCopsUQ= X-Google-Smtp-Source: ABdhPJzHdKxqhsU7CoH1gvpFRrC1HQosEE7pvQ3GRH5o89V/kvy/XsJXdCk2D7WOcoxrEq+EL13rlQ== X-Received: by 2002:a05:6512:3049:: with SMTP id b9mr3103568lfb.660.1635413475449; Thu, 28 Oct 2021 02:31:15 -0700 (PDT) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id o26sm231548ljg.92.2021.10.28.02.31.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 02:31:15 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Wim Van Sebroeck , Guenter Roeck , Rob Herring Cc: Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-mips@vger.kernel.org, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH 3/3] watchdog: bcm7038_wdt: support BCM4908 SoC Date: Thu, 28 Oct 2021 11:30:59 +0200 Message-Id: <20211028093059.32535-3-zajec5@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028093059.32535-1-zajec5@gmail.com> References: <20211028093059.32535-1-zajec5@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org From: Rafał Miłecki Hardware supported by this driver goes back to the old bcm63xx days. It was then reused in BCM7038 and later also in BCM4908. Depending on SoC model registers layout differs a bit. This commit introduces support for per-chipset registers offsets & adds BCM4908 layout. Later on BCM63xx SoCs support should be added too (probably as platform devices due to missing DT). Eventually this driver should replace bcm63xx_wdt.c. Signed-off-by: Rafał Miłecki --- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/bcm7038_wdt.c | 89 ++++++++++++++++++++++++++-------- 2 files changed, 69 insertions(+), 22 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index bf59faeb3de1..324aa942b182 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1756,7 +1756,7 @@ config BCM7038_WDT tristate "BCM7038 Watchdog" select WATCHDOG_CORE depends on HAS_IOMEM - depends on ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST + depends on ARCH_BCM4908 || ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST help Watchdog driver for the built-in hardware in Broadcom 7038 and later SoCs used in set-top boxes. BCM7038 was made public diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index acaaa0005d5b..352689f869c1 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -18,14 +19,17 @@ #define WDT_STOP_1 0xee00 #define WDT_STOP_2 0x00ee -#define WDT_TIMEOUT_REG 0x0 -#define WDT_CMD_REG 0x4 - #define WDT_MIN_TIMEOUT 1 /* seconds */ #define WDT_DEFAULT_TIMEOUT 30 /* seconds */ #define WDT_DEFAULT_RATE 27000000 +enum bcm63xx_wdt_soc { + BCM63XX_WDT_SOC_BCM4908, + BCM63XX_WDT_SOC_BCM7038, +}; + struct bcm7038_watchdog { + enum bcm63xx_wdt_soc soc; void __iomem *base; struct watchdog_device wdd; u32 rate; @@ -34,8 +38,52 @@ struct bcm7038_watchdog { static bool nowayout = WATCHDOG_NOWAYOUT; -static inline void bcm7038_wdt_write(u32 value, void __iomem *addr) +static const struct of_device_id bcm7038_wdt_match[] = { + { .compatible = "brcm,bcm4908-wdt", .data = (const void *)BCM63XX_WDT_SOC_BCM4908, }, + { .compatible = "brcm,bcm7038-wdt", .data = (const void *)BCM63XX_WDT_SOC_BCM7038, }, + {}, +}; +MODULE_DEVICE_TABLE(of, bcm7038_wdt_match); + +enum bcm7038_wdt_regs { + BCM63XX_WDT_REG_DEFVAL = 0, + BCM63XX_WDT_REG_CTL, + BCM63XX_WDT_REG_SOFTRESET, +}; + +static const u16 bcm7038_wdt_regs_bcm4908[] = { + [BCM63XX_WDT_REG_DEFVAL] = 0x28, + [BCM63XX_WDT_REG_CTL] = 0x2c, + [BCM63XX_WDT_REG_SOFTRESET] = 0x34, +}; + +static const u16 bcm7038_wdt_regs_bcm7038[] = { + [BCM63XX_WDT_REG_DEFVAL] = 0x00, + [BCM63XX_WDT_REG_CTL] = 0x04, +}; + +static void __iomem *bcm7038_wdt_reg_addr(struct watchdog_device *wdog, + enum bcm7038_wdt_regs reg) { + struct bcm7038_watchdog *wdt = watchdog_get_drvdata(wdog); + void __iomem *addr = wdt->base; + + switch (wdt->soc) { + case BCM63XX_WDT_SOC_BCM4908: + return addr + bcm7038_wdt_regs_bcm4908[reg]; + case BCM63XX_WDT_SOC_BCM7038: + return addr + bcm7038_wdt_regs_bcm7038[reg]; + default: + WARN_ON(1); + return NULL; + } +} + +static void bcm7038_wdt_write(struct watchdog_device *wdog, + enum bcm7038_wdt_regs reg, u32 value) +{ + void __iomem *addr = bcm7038_wdt_reg_addr(wdog, reg); + /* MIPS chips strapped for BE will automagically configure the * peripheral registers for CPU-native byte order. */ @@ -45,8 +93,11 @@ static inline void bcm7038_wdt_write(u32 value, void __iomem *addr) writel_relaxed(value, addr); } -static inline u32 bcm7038_wdt_read(void __iomem *addr) +static inline u32 bcm7038_wdt_read(struct watchdog_device *wdog, + enum bcm7038_wdt_regs reg) { + void __iomem *addr = bcm7038_wdt_reg_addr(wdog, reg); + if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) return __raw_readl(addr); else @@ -60,15 +111,13 @@ static void bcm7038_wdt_set_timeout_reg(struct watchdog_device *wdog) timeout = wdt->rate * wdog->timeout; - bcm7038_wdt_write(timeout, wdt->base + WDT_TIMEOUT_REG); + bcm7038_wdt_write(wdog, BCM63XX_WDT_REG_DEFVAL, timeout); } static int bcm7038_wdt_ping(struct watchdog_device *wdog) { - struct bcm7038_watchdog *wdt = watchdog_get_drvdata(wdog); - - bcm7038_wdt_write(WDT_START_1, wdt->base + WDT_CMD_REG); - bcm7038_wdt_write(WDT_START_2, wdt->base + WDT_CMD_REG); + bcm7038_wdt_write(wdog, BCM63XX_WDT_REG_CTL, WDT_START_1); + bcm7038_wdt_write(wdog, BCM63XX_WDT_REG_CTL, WDT_START_2); return 0; } @@ -83,10 +132,8 @@ static int bcm7038_wdt_start(struct watchdog_device *wdog) static int bcm7038_wdt_stop(struct watchdog_device *wdog) { - struct bcm7038_watchdog *wdt = watchdog_get_drvdata(wdog); - - bcm7038_wdt_write(WDT_STOP_1, wdt->base + WDT_CMD_REG); - bcm7038_wdt_write(WDT_STOP_2, wdt->base + WDT_CMD_REG); + bcm7038_wdt_write(wdog, BCM63XX_WDT_REG_CTL, WDT_STOP_1); + bcm7038_wdt_write(wdog, BCM63XX_WDT_REG_CTL, WDT_STOP_2); return 0; } @@ -107,7 +154,7 @@ static unsigned int bcm7038_wdt_get_timeleft(struct watchdog_device *wdog) struct bcm7038_watchdog *wdt = watchdog_get_drvdata(wdog); u32 time_left; - time_left = bcm7038_wdt_read(wdt->base + WDT_CMD_REG); + time_left = bcm7038_wdt_read(wdog, BCM63XX_WDT_REG_CTL); return time_left / wdt->rate; } @@ -134,6 +181,7 @@ static void bcm7038_clk_disable_unprepare(void *data) static int bcm7038_wdt_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + const struct of_device_id *of_id; struct bcm7038_watchdog *wdt; int err; @@ -143,6 +191,11 @@ static int bcm7038_wdt_probe(struct platform_device *pdev) platform_set_drvdata(pdev, wdt); + of_id = of_match_device(bcm7038_wdt_match, dev); + if (!of_id) + return -EINVAL; + wdt->soc = (enum bcm63xx_wdt_soc)of_id->data; + wdt->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(wdt->base)) return PTR_ERR(wdt->base); @@ -211,12 +264,6 @@ static int bcm7038_wdt_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(bcm7038_wdt_pm_ops, bcm7038_wdt_suspend, bcm7038_wdt_resume); -static const struct of_device_id bcm7038_wdt_match[] = { - { .compatible = "brcm,bcm7038-wdt" }, - {}, -}; -MODULE_DEVICE_TABLE(of, bcm7038_wdt_match); - static struct platform_driver bcm7038_wdt_driver = { .probe = bcm7038_wdt_probe, .driver = {