From patchwork Thu Oct 28 17:23:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12590629 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 4FAF4C433F5 for ; Thu, 28 Oct 2021 17:23:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2FCA261139 for ; Thu, 28 Oct 2021 17:23:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229610AbhJ1RZz (ORCPT ); Thu, 28 Oct 2021 13:25:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230401AbhJ1RZy (ORCPT ); Thu, 28 Oct 2021 13:25:54 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63D09C061570; Thu, 28 Oct 2021 10:23:27 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id t21so4910579plr.6; Thu, 28 Oct 2021 10:23:27 -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=x8MeLTK/d7GnlqXrAXWg0WParJO9OxcW6hqMxpYGMbg=; b=JYxIcBak34+NRDBt5juEYvl8MFYDTInq9yD7soilY3uwsY8bmuXTqFwfbY18uBQ7e7 /p0yoQJvQ9i6ND1LDVSDH/iqx3b7d9AeaEaj3QfiXAhJ2DLZQiThppq6BZq8Y9Gb+7i7 p7vuFdbgIKgOXRoy8HN1+XlXKJkG/3ND8S+QgROFC5h2rXxWKL2wMcmgZpOLmq6zSRgD ZE2qgElakFsSAOz3lVG+NCG5iwakBlWhKth5Qs80QQ+GkDEbHZItG7YRzHsJJgwWwAyj 6KLjo1KNqsybiOLvPKpXacKcGoLy+z6NX/jrAeGRYYKJVQlBFYmnPIukyxVxgW3yJH9M Lnrg== 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=x8MeLTK/d7GnlqXrAXWg0WParJO9OxcW6hqMxpYGMbg=; b=J0Z9Owm/k6Zba4t+xQvbBQxCi0g4mImSYNQ/2Pzu9VVtXLhlILZlNOCsq94yr/jYqW PECc6+w1fRg4/0eaidmQ/k7cChKn6eK/3WJ+5dXO5NzY/esBzabI4ubbr37wIDJZsi0j 7SzX6xkjKWqvGIQKXi/IwEa9rpjkO7RDy0dJw+cktzJLETbwJaK1d8Onekm+YJJCAPQv 6+Ges6I0gFZq+J7z2LCVC01PjZliOJLgI9IqwT4H5JAWdwGDfJGqO3/9rx/C0UuCO+JX zx6MI88xdS/FKZLGmuMBgh/Z5jwbaVdZXsHrT12eF32Zbg7nyKBJxbi3x4EWuq+9oAda /eyw== X-Gm-Message-State: AOAM533FLgWE6jS6HeA7Rswl7TQp7ROAkchVUr919kwWIkTvLzun7r/C XTz2O68VzO3AY0RFuhywg/ttFoyJdr8= X-Google-Smtp-Source: ABdhPJyUqHQc1HMwqDJnlGFYUcR71rU8gP4ior0r7LOdKERIHcGUtj/gvNNMbnPHBwJ/EoJotkIoog== X-Received: by 2002:a17:90b:380a:: with SMTP id mq10mr14091490pjb.182.1635441806503; Thu, 28 Oct 2021 10:23:26 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id l20sm3222499pgo.67.2021.10.28.10.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 10:23:25 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, Florian Fainelli , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Thomas Bogendoerfer , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM63XX ARM ARCHITECTURE), Justin Chen , linux-watchdog@vger.kernel.org (open list:WATCHDOG DEVICE DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM63XX ARM ARCHITECTURE) Subject: [PATCH 1/7] dt-bindings: watchdog: convert Broadcom's WDT to the json-schema Date: Thu, 28 Oct 2021 10:23:16 -0700 Message-Id: <20211028172322.4021440-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211028172322.4021440-1-f.fainelli@gmail.com> References: <20211028172322.4021440-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org From: Rafał Miłecki This helps validating DTS files. Signed-off-by: Rafał Miłecki Signed-off-by: Florian Fainelli --- .../bindings/watchdog/brcm,bcm7038-wdt.txt | 19 --------- .../bindings/watchdog/brcm,bcm7038-wdt.yaml | 39 +++++++++++++++++++ 2 files changed, 39 insertions(+), 19 deletions(-) delete mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml 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>; -}; diff --git a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml new file mode 100644 index 000000000000..bbf2e91f9db7 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml @@ -0,0 +1,39 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/watchdog/brcm,bcm7038-wdt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: BCM7038 watchdog timer + +allOf: + - $ref: "watchdog.yaml#" + +maintainers: + - Justin Chen + - Florian Fainelli + +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>; + }; From patchwork Thu Oct 28 17:23:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12590631 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 92FB5C433FE for ; Thu, 28 Oct 2021 17:23:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B53060C40 for ; Thu, 28 Oct 2021 17:23:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230478AbhJ1RZ4 (ORCPT ); Thu, 28 Oct 2021 13:25:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230420AbhJ1RZz (ORCPT ); Thu, 28 Oct 2021 13:25:55 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B2D1C061570; Thu, 28 Oct 2021 10:23:28 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id t5-20020a17090a4e4500b001a0a284fcc2so8475845pjl.2; Thu, 28 Oct 2021 10:23:28 -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=x6CcrGnAIUO86k4JvsETidnT2oJD2Ax7sYMvakl7+vg=; b=RNmF3JlBGuVTIicTq9xI6lzCKKK02n3g6cpk//EF4IQUzMfOwY6ZAj1c+F1sQ+0tbx M7HrUxQgBUUaOomkLbQBs34pt+gM3blxgLrIgRVtovzlqm+pIAKpxf15MgmOPxEp2icz mzpvtKvhPHprGFii7r87WvuKMOjaK1y7Y6ZYpsA4wplwPt1cvAzJZ8eL8X9QyfD6Qski YBmmBhkbNATJ50/5+aW/7wSNEET8ymzKxqMALSXRSoL3mYvpQ4X+YA+XWiKW8DFQLJmn h4nxAtByr33Wo0pKrdbvNp1uYs3MXy7HI/q3MnVyNdaKSCs0/xn2ZvaSe7H5yZsMRKu6 vrAQ== 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=x6CcrGnAIUO86k4JvsETidnT2oJD2Ax7sYMvakl7+vg=; b=J4eURdLxNxQQA7eFpH3udAWLEZolgMywU6Cx2R3UL4YrgJaFRPDBjDX55bec0aR4jE eIiSvgjALngor2APleZKkCXVniH7Z9TbktXAbvmH2kfRe38bilqc20Z6DThkSwXd5AXB EsfR2JAOpB5MKO7TUprx7BS94oMauguf/RengFz0jtKr8DuC2QpDfR64ggvejUTElGCP OtRr8AH2GGGQr7ofoW3EYs15IUDYVvKBqMcAc2nMvmsv4JlXvj7FmEJrFvKqXuDUJ3CT e9jIqIHoPZVb7i1Ux5OgJrfnD+lyGxnAWLIdQDupD7U1NXEaL64XqAX9qduJ25+vKPf0 9wGw== X-Gm-Message-State: AOAM530xrIEReG53wJtAjwZTUO3oS3OCN/R4HcNwyk2vjG4KRbfGugcj 2DCMwTL/WmGvY02dXqAvLLfdEaoSjS0= X-Google-Smtp-Source: ABdhPJxYbB3QHalfH2EOgZdQwpMD+ezo8LkDds+tGlI6VQrAhFzhQlgiTBVrBtwhiy9CtzcYfZrvfw== X-Received: by 2002:a17:902:7e84:b0:13e:d793:20d8 with SMTP id z4-20020a1709027e8400b0013ed79320d8mr5065243pla.67.1635441807758; Thu, 28 Oct 2021 10:23:27 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id l20sm3222499pgo.67.2021.10.28.10.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 10:23:27 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, Florian Fainelli , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Thomas Bogendoerfer , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM63XX ARM ARCHITECTURE), Justin Chen , linux-watchdog@vger.kernel.org (open list:WATCHDOG DEVICE DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM63XX ARM ARCHITECTURE) Subject: [PATCH 2/7] dt-bindings: watchdog: Add BCM6345 compatible to BCM7038 binding Date: Thu, 28 Oct 2021 10:23:17 -0700 Message-Id: <20211028172322.4021440-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211028172322.4021440-1-f.fainelli@gmail.com> References: <20211028172322.4021440-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org The BCM7038 watchdog binding is updated to include a "brcm,bcm6345-wdt" compatible string which is the first instance of a DSL (BCM63xx) SoC seeing the integration of such a watchdog timer block. Signed-off-by: Florian Fainelli --- .../devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml index bbf2e91f9db7..cab3a8ff7bab 100644 --- a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/watchdog/brcm,bcm7038-wdt.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: BCM7038 watchdog timer +title: BCM63xx and BCM7038 watchdog timer allOf: - $ref: "watchdog.yaml#" @@ -15,6 +15,7 @@ maintainers: properties: compatible: + const: brcm,bcm6345-wdt const: brcm,bcm7038-wdt reg: From patchwork Thu Oct 28 17:23:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12590633 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 91394C43217 for ; Thu, 28 Oct 2021 17:23:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 734EE61154 for ; Thu, 28 Oct 2021 17:23:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230509AbhJ1RZ6 (ORCPT ); Thu, 28 Oct 2021 13:25:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230401AbhJ1RZ4 (ORCPT ); Thu, 28 Oct 2021 13:25:56 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4E27C061570; Thu, 28 Oct 2021 10:23:29 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id r5so4941185pls.1; Thu, 28 Oct 2021 10:23:29 -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=2RKkDNLdJnq4A2BSmMNFHi7ZNvXEVLrWpln1RnpbQ84=; b=mIjYJzIRfft82DhqEGECkDX9LHm4NnbWhsG1fGHgoS0f7ms33Z87vnyKI5uM0AI5Zp 82p+ftxZu9RkcE/+mqqvxXJcjEwsPEs8geF/mHglBfgnNma6yIj95VW2iPMo7bi8H4Gl aK3NCLTprmeLGZDkom9Dv+6iUJ4mrkKxgi+uROdbCjHDjxDRqsSemsxn6vgnsEN6ZHAy 2g0n3QAYsFsJvWHGFUFoI0SB+LALYhf2islf7tNaBqF1/Lk2/MN+kM9ZdOqWdRf0luyX pToJfIJAsuCNZcm+lgoReySHpHk+0S6GUhhblvquVpX6lIhwB0LcUa7GGi0mxWaJ91uU 4WSw== 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=2RKkDNLdJnq4A2BSmMNFHi7ZNvXEVLrWpln1RnpbQ84=; b=kxUjM66ZSSukkHpaOxpl2ukbDZQFNrTieFB4TUTX0ArYazctAoJg8a/esQ9lhO+0av U2O/4nnFlGh8DFEx/yMSJai2JcF2UcuzjCgpU3tjWkJSBIgRdOWPlhdEjToJUByw6yyU bZpxHw4f7dqYetvoClY0TqGRUUIvlGMqR58lho6v/ETAkeUkz30YNUFWHbl+atki0HZh Fo4+SXV/18fOtAhQkm2qylH0KOx1hhQFHr9x/aSVt9Op7M8r5h9efMpigyp4eNJXHOvx 4XsEx9xB6/Wl3vAPQ5OTA5pea145YGTRxRG7lvpXl8JHXtUyF7JygNSxUgck0Nkwa+US itMA== X-Gm-Message-State: AOAM531uqRlPkiqVdSpmKleJAU2uWlfh5Vlirr3QHctzR9VZlvnKPIZB q69e30uSOLWhITgAwjAO6vH5npNTIrw= X-Google-Smtp-Source: ABdhPJwHjhoDxNVqfzSn3yRcRis3LwJ3IG+q6WQL9QaTHeha9ltR+mN/A6imgl6Cv9Zj67of4VoXjg== X-Received: by 2002:a17:903:24c:b0:13f:2377:ef3a with SMTP id j12-20020a170903024c00b0013f2377ef3amr5157648plh.59.1635441809012; Thu, 28 Oct 2021 10:23:29 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id l20sm3222499pgo.67.2021.10.28.10.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 10:23:28 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, Florian Fainelli , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Thomas Bogendoerfer , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM63XX ARM ARCHITECTURE), Justin Chen , linux-watchdog@vger.kernel.org (open list:WATCHDOG DEVICE DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM63XX ARM ARCHITECTURE) Subject: [PATCH 3/7] watchdog: bcm7038_wdt: Support platform data configuration Date: Thu, 28 Oct 2021 10:23:18 -0700 Message-Id: <20211028172322.4021440-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211028172322.4021440-1-f.fainelli@gmail.com> References: <20211028172322.4021440-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org The BCM7038 watchdog driver needs to be able to obtain a specific clock name on BCM63xx platforms which is the "periph" clock ticking at 50MHz. make it possible to specify the clock name to obtain via platform data. Signed-off-by: Florian Fainelli Reviewed-by: Guenter Roeck --- drivers/watchdog/bcm7038_wdt.c | 8 +++++++- include/linux/platform_data/bcm7038_wdt.h | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 include/linux/platform_data/bcm7038_wdt.h diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index acaaa0005d5b..506cd7ef9c77 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -133,8 +134,10 @@ static void bcm7038_clk_disable_unprepare(void *data) static int bcm7038_wdt_probe(struct platform_device *pdev) { + struct bcm7038_wdt_platform_data *pdata = pdev->dev.platform_data; struct device *dev = &pdev->dev; struct bcm7038_watchdog *wdt; + const char *clk_name = NULL; int err; wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL); @@ -147,7 +150,10 @@ static int bcm7038_wdt_probe(struct platform_device *pdev) if (IS_ERR(wdt->base)) return PTR_ERR(wdt->base); - wdt->clk = devm_clk_get(dev, NULL); + if (pdata && pdata->clk_name) + clk_name = pdata->clk_name; + + wdt->clk = devm_clk_get(dev, clk_name); /* If unable to get clock, use default frequency */ if (!IS_ERR(wdt->clk)) { err = clk_prepare_enable(wdt->clk); diff --git a/include/linux/platform_data/bcm7038_wdt.h b/include/linux/platform_data/bcm7038_wdt.h new file mode 100644 index 000000000000..e18cfd9ec8f9 --- /dev/null +++ b/include/linux/platform_data/bcm7038_wdt.h @@ -0,0 +1,8 @@ +#ifndef __BCM7038_WDT_PDATA_H +#define __BCM7038_WDT_PDATA_H + +struct bcm7038_wdt_platform_data { + const char *clk_name; +}; + +#endif /* __BCM7038_WDT_PDATA_H */ From patchwork Thu Oct 28 17:23:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12590635 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 D53CBC433F5 for ; Thu, 28 Oct 2021 17:23:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BEB0E610FC for ; Thu, 28 Oct 2021 17:23:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231184AbhJ1R0C (ORCPT ); Thu, 28 Oct 2021 13:26:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230522AbhJ1RZ6 (ORCPT ); Thu, 28 Oct 2021 13:25:58 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 106AFC061570; Thu, 28 Oct 2021 10:23:31 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id k2-20020a17090ac50200b001a218b956aaso5317209pjt.2; Thu, 28 Oct 2021 10:23:31 -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=oR2LJprpgFHEyfIkq+LYfT/MDesQwIEWxhTuihSkoAY=; b=opoQgMZT/goPT/HH4eXbYBuQ7V1q6+ROLKtj6yC5iAJyGJCLuka+u5LAeWm9KaGwa/ WU7t1MnywtIvYfCDQeIs2UmXJMR2CBqnxKTucZkDir5RynRcwuznMotV6QnIoXNW0IJc KKVwpL30/7Emc39xMhl+p93VVz6jbEKY+0R+Nu8wVqmb3E2FRgXXfEWAQxgnaEkWsxVo 1md4untwWu+izVXouX0wqY2+kVStCx+Nhx/lFZD6PZ2c8YqTArGctxhZoQC5K4yliEM2 ejVDgSBPVVJSpjYEPJ8LdsCK5vBPVJj87zj4f7xtYnf9RNtw1wn+v+CiOYrEq7B+Zcui yAGQ== 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=oR2LJprpgFHEyfIkq+LYfT/MDesQwIEWxhTuihSkoAY=; b=bLYY3bJXE4cY3ByEkczRa67Nh0tB/vc9cPGPRpQJSXneSRyg8LXIvOX0bmMhFeWzA0 enkvjTuu1qGpR5uK//YHP4lfAGqLdaLFNFrnaHcpJBcJE03wKsSGVYVB2k/Dpkv6ZK0c CW9peprhAFqg1cJbeQEV/IABzHgieH24vWS+jkcVJITCwxFjb+WOoUuQwCHpNQiLXuZM 7MjW4tThEs6ZeX8rFwet0vUzOp9+Pzrsvvu1acxD8UnCTkx8yfQ31chDaSKFd2Gk3Ovk 03Wx8uF6dW1keSQigB/q6oWHyk6JbKIaCAr9n9w0Z9UkrZyMgXQ0C/x8rON/QsqR1I5z zPPg== X-Gm-Message-State: AOAM530X1yTNYx3hLTroOyohClwVNfmvhLqz8YF9se5Ed9utkspcjCQs kQ89eRu5WR+5HS7oNLzi7bQ42fWuYwk= X-Google-Smtp-Source: ABdhPJzt7fsv4JhCmKfJIpfvJr0gVsUJdII/D6p5iYsaSfSK9/tFlMqr+4dAk8g1zoVv0dh0jCDkMQ== X-Received: by 2002:a17:90b:50c:: with SMTP id r12mr5783580pjz.71.1635441810244; Thu, 28 Oct 2021 10:23:30 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id l20sm3222499pgo.67.2021.10.28.10.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 10:23:29 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, Florian Fainelli , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Thomas Bogendoerfer , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM63XX ARM ARCHITECTURE), Justin Chen , linux-watchdog@vger.kernel.org (open list:WATCHDOG DEVICE DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM63XX ARM ARCHITECTURE) Subject: [PATCH 4/7] watchdog: Allow building BCM7038_WDT for BCM63XX Date: Thu, 28 Oct 2021 10:23:19 -0700 Message-Id: <20211028172322.4021440-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211028172322.4021440-1-f.fainelli@gmail.com> References: <20211028172322.4021440-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org CONFIG_BCM63XX denotes the legacy MIPS-based DSL SoCs which utilize the same piece of hardware as a watchdog, make it possible to select that driver for those platforms. Signed-off-by: Florian Fainelli Reviewed-by: Guenter Roeck --- drivers/watchdog/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index bf59faeb3de1..24a775dd2bf1 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1756,12 +1756,13 @@ config BCM7038_WDT tristate "BCM7038 Watchdog" select WATCHDOG_CORE depends on HAS_IOMEM - depends on ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST + depends on ARCH_BRCMSTB || BMIPS_GENERIC || BCM63XX || 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 during the 2004 CES, and since then, many Broadcom chips use this - watchdog block, including some cable modem chips. + watchdog block, including some cable modem chips and DSL (63xx) + chips. config IMGPDC_WDT tristate "Imagination Technologies PDC Watchdog Timer" From patchwork Thu Oct 28 17:23:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12590637 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 B81F7C4332F for ; Thu, 28 Oct 2021 17:23:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A19E06103B for ; Thu, 28 Oct 2021 17:23:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231230AbhJ1R0I (ORCPT ); Thu, 28 Oct 2021 13:26:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231154AbhJ1R0B (ORCPT ); Thu, 28 Oct 2021 13:26:01 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F198C061243; Thu, 28 Oct 2021 10:23:32 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id f8so4899505plo.12; Thu, 28 Oct 2021 10:23:32 -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=+Wl3TUK3aCUY/WE6M31vfIUSYZE5a6wt51VNpZLD8VA=; b=kmNw/MN+gpxPUcTPOuN/pWTzakNMgWRdMYyc4PLuZJo+ZqVZcrYH6zIvh0XXz0BC0y 2QXUvpMykOwULs0jyvCqlO0Re+XSUxK4FwAY1r8gocKooQn7yWGYRorGiM+lRCYLdp0L IL4/fC9DjoSTTuUd3nH+2cNsCjGjj0uT5WZeFDnVq9zOsX0dS/IVwXq3fBp47KXYCeD0 UxqxKzb5+f/yXbrThTlfHTLbs4ob2RQVGyQPb5grQGLMS6eufLFsBkXS+O+r6SDuLS+n xxYrLFu0Yblt8TRoHr9WVVMr6Dqc5nzSdUGX+lPTou5VWBxZwWsfrLya64OWeBjANmgr 31ZA== 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=+Wl3TUK3aCUY/WE6M31vfIUSYZE5a6wt51VNpZLD8VA=; b=s92c0u3uqNZ34Z8hD43XbRFG1kWvTMNuu2LxucgsXN50ax7M6NspOoThCX2xDysSkT 3KCghs2j38cRGyPi3PHynE0gMgmJ556GfrTrHe7PFJU1oKNS5r/qS6oasi2lEAuPYPME i33qwP38vrJDVfw//R5V+kGV7jcDxBpRNLG++XQ4vI2Iq9raKrhV+AcJvoCiXLHKaBGr /+XG8Krj45iuGwauMBg5yGZkdH+PclH/YMFY2eaPxQj2pEs26sfqUJU5SlPwgNGb+w2a nktUqGZVLHhhioDWj+irLEYQ8sUqEGdYSwVJJ/2dXMPk1d5DURDOSMkRu1IoC9v5keCC r8og== X-Gm-Message-State: AOAM531iUbJuTSdorJ5QnbFq46FXjyd7ZspSCIZWy8ReXaUlt/+M1ROg wARr3zpCXPVp1ZW9RRuLI+pKcpCMr78= X-Google-Smtp-Source: ABdhPJwC9jCSOMcjBzLhb8HGU99F7nCWkJ9p01CV7EFTScT6TEJFC3EXEwKwi9sTXVATGr4S06u+Eg== X-Received: by 2002:a17:902:d50c:b0:140:5f35:40f with SMTP id b12-20020a170902d50c00b001405f35040fmr4989860plg.39.1635441811487; Thu, 28 Oct 2021 10:23:31 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id l20sm3222499pgo.67.2021.10.28.10.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 10:23:31 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, Florian Fainelli , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Thomas Bogendoerfer , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM63XX ARM ARCHITECTURE), Justin Chen , linux-watchdog@vger.kernel.org (open list:WATCHDOG DEVICE DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM63XX ARM ARCHITECTURE) Subject: [PATCH 5/7] watchdog: bcm7038_wdt: Add platform device id for bcm63xx-wdt Date: Thu, 28 Oct 2021 10:23:20 -0700 Message-Id: <20211028172322.4021440-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211028172322.4021440-1-f.fainelli@gmail.com> References: <20211028172322.4021440-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org In order to phase out bcm63xx_wdt and use bcm7038_wdt instead, introduce a platform_device_id table that allows both names to be matched. Signed-off-by: Florian Fainelli Reviewed-by: Guenter Roeck --- drivers/watchdog/bcm7038_wdt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index 506cd7ef9c77..2535f450e8a1 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -223,6 +223,13 @@ static const struct of_device_id bcm7038_wdt_match[] = { }; MODULE_DEVICE_TABLE(of, bcm7038_wdt_match); +static const struct platform_device_id bcm7038_wdt_devtype[] = { + { .name = "bcm7038-wdt" }, + { .name = "bcm63xx-wdt" }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(platform, bcm7038_wdt_devtype); + static struct platform_driver bcm7038_wdt_driver = { .probe = bcm7038_wdt_probe, .driver = { From patchwork Thu Oct 28 17:23:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12590641 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 0263CC43217 for ; Thu, 28 Oct 2021 17:23:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E360C60C40 for ; Thu, 28 Oct 2021 17:23:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231313AbhJ1R0M (ORCPT ); Thu, 28 Oct 2021 13:26:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231132AbhJ1R0C (ORCPT ); Thu, 28 Oct 2021 13:26:02 -0400 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F5D4C061226; Thu, 28 Oct 2021 10:23:33 -0700 (PDT) Received: by mail-pf1-x431.google.com with SMTP id t184so6683011pfd.0; Thu, 28 Oct 2021 10:23:33 -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=bxPuQkzCjr4bMQ3izqSZWCgKaBxIVRYi/TUmbbXS7uE=; b=P5KKMvNX1bJIQkbQ0KIWsN4VVsDaUpp4iRMBRmN1fQTu747kODxzth1c3h5mGtb2MQ xd3aZpqVaRe2XEgYANkMlXeZQRHvheHaS8d8HRoBsQCT4Goyl8x6YDyB1ZPEqFpBafls bjW82WrWlA+Xs8dxbtBliRRRWL2bPjk4ry8ATSCvFbNXMvA02EmtlCB7dqVpNB/HLOIa 6NCCi+Os1KF6LIlnYbNbbdd0v+MSV6PruGzfI+Bwu5n88EPkXSd9fvTuAhnSAAwqLcP6 F2msEek4uzVKZV+RNOA9loTD3uE+jKeBh6Js1f74bLgAafgKhOjv80fNCWZ7fxHeU5vD 0MAA== 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=bxPuQkzCjr4bMQ3izqSZWCgKaBxIVRYi/TUmbbXS7uE=; b=g5YJIagffsCLwwt/eb7wTFLrf3lCsoAa+MzMPj7kfJfNxwlFNAMMRCD6Vs7rZ9qRvi CUao2uSmaj0oh6zP3NATr5WYUe2x4dDjngW/dFiYj6peYqPNHbHj9tFZsTB8bG+p5/CF bxUxhhpnnERtTII1ClfSRclmJyckYTseT4ASTLPLfasOKsnPo6vIcWDEYOYJMxuc4uXb K/US++yS/qbEdckmKFQVTPCE699FgTqdSYtNJuOFoC6Oli0hvto3bEt8jr5EKRX5HC5f LAWGZm1IVU2e0s1fjf/DdaXvdSTvq6P+HFRzzDUvzmy5OiIreK1ysPVh1dT18Ki90vzf QQxg== X-Gm-Message-State: AOAM531+HM9kBSPR5TWkezvm5hecTJjuCOZiW6Pzd7T0ixq46koPZVeW Balw+tisxzT0KX7xTr5165NkdYYLUc4= X-Google-Smtp-Source: ABdhPJygsi4s2rhQ4DJ9mTsOsL11IEbUC4qsAnXWI7VLCqPiGHiV8+dI5YPPuVUkgA0d3iDs6S+IlQ== X-Received: by 2002:a62:4ed2:0:b0:47b:f2f9:8812 with SMTP id c201-20020a624ed2000000b0047bf2f98812mr5662908pfb.5.1635441812759; Thu, 28 Oct 2021 10:23:32 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id l20sm3222499pgo.67.2021.10.28.10.23.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 10:23:32 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, Florian Fainelli , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Thomas Bogendoerfer , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM63XX ARM ARCHITECTURE), Justin Chen , linux-watchdog@vger.kernel.org (open list:WATCHDOG DEVICE DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM63XX ARM ARCHITECTURE) Subject: [PATCH 6/7] MIPS: BCM63XX: Provide platform data to watchdog device Date: Thu, 28 Oct 2021 10:23:21 -0700 Message-Id: <20211028172322.4021440-7-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211028172322.4021440-1-f.fainelli@gmail.com> References: <20211028172322.4021440-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org In order to utilize the bcm7038_wdt.c driver which needs to know the clock name to obtain, pass it via platform data using the bcm7038_wdt_platform_data structure. Signed-off-by: Florian Fainelli Reviewed-by: Guenter Roeck Acked-by: Thomas Bogendoerfer --- arch/mips/bcm63xx/dev-wdt.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/mips/bcm63xx/dev-wdt.c b/arch/mips/bcm63xx/dev-wdt.c index 2a2346a99bcb..42130914a3c2 100644 --- a/arch/mips/bcm63xx/dev-wdt.c +++ b/arch/mips/bcm63xx/dev-wdt.c @@ -9,6 +9,7 @@ #include #include #include +#include #include static struct resource wdt_resources[] = { @@ -19,11 +20,18 @@ static struct resource wdt_resources[] = { }, }; +static struct bcm7038_wdt_platform_data bcm63xx_wdt_pdata = { + .clk_name = "periph", +}; + static struct platform_device bcm63xx_wdt_device = { .name = "bcm63xx-wdt", .id = -1, .num_resources = ARRAY_SIZE(wdt_resources), .resource = wdt_resources, + .dev = { + .platform_data = &bcm63xx_wdt_pdata, + }, }; int __init bcm63xx_wdt_register(void) From patchwork Thu Oct 28 17:23:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12590639 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 A1453C433F5 for ; Thu, 28 Oct 2021 17:23:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8EA7E61106 for ; Thu, 28 Oct 2021 17:23:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231298AbhJ1R0L (ORCPT ); Thu, 28 Oct 2021 13:26:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231181AbhJ1R0C (ORCPT ); Thu, 28 Oct 2021 13:26:02 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A6F2C061229; Thu, 28 Oct 2021 10:23:35 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id 127so6660504pfu.1; Thu, 28 Oct 2021 10:23:35 -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=A6oaQBRh2w3N5eBlo/OZCmAT6sRbxSdyN4hHqmZG0ws=; b=IzEKNwILtjKq7+7fRsTuHsZWrb4SmpeXgKV9djLz21pg982yYCWgeNKHzCk0MVQ6J3 KcjP0GWHRcQvwL+bsAkPzqbvWwPwcg+tNc67gASUcr/F+Bl4AClZ3gylAQjWN3eN/v20 IhehGPMx8b0pk1m0asXImUZZfrTWwg6M3UVJJDatZXH/ilcJFq1L0QImwz+HeHCNrlv9 43DfFNdWVb2OBcQUvvawLBYtiy45zL1z+cbkNzy8WJNYVvgiOoCL595BwFfNISL5tn2g p7bztPTNK1U+vvpTuFoGl0oNWOQsqsESiZuWJMnHPLKaa9GVuW4K4QjO3pnxkQIn9fBT 35+A== 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=A6oaQBRh2w3N5eBlo/OZCmAT6sRbxSdyN4hHqmZG0ws=; b=FTTQya032EK2830CRltVQY2f20bmtfGRW7pMUF3gzdTzFWV/Av7lEVZ4JtvoWEwfFI oKdM6FWvgbOetp87vAsC+v+ED8WjYQLMOza0PTCvVw2LpeN9eHhtKipJMjawegVN7RK0 BV/8z/P7PIA8IO3zdJS5thIqXbsRy6othCCf7f1ku1DWGgwsMEHeaphzvx1eoxi6j4MB TLVuLy8MAtiB3o7EtJo3OZmMvrAsU/HQpWZSNmV2QA/JsyXpb8OY6AWr847/FDOKO6Ti gcsicjuv9klWz3hVel/haUlq9liekqkIQdPYB4vjlOUqnjnypfBBYj5BAAxorrcIWjBu zSYg== X-Gm-Message-State: AOAM531myXI5Ly2QiE5o8QI8NPO1lSj8+bqwiv0oStjBqOEs5nqgrNQC 9LAC5llDI/bxUKsqDsmFfEPQ+Yql0Oo= X-Google-Smtp-Source: ABdhPJxp1/mmHmi7rvZwDvLY6obH7gNDaLBrD8kbbA/m630t4c1yvDiACIjNz/Ahv75+NmdRumcOHg== X-Received: by 2002:a65:6ab5:: with SMTP id x21mr4165708pgu.256.1635441813997; Thu, 28 Oct 2021 10:23:33 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id l20sm3222499pgo.67.2021.10.28.10.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 10:23:33 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, Florian Fainelli , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Thomas Bogendoerfer , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM63XX ARM ARCHITECTURE), Justin Chen , linux-watchdog@vger.kernel.org (open list:WATCHDOG DEVICE DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM63XX ARM ARCHITECTURE) Subject: [PATCH 7/7] watchdog: Remove BCM63XX_WDT Date: Thu, 28 Oct 2021 10:23:22 -0700 Message-Id: <20211028172322.4021440-8-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211028172322.4021440-1-f.fainelli@gmail.com> References: <20211028172322.4021440-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Now that we can utilize the BCM7038_WDT driver, remove that one which was not converted to the watchdog APIs. There are a couple of notable differences with how the bcm7038_wdt driver proceeds: - bcm63xx_wdt would register with the ad-hoc BCM63xx hardware timer API, but this would only be used in order to catch the interrupt *before* a SoC reset and make the kernel "die" - bcm6xx_wdt would register a software timer and kick it every second in order to pet the watchdog, thus offering a two step watchdog process. This is not something that is brought over to the bcm7038_wdt as it is deemed unnecessary. If user-space cannot pet the watchdog, but a kernel timer can, the system is still in a bad shape anyway. bcm7038_wdt is simpler in its behavior and behaves as a standard watchdog driver and is not making use of any specific platform APIs, therefore making it more maintainable and extensible. Signed-off-by: Florian Fainelli Reviewed-by: Guenter Roeck --- drivers/watchdog/Kconfig | 10 -- drivers/watchdog/Makefile | 1 - drivers/watchdog/bcm63xx_wdt.c | 315 --------------------------------- 3 files changed, 326 deletions(-) delete mode 100644 drivers/watchdog/bcm63xx_wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 24a775dd2bf1..acebf9caf6d1 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1709,16 +1709,6 @@ config OCTEON_WDT from the first interrupt, it is then only poked when the device is written. -config BCM63XX_WDT - tristate "Broadcom BCM63xx hardware watchdog" - depends on BCM63XX - help - Watchdog driver for the built in watchdog hardware in Broadcom - BCM63xx SoC. - - To compile this driver as a loadable module, choose M here. - The module will be called bcm63xx_wdt. - config BCM2835_WDT tristate "Broadcom BCM2835 hardware watchdog" depends on ARCH_BCM2835 || (OF && COMPILE_TEST) diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 1bd2d6f37c53..9811c4b1cd16 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -154,7 +154,6 @@ obj-$(CONFIG_XILINX_WATCHDOG) += of_xilinx_wdt.o # MIPS Architecture obj-$(CONFIG_ATH79_WDT) += ath79_wdt.o obj-$(CONFIG_BCM47XX_WDT) += bcm47xx_wdt.o -obj-$(CONFIG_BCM63XX_WDT) += bcm63xx_wdt.o obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o obj-$(CONFIG_INDYDOG) += indydog.o obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c deleted file mode 100644 index 7cdb25363ea0..000000000000 --- a/drivers/watchdog/bcm63xx_wdt.c +++ /dev/null @@ -1,315 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Broadcom BCM63xx SoC watchdog driver - * - * Copyright (C) 2007, Miguel Gaio - * Copyright (C) 2008, Florian Fainelli - * - */ - -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#define PFX KBUILD_MODNAME - -#define WDT_HZ 50000000 /* Fclk */ -#define WDT_DEFAULT_TIME 30 /* seconds */ -#define WDT_MAX_TIME 256 /* seconds */ - -static struct { - void __iomem *regs; - struct timer_list timer; - unsigned long inuse; - atomic_t ticks; -} bcm63xx_wdt_device; - -static int expect_close; - -static int wdt_time = WDT_DEFAULT_TIME; -static bool nowayout = WATCHDOG_NOWAYOUT; -module_param(nowayout, bool, 0); -MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); - -/* HW functions */ -static void bcm63xx_wdt_hw_start(void) -{ - bcm_writel(0xfffffffe, bcm63xx_wdt_device.regs + WDT_DEFVAL_REG); - bcm_writel(WDT_START_1, bcm63xx_wdt_device.regs + WDT_CTL_REG); - bcm_writel(WDT_START_2, bcm63xx_wdt_device.regs + WDT_CTL_REG); -} - -static void bcm63xx_wdt_hw_stop(void) -{ - bcm_writel(WDT_STOP_1, bcm63xx_wdt_device.regs + WDT_CTL_REG); - bcm_writel(WDT_STOP_2, bcm63xx_wdt_device.regs + WDT_CTL_REG); -} - -static void bcm63xx_wdt_isr(void *data) -{ - struct pt_regs *regs = get_irq_regs(); - - die(PFX " fire", regs); -} - -static void bcm63xx_timer_tick(struct timer_list *unused) -{ - if (!atomic_dec_and_test(&bcm63xx_wdt_device.ticks)) { - bcm63xx_wdt_hw_start(); - mod_timer(&bcm63xx_wdt_device.timer, jiffies + HZ); - } else - pr_crit("watchdog will restart system\n"); -} - -static void bcm63xx_wdt_pet(void) -{ - atomic_set(&bcm63xx_wdt_device.ticks, wdt_time); -} - -static void bcm63xx_wdt_start(void) -{ - bcm63xx_wdt_pet(); - bcm63xx_timer_tick(0); -} - -static void bcm63xx_wdt_pause(void) -{ - del_timer_sync(&bcm63xx_wdt_device.timer); - bcm63xx_wdt_hw_stop(); -} - -static int bcm63xx_wdt_settimeout(int new_time) -{ - if ((new_time <= 0) || (new_time > WDT_MAX_TIME)) - return -EINVAL; - - wdt_time = new_time; - - return 0; -} - -static int bcm63xx_wdt_open(struct inode *inode, struct file *file) -{ - if (test_and_set_bit(0, &bcm63xx_wdt_device.inuse)) - return -EBUSY; - - bcm63xx_wdt_start(); - return stream_open(inode, file); -} - -static int bcm63xx_wdt_release(struct inode *inode, struct file *file) -{ - if (expect_close == 42) - bcm63xx_wdt_pause(); - else { - pr_crit("Unexpected close, not stopping watchdog!\n"); - bcm63xx_wdt_start(); - } - clear_bit(0, &bcm63xx_wdt_device.inuse); - expect_close = 0; - return 0; -} - -static ssize_t bcm63xx_wdt_write(struct file *file, const char *data, - size_t len, loff_t *ppos) -{ - if (len) { - if (!nowayout) { - size_t i; - - /* In case it was set long ago */ - expect_close = 0; - - for (i = 0; i != len; i++) { - char c; - if (get_user(c, data + i)) - return -EFAULT; - if (c == 'V') - expect_close = 42; - } - } - bcm63xx_wdt_pet(); - } - return len; -} - -static struct watchdog_info bcm63xx_wdt_info = { - .identity = PFX, - .options = WDIOF_SETTIMEOUT | - WDIOF_KEEPALIVEPING | - WDIOF_MAGICCLOSE, -}; - - -static long bcm63xx_wdt_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) -{ - void __user *argp = (void __user *)arg; - int __user *p = argp; - int new_value, retval = -EINVAL; - - switch (cmd) { - case WDIOC_GETSUPPORT: - return copy_to_user(argp, &bcm63xx_wdt_info, - sizeof(bcm63xx_wdt_info)) ? -EFAULT : 0; - - case WDIOC_GETSTATUS: - case WDIOC_GETBOOTSTATUS: - return put_user(0, p); - - case WDIOC_SETOPTIONS: - if (get_user(new_value, p)) - return -EFAULT; - - if (new_value & WDIOS_DISABLECARD) { - bcm63xx_wdt_pause(); - retval = 0; - } - if (new_value & WDIOS_ENABLECARD) { - bcm63xx_wdt_start(); - retval = 0; - } - - return retval; - - case WDIOC_KEEPALIVE: - bcm63xx_wdt_pet(); - return 0; - - case WDIOC_SETTIMEOUT: - if (get_user(new_value, p)) - return -EFAULT; - - if (bcm63xx_wdt_settimeout(new_value)) - return -EINVAL; - - bcm63xx_wdt_pet(); - - case WDIOC_GETTIMEOUT: - return put_user(wdt_time, p); - - default: - return -ENOTTY; - - } -} - -static const struct file_operations bcm63xx_wdt_fops = { - .owner = THIS_MODULE, - .llseek = no_llseek, - .write = bcm63xx_wdt_write, - .unlocked_ioctl = bcm63xx_wdt_ioctl, - .compat_ioctl = compat_ptr_ioctl, - .open = bcm63xx_wdt_open, - .release = bcm63xx_wdt_release, -}; - -static struct miscdevice bcm63xx_wdt_miscdev = { - .minor = WATCHDOG_MINOR, - .name = "watchdog", - .fops = &bcm63xx_wdt_fops, -}; - - -static int bcm63xx_wdt_probe(struct platform_device *pdev) -{ - int ret; - struct resource *r; - - timer_setup(&bcm63xx_wdt_device.timer, bcm63xx_timer_tick, 0); - - r = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!r) { - dev_err(&pdev->dev, "failed to get resources\n"); - return -ENODEV; - } - - bcm63xx_wdt_device.regs = devm_ioremap(&pdev->dev, r->start, - resource_size(r)); - if (!bcm63xx_wdt_device.regs) { - dev_err(&pdev->dev, "failed to remap I/O resources\n"); - return -ENXIO; - } - - ret = bcm63xx_timer_register(TIMER_WDT_ID, bcm63xx_wdt_isr, NULL); - if (ret < 0) { - dev_err(&pdev->dev, "failed to register wdt timer isr\n"); - return ret; - } - - if (bcm63xx_wdt_settimeout(wdt_time)) { - bcm63xx_wdt_settimeout(WDT_DEFAULT_TIME); - dev_info(&pdev->dev, - ": wdt_time value must be 1 <= wdt_time <= 256, using %d\n", - wdt_time); - } - - ret = misc_register(&bcm63xx_wdt_miscdev); - if (ret < 0) { - dev_err(&pdev->dev, "failed to register watchdog device\n"); - goto unregister_timer; - } - - dev_info(&pdev->dev, " started, timer margin: %d sec\n", - WDT_DEFAULT_TIME); - - return 0; - -unregister_timer: - bcm63xx_timer_unregister(TIMER_WDT_ID); - return ret; -} - -static int bcm63xx_wdt_remove(struct platform_device *pdev) -{ - if (!nowayout) - bcm63xx_wdt_pause(); - - misc_deregister(&bcm63xx_wdt_miscdev); - bcm63xx_timer_unregister(TIMER_WDT_ID); - return 0; -} - -static void bcm63xx_wdt_shutdown(struct platform_device *pdev) -{ - bcm63xx_wdt_pause(); -} - -static struct platform_driver bcm63xx_wdt_driver = { - .probe = bcm63xx_wdt_probe, - .remove = bcm63xx_wdt_remove, - .shutdown = bcm63xx_wdt_shutdown, - .driver = { - .name = "bcm63xx-wdt", - } -}; - -module_platform_driver(bcm63xx_wdt_driver); - -MODULE_AUTHOR("Miguel Gaio "); -MODULE_AUTHOR("Florian Fainelli "); -MODULE_DESCRIPTION("Driver for the Broadcom BCM63xx SoC watchdog"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:bcm63xx-wdt");