From patchwork Fri Nov 5 15:42:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12604903 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 464BBC433EF for ; Fri, 5 Nov 2021 15:42:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 27E0761052 for ; Fri, 5 Nov 2021 15:42:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232135AbhKEPoz (ORCPT ); Fri, 5 Nov 2021 11:44:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231928AbhKEPoy (ORCPT ); Fri, 5 Nov 2021 11:44:54 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28E49C061714; Fri, 5 Nov 2021 08:42:15 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id k2so9186134pff.11; Fri, 05 Nov 2021 08:42:15 -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=YfMuUPgTSkKVtweKxnjhP3J/8y+ffSmINL7aJBkm/mo=; b=XtFqEVpPbBJIB6AmRp/CbODV5dWdZ4PiKwRyIsa7vfbexAmy2Z9UdlHnj2Pk4YWr/k 2Z6pF7hnSGoRHKlTuRDU4TysE6/5xV7bE9QbiMFPTlpeu9n+zza7t9WcbSsXSn8O/WWS PLJ4ofUTyWnw76zD+tgqhV9I37utGeTIcfUDnStstdZfesdERQAmSReCjVSkKPRCzbjG wdNyYi5HdRUKPi1bLmAzfUTqQlAPY0ejNSFF/3oKbDBgQNjPmlvQl6NEo46hf6IWGWyY Chp1ZdT7Wh2tMEAx/hGlJW+sgCr73IFQXJMaitWpjee1aCyP7N45UY7wx2bYfsZKDAkR e5jg== 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=YfMuUPgTSkKVtweKxnjhP3J/8y+ffSmINL7aJBkm/mo=; b=QPePq/5evktQBHqJHF3MPRLDxFqIIaFnkNSMIs9CgumEfAZ+qaL3Luv4cydOhq8z92 yhK1ymwXLCQ1OahMI5m8MhJZ8oOjY+sj7sdba4DlceaDxCanF4QuPh8YYoKRfb3jyC9Z AsSQVwx/+59WUnWyS1+nAXIdo0ZUHhxCnPV1S3YN+XmRKEKZ5jnDjAT1SxWVNk1DUjIw obC9D6APjxkHIGjP2nhCbKY83Qlu+BxN7v7JzzaoLuc/2a3j/S3jgvV6oNBN1v8dnGFb DKNcVGXesMYGGFTcKli+EakV39/MMNsXJqyD7Ei1tHCJsoK4IGxm5s8E6KLujsqsMaai 7OuQ== X-Gm-Message-State: AOAM530Q6MhP+qeATV96fycAcRE33QAq1j+Xhcrnq8k04HyBTNsHaEn2 sxWfh+bkI0xhedmrjJkdXJQaDFqOunY= X-Google-Smtp-Source: ABdhPJx2ewCOIj3UhxMUM5+yHqTrnC7jS3uV9/CW6F16yORyZQ5okBpauuqIef7JfJlri9rbmnawpA== X-Received: by 2002:a63:9042:: with SMTP id a63mr32101221pge.345.1636126934223; Fri, 05 Nov 2021 08:42:14 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id b8sm7547097pfi.103.2021.11.05.08.42.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:42:13 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Thomas Bogendoerfer , Florian Fainelli , 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 v4 1/7] dt-bindings: watchdog: convert Broadcom's WDT to the json-schema Date: Fri, 5 Nov 2021 08:42:02 -0700 Message-Id: <20211105154208.614260-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105154208.614260-1-f.fainelli@gmail.com> References: <20211105154208.614260-1-f.fainelli@gmail.com> 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. Signed-off-by: Rafał Miłecki Reviewed-by: Rob Herring --- .../bindings/watchdog/brcm,bcm7038-wdt.txt | 19 --------- .../bindings/watchdog/brcm,bcm7038-wdt.yaml | 40 +++++++++++++++++++ 2 files changed, 40 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..53a3245a6193 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml @@ -0,0 +1,40 @@ +# 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: + - Florian Fainelli + - Justin Chen + - 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>; + }; From patchwork Fri Nov 5 15:42:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12604905 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 211C0C43217 for ; Fri, 5 Nov 2021 15:42:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0915661183 for ; Fri, 5 Nov 2021 15:42:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233245AbhKEPo5 (ORCPT ); Fri, 5 Nov 2021 11:44:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233284AbhKEPo4 (ORCPT ); Fri, 5 Nov 2021 11:44:56 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7AD0C061208; Fri, 5 Nov 2021 08:42:16 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id g18so4432125pfk.5; Fri, 05 Nov 2021 08:42:16 -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=uTdOngd4VPhSH8+CK4C2/rriyaWWsAeUfDRBKTnaPrc=; b=lMXA4V5YruSMWY+Yn3B2bniXF/Fvp8Ks7iWYK3lg8d5WQ/rrpjMg9VUYJhV0OsyXal YwAY+OjvTUviJCdMtpz8s3euXvj9mHcpZmiNkRNgfVG5RnuI3Dr/ZyVgqnu5XvgKg86l jGAmVUhfrIqe8FrrJ0BmKtRfCCu4xwmqdNupRfw+eMDYBXNUStxlV5Jf7SqUhUxKpvLf lbE/LbFCvVEjIuwsv9i21EDzxHXuBdyNNGW8Ut1kwIcJbDqtmwct93BVjxkesmU9y0l/ YTt+OJnKGuMtBztr7mZJlG2U2S5KB51EJ5A0DFBK5tqUY+pzK1JjFvRtXYLfQhbkHREC tFZA== 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=uTdOngd4VPhSH8+CK4C2/rriyaWWsAeUfDRBKTnaPrc=; b=TWe6FmM7hVePt8F+qcFMmTr0RzzRBoUXm6+0i1RJHs5QmyjNZ0gfQdOYJ29uPFuO1i Sg9djb+yLNCZRgwdS+jwqsbj0gnIfjp+ksFN8zpjwyKJXWxgnR7ADsxmYZro2VKP7FMu pcDVqRZX/Uc8ZPHqP7Znj7eJaFlmvHWGjNQMj4c7uqdNCz1gUOzpHikY52dN6ZnRtrcm 6POE0HGQOVfeSLkAhhmaaRY/gecA675Tq0NCgicWZz35zpsesJb7om2tm3KnFRBOppCA ZcEiIfMiBiFGJK+gwnWj2g+SVkf1LCZgtbZXg/4m/iVJYCLA0PgbJngA4RbVScjKt4yx bCpA== X-Gm-Message-State: AOAM532fnbcprtTJqxw1aee8J8ATbfuY5NFkgOTsw1j5WbbhNC88ysqG A3BTs60lEVoYoRf1JWRnNkFf+bPMyg8= X-Google-Smtp-Source: ABdhPJxMtkAwnjarTY/wEqrdiCa7GppqqKy/JLgbr3UmGvjYxRMyndkPk/2s1xVJI/f2wfuLRRVixA== X-Received: by 2002:a63:c115:: with SMTP id w21mr26533958pgf.435.1636126935910; Fri, 05 Nov 2021 08:42:15 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id b8sm7547097pfi.103.2021.11.05.08.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:42:15 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: 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 v4 2/7] dt-bindings: watchdog: Add BCM6345 compatible to BCM7038 binding Date: Fri, 5 Nov 2021 08:42:03 -0700 Message-Id: <20211105154208.614260-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105154208.614260-1-f.fainelli@gmail.com> References: <20211105154208.614260-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@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 Reviewed-by: Rob Herring --- .../devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml index 53a3245a6193..b123a3c3a847 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#" @@ -16,7 +16,9 @@ maintainers: properties: compatible: - const: brcm,bcm7038-wdt + enum: + - brcm,bcm6345-wdt + - brcm,bcm7038-wdt reg: maxItems: 1 From patchwork Fri Nov 5 15:42:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12604907 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 20693C433F5 for ; Fri, 5 Nov 2021 15:42:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 061D361183 for ; Fri, 5 Nov 2021 15:42:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233506AbhKEPpC (ORCPT ); Fri, 5 Nov 2021 11:45:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233252AbhKEPo5 (ORCPT ); Fri, 5 Nov 2021 11:44:57 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4ED4BC061205; Fri, 5 Nov 2021 08:42:18 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id x131so4020056pfc.12; Fri, 05 Nov 2021 08:42:18 -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=KS/QFIB9iRAFf7dtvYUgDKvUDEV07sqKABKwHV353E8=; b=JoVkkcDwILwUiocAfNN7cj2sO19IjA2XBxqfzYB87vvIvITa39tkTepB/7nZAEVxGq liMEvAaTYX8Mj+SZqda9YfhioUih5VcEQkuEOfs3ECUR+ZfdIFoNtQWQVnEOGUgTF79K 2kY5kUrYvK6bDlIVQEdWAlBMh2VC0g38R0zqBGSi4SdcDTom9W9DAYEjQPU8r4mIPZtQ J3GY9zpi1RSg8KluP6FGF/ww50iuORMMH5l1NPyLOKeCuLnaHHOfVrklt9zVnrjFzmBc wzKOFq0zR/vCofN4Oxoa/SHRFUbkW34jivQrNomPjZuQdhNHQpNfh0/mWcMzCaIuYJ9P 5qhg== 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=KS/QFIB9iRAFf7dtvYUgDKvUDEV07sqKABKwHV353E8=; b=7cnb55Sy51tSHk7OfbxYapBR9gLGDd4cADQFSMOD8Mlp5bjXDthNnewzIKe/RZoZPd 90N33BWkyomzNLDGYCCkUyqW357BCft52PlF/ZmoVAL/n9FT2SPuLPjr2v5gQVkQQv4/ DE3yLrdk2OHMilKkB54Z8pmKz2pEPUYaAH8Ynfwr8xrZqhxlmMwyEemiPDxHkOXp+c9c r2YeObFAyFliL7BtnsjboY1xef63+ZSyj2cRhJ8IsuxQbag4TCi1fvoGZiH0K6KZKmnS qwDk72UOyEJ2ceTQzWhr0qfPmPD53KSK9CjHo7VpzYrPx8tv4KUdQ772zzvexjFbnRTP omTg== X-Gm-Message-State: AOAM5316qOJoCQ6+t2Th9WUiyDjFMuiqYvyd/7d7wMQ18eL8f2dF4Ndb xX1jn8eDOQiSlWErvA11bfhqDl6yOh0= X-Google-Smtp-Source: ABdhPJwrEy/mXd3F+6ZsSqC0bKKGMmeEjHrZI+54vC9BIZ8bVwKr38+xbqen8ZrgaWENlv4RLwt/RQ== X-Received: by 2002:a63:86c1:: with SMTP id x184mr35817576pgd.114.1636126937333; Fri, 05 Nov 2021 08:42:17 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id b8sm7547097pfi.103.2021.11.05.08.42.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:42:16 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Guenter Roeck , Wim Van Sebroeck , 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 v4 3/7] watchdog: bcm7038_wdt: Support platform data configuration Date: Fri, 5 Nov 2021 08:42:04 -0700 Message-Id: <20211105154208.614260-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105154208.614260-1-f.fainelli@gmail.com> References: <20211105154208.614260-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@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. Reviewed-by: Guenter Roeck Signed-off-by: Florian Fainelli --- 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 Fri Nov 5 15:42:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12604909 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 319DDC43219 for ; Fri, 5 Nov 2021 15:42:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A4DC61183 for ; Fri, 5 Nov 2021 15:42:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232378AbhKEPpD (ORCPT ); Fri, 5 Nov 2021 11:45:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233401AbhKEPo7 (ORCPT ); Fri, 5 Nov 2021 11:44:59 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7798C06120A; Fri, 5 Nov 2021 08:42:19 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id 127so9231643pfu.1; Fri, 05 Nov 2021 08:42:19 -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=GNmFMVscVFJe4JSrxFDPWG8YQgNhBZi7EUnIsVKloIU=; b=cUU1K7TpRNod84ZZ8oDXdeICXMvaaUE/FGvcVaV17lDl9yvcqPzxfWmnR8KsUj1WCP XXF4NDLqheTGi+1xEJ4rfCxQhw0mNFzDlgX0M8UF1pXtQI1M19dKVQ1SiuwmeGRyjN8I uG4V8f2Yb3WagI0Rznndb+BzeKw6K1CUQqbqWUG9DTihOBf4gXgP5KLjFEYSYSS4f4KD HUDB5lG5ZaVP5Ikl2FqL8D3DEYVHyX2T5PNvNedof4HyIEWN+KPz37fcipIIjmWw9GJR mEnMvNvSAjcsNQQQP3QHS7eQKuKwUA71+yho7oNlQ0YkCer6kg6Q6Id5f6nMZdeHLL79 hkcw== 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=GNmFMVscVFJe4JSrxFDPWG8YQgNhBZi7EUnIsVKloIU=; b=bjFu2PHY2TZcib7MYnQnm+YDHqNv8LnDe4ZnECFF27dCFvqx+yf7G/5QWu4qTNmfx5 WJg4zVZ6tO5fnbY30+EvnlrCjhiOF69bEhYTcNJQuv2n73lRz/1JJVKRjkTmblEhy+Uh 4kS793dtKLfXVoVj0UiCPUVNy/z9ouZH6p+yobmyfSbq2Metauu/IN5tO+3y0WfQPEBa 3W/Ssuj/fR4E5Ni/NAeSdKZxNPysC7vgCsejl8Z90GGF9mpvsuho/vsP3lgagZJ5k7YN 0qEZmSVVi1zN6LMsUwTW80TX0jlVizGHc6jLpa2szTjdrJ/e/nrz3cgDitrjMf7C/Hlg MboA== X-Gm-Message-State: AOAM533NvKUAJHkkGamsGKhLLp2mibuZsWspoQ01Bgqkexx2Q1EHZtWe fBdaJUFEL+RqnBVmXR1+P2BILwgZy0g= X-Google-Smtp-Source: ABdhPJyBNmZfVz43Jy2lUhklC/2cmEGO8aGw7EavPHaUtwpPqEDHKFdh3aCGMJAVIWdeg/0Gy9D78Q== X-Received: by 2002:a05:6a00:1381:b0:480:fde6:35e4 with SMTP id t1-20020a056a00138100b00480fde635e4mr40741071pfg.5.1636126938918; Fri, 05 Nov 2021 08:42:18 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id b8sm7547097pfi.103.2021.11.05.08.42.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:42:18 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Guenter Roeck , Wim Van Sebroeck , 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 v4 4/7] watchdog: Allow building BCM7038_WDT for BCM63XX Date: Fri, 5 Nov 2021 08:42:05 -0700 Message-Id: <20211105154208.614260-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105154208.614260-1-f.fainelli@gmail.com> References: <20211105154208.614260-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@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. Reviewed-by: Guenter Roeck Signed-off-by: Florian Fainelli --- drivers/watchdog/Kconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index bf59faeb3de1..b461bc80b954 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1753,15 +1753,16 @@ config BCM_KONA_WDT_DEBUG If in doubt, say 'N'. config BCM7038_WDT - tristate "BCM7038 Watchdog" + tristate "BCM63xx/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 Fri Nov 5 15:42:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12604911 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 DDA16C433FE for ; Fri, 5 Nov 2021 15:42:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C8FC261108 for ; Fri, 5 Nov 2021 15:42:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233625AbhKEPpF (ORCPT ); Fri, 5 Nov 2021 11:45:05 -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 S233477AbhKEPpC (ORCPT ); Fri, 5 Nov 2021 11:45:02 -0400 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29BF7C06120C; Fri, 5 Nov 2021 08:42:21 -0700 (PDT) Received: by mail-pl1-x636.google.com with SMTP id p18so11255119plf.13; Fri, 05 Nov 2021 08:42:21 -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=5tJguGsd/yhajMqKVQpl9RHTa8E0C6uvBpHGThfw2qI=; b=Ea3yMADmZmIS2dtEg/ThXtD2S5Bs2Z0UVK6FU/d5NURRF+L/iMdgJsYgIgU5iccQKg 4WhkSmBoGSfzReZF8XiIWGKYsYdYITqEXGYy4W6C3sVyTZg8bDGeG/e0OQ1SWMEql8kj I6R9XaUCGoY59YWUZMwZp2x/Uc4hGENT1TN8cmdQyQMz+dXonHEWA0NZEJEcRwzQePA/ 3APBoGks+V8EjX63hL7GxaW4Nc8s8e3S4WmdZDBQcu/b3AN9qe7eAK0+ua+r1DA+T6Cd JePN6WJE3f+148lPhpwoQGbR1onAb5E/H65VlPg5FHohHe+UCaNMoa18P71VsPOxbb9u i1SQ== 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=5tJguGsd/yhajMqKVQpl9RHTa8E0C6uvBpHGThfw2qI=; b=KO1tA8rQD5izmfvVjPXgC9NUW4xZp2JWzRT2PHZPjEqwgtWrk3v+a7FW0JJqp4hsFw TrP9odvcjY2sJ8+eZV2VILPOPNJYsd2j663TKqy2FPDocXCXM/zzCLF0TkFtBmJ/Vm3N ZwrJOFe1UG0PsQYhXJsEoTaR1zNyXxiwwiyrfStXIyJA6qsUH6xnSASn32zVkIud7tW8 fglMIIT9BytG+BmQcpiu5g2zImr9HxAZO31UqbErxtY4K121z8Z2Trz9NynU+iZszIyw R4ESbE6RuOrG+eqTe1WKSE2i/+c96ktqkNNF8EwRTyclROhH1/IVHbWahc6h+zY3DWeQ LGXw== X-Gm-Message-State: AOAM532jLK2ZlX4diyeXMUtZZRv+2T17ZJNUFZDssUaO93/7/aImBwgX eNhRXs+aP3e/yvt+c5s+MMxP4FCgGm8= X-Google-Smtp-Source: ABdhPJwirHuLA3Dxs9ZbG4h/i+OUmUOAhxmWTO33lSjWqpljyYYQD2h+Qnhe6mQrgU3oYpH3tEZdZg== X-Received: by 2002:a17:90a:1283:: with SMTP id g3mr13812942pja.174.1636126940334; Fri, 05 Nov 2021 08:42:20 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id b8sm7547097pfi.103.2021.11.05.08.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:42:19 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Guenter Roeck , Wim Van Sebroeck , 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 v4 5/7] watchdog: bcm7038_wdt: Add platform device id for bcm63xx-wdt Date: Fri, 5 Nov 2021 08:42:06 -0700 Message-Id: <20211105154208.614260-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105154208.614260-1-f.fainelli@gmail.com> References: <20211105154208.614260-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@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. Reviewed-by: Guenter Roeck Signed-off-by: Florian Fainelli --- drivers/watchdog/bcm7038_wdt.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index 506cd7ef9c77..a8a0e8485125 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -223,8 +223,16 @@ 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, + .id_table = bcm7038_wdt_devtype, .driver = { .name = "bcm7038-wdt", .of_match_table = bcm7038_wdt_match, From patchwork Fri Nov 5 15:42:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12604913 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 64745C433EF for ; Fri, 5 Nov 2021 15:42:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4F5C061250 for ; Fri, 5 Nov 2021 15:42:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233643AbhKEPpH (ORCPT ); Fri, 5 Nov 2021 11:45:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233345AbhKEPpD (ORCPT ); Fri, 5 Nov 2021 11:45:03 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C36E1C061714; Fri, 5 Nov 2021 08:42:22 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id c126so760187pfb.0; Fri, 05 Nov 2021 08:42:22 -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=S94ZmIDNbR8JM2YMz6OlEqOmqcwIJH7y0fh6ZVlIVsQ=; b=IrBZesdN//OmanRHaM50grVnTDwU96QjLEedKib+QYdMa+iZEXMEtxi0sVThuShxmR 8cuAMq1XCfDSe9p60DUFmG+jgo1IUr2x35dpq1g+e41qPZZ7qRsVf8Y7n4q75i8Yd6hb 9X0qbqP8FrcyZHI6D57GWGMXvVz7XVSEDzy5I0tG0V9HR9py2g1gNq59ejF7A5Xy+yM6 pr7hlDbgNVEOFAgWfA6g98Jvn6xvLRhUWErgOGomGJEoH5Z13ypCafRXxzI6OYaPfpXe Mbvu1zlGYEV2v39fnzyqntQllN1Tcfb2ha/6T5J+tlkaA1l/Wyu92Z6+dhcZHx3ks9pj bf3Q== 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=S94ZmIDNbR8JM2YMz6OlEqOmqcwIJH7y0fh6ZVlIVsQ=; b=qeYH+7ycnqtcC4clbyTPtiWDu80D7z7AuFpAT52tXku6166W9uZb742MbJeC4kYcFk khC1IlgHwDFqkkNpi1xpRaDL40P0T6oy7ROhaUX/yhefGiltqtrxuvmmD7dlIY8JXAji kpp8BuQ8MvRYJR1jdMVE7iL9MctTHayrhge5Mz3xMs3ZeBxwWhpfDbrllwTCKOUpsM3J 0RB4JZbB9N4L+9EMCQD47wS3pRv8qGwE2tkkX66Zr3+6+zyLLfUh6rkz/0AtaP1pnAXQ sne74qReJBZ1CBPTcNz5KyyiQA3ksaPji52FUZWUPO0c7Bf769su/7byirVPJBLRUzQI 9ceA== X-Gm-Message-State: AOAM533sN5ASoMG6dGCc1ZgvoEV8pXjTJfo0BB8wyklyTzs2SE5q1knE k3Ob3vUTnZig9AuDqoulXZIeZvUGIHQ= X-Google-Smtp-Source: ABdhPJyvTCBitdbfgeF8q9FUG9/zMiqLBN/vbJt1PRYZDBMTRRHLxnejUkUZDpE3kISqJ4cUgHrz8g== X-Received: by 2002:a63:5c6:: with SMTP id 189mr32654852pgf.187.1636126941865; Fri, 05 Nov 2021 08:42:21 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id b8sm7547097pfi.103.2021.11.05.08.42.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:42:21 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Guenter Roeck , Thomas Bogendoerfer , Wim Van Sebroeck , Rob Herring , 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 v4 6/7] MIPS: BCM63XX: Provide platform data to watchdog device Date: Fri, 5 Nov 2021 08:42:07 -0700 Message-Id: <20211105154208.614260-7-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105154208.614260-1-f.fainelli@gmail.com> References: <20211105154208.614260-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@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. Reviewed-by: Guenter Roeck Acked-by: Thomas Bogendoerfer Signed-off-by: Florian Fainelli --- 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 Fri Nov 5 15:42:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12604915 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 1F2EAC43217 for ; Fri, 5 Nov 2021 15:42:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0BCAC61052 for ; Fri, 5 Nov 2021 15:42:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233663AbhKEPpI (ORCPT ); Fri, 5 Nov 2021 11:45:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233584AbhKEPpE (ORCPT ); Fri, 5 Nov 2021 11:45:04 -0400 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F9D9C06120D; Fri, 5 Nov 2021 08:42:24 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id g28so54345pgg.3; Fri, 05 Nov 2021 08:42:24 -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=aPOF67+T6oaDuipQNZ1qxyfQ+gHXxBM7bbrD3L2Xwno=; b=e0LiJ+Ghm8p021pLKWRrB31rkzKdF34ez6IfMfK89ts2UfFDdZR7R2zEhWTvLx/xNN MKzM1W5ygvHcNUYDVZMYihPOB17dORQqTivDwH/uYaMDGIkJwlLsFl+eXZBkcLLmEz2V VcA5i+pS1v8A2kqFZfchHgphkFke/UP7LvdbLgSfkWrrdKPaW3RK65tkEPPW6fUZ0xzj 8eHRNwpkjnioRowzMWXHgqvKB6TkFaC1fYSLULhfagqrOVsb0CuxVbSLDn8dKjqv+a9o yAY8rbGGO2OoQuypIZFY8AJxYmtWVNpKBMiLwgzix5bMtMbf3bq0QhmJQ3sniQhr53cS 7+AQ== 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=aPOF67+T6oaDuipQNZ1qxyfQ+gHXxBM7bbrD3L2Xwno=; b=Gc4nQs1KAMk6VSm0Yi5Z5A+oATlUjJ6zH5HjxwxNIBucUSIanwyRsOyv2qrHNFlMwy Gwiuou+VMFTsCrvyFdP/OQa+VAKqqsh6EvOSZ1nde2aHpLFM56zvNFKQYmD7Ad/q+NtG FfwRK5Wod97K4rWINIhBkMEWwDDtOewjP9EC+Q5BHQtlz10QEpT6EcFfbWzNvdId5DE3 Ty4/jnIhrnWZ9GhErlwx3DWHanz8Nn4/vX5j7W+P6r9Yho7z9Y+Efzvg/nmMhPS6/5e2 XZyhPjr7WO/xw23PLM/gitNXReBadR4FPd0I9ruT+9jInTPweIai/O756saR0zz/X0Yn 1+Ow== X-Gm-Message-State: AOAM530AreU7fnKBNH9+dVUvXKuC+TWZWTR2gsvev1qTk9oji8b09r0A WRDcn1h0dkzt1GEgrHwISFH5SsTAWXE= X-Google-Smtp-Source: ABdhPJx4y/QPCUfBcT4dBzr+wJIzBImsoc3ItYEGqnaRXkE5huIgaPoIELN6Os9nMw/M/+edxK886A== X-Received: by 2002:a63:3543:: with SMTP id c64mr14312955pga.443.1636126943548; Fri, 05 Nov 2021 08:42:23 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id b8sm7547097pfi.103.2021.11.05.08.42.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:42:22 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Guenter Roeck , Wim Van Sebroeck , 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 v4 7/7] watchdog: Remove BCM63XX_WDT Date: Fri, 5 Nov 2021 08:42:08 -0700 Message-Id: <20211105154208.614260-8-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105154208.614260-1-f.fainelli@gmail.com> References: <20211105154208.614260-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@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. Reviewed-by: Guenter Roeck Signed-off-by: Florian Fainelli --- 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 b461bc80b954..d2410a57418b 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");