From patchwork Wed Nov 3 23:13:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12601961 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 DEDA2C433EF for ; Wed, 3 Nov 2021 23:27:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AEBBB61106 for ; Wed, 3 Nov 2021 23:27:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AEBBB61106 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ES2odgK1OmNqU2c33Qj/QH8T+0ORb8DL//BjB7KHDwM=; b=Kzx9qFfAMYg+LU gvnc7eNUwSjYXYVV5uIztBoAUDwEV/Encb0So5UfR8ZvSoOri3UxRKbs1c+7gZeqaPWLQiU/rItN/ PSMmQxrn7AsmKtZVjisIE32PjpVaif5aq/R/m8AjX/7f9HzLxxNG78bmn5aV/opz2lrdaVz4dqM7q /Uijticc/KdUh2JblZRHoO831lbjMAlx3DfM8QBmYFgGrSztGUeFteFZTdMp1uv4jnDk0cmd7njSF GGij/TGgpaKAkRPiq55VeRv4Df5RiVfgnBrwXZPcZVVo4ci+RKSHvh/1lxytE2B7YPVQxiZbszq3E Sf7XOyIR5kqLiHWF+kvQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPdh-0070Wf-Gk; Wed, 03 Nov 2021 23:25:54 +0000 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPSU-006wX9-9M for linux-arm-kernel@lists.infradead.org; Wed, 03 Nov 2021 23:14:20 +0000 Received: by mail-pf1-x436.google.com with SMTP id y4so3956601pfa.5 for ; Wed, 03 Nov 2021 16:14: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=GQbUuqqzIBcZH9+H5Tk/WXcUevcK7q2Ku4w0/2122MA=; b=WNxfcHo9IrfclXZJWB8HuQKEacDw8R3U/OUFe9YeL7OMSfnktTI4GfH+tRxOqahNkF he4sAyF4hFG2H0vOY8M6tdyG+JII4tGFrD27/34xjhEu2fO6vzRSlOaULTETXkcb3hp6 Uv3ypo9gQknmSpr8y2DAVXI1642AHJ+CNlL9ObiyuLCZBIO7+TtiX7UD/fuN9pwwQruU owBftbXWFUsAwM9RooOWLFDXUjGMxQKURSUHuRClSk6o7E9WHj5rRKCBOKR3FE65Kohs 2ZW1HgcG4GaSZV/bBMwZ7pxolmNHWxuRIRqo7+4jwgbdTIO3w4AOh8BmJSIXye8kHG96 vUyg== 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=GQbUuqqzIBcZH9+H5Tk/WXcUevcK7q2Ku4w0/2122MA=; b=GTiWksW0QcAGdtAtRwH0gacSmYUlRg0FE2uSdyZjbjrhzA+6Ui0Fuitsn/d4m+9OuC nrBgIXzM4rpWwhi1gi/Enh7Vmy1qKdw6mNataq7uJ/wPZTDvwVXJofAoataWSVIvr2F3 EFSpOnFlUQYYF6FTLO1Bniv4AeJVzhdHXRaOavxHjRpA1H/n8eIFDWEguNWr9c9hbB5j 84OjfI5GQNAKHCSgtKkFYC24ShUZotNV04/RtgFy4Gk1wfPIIXXOFBJzJTQAga1eiNl+ CTGrV9xS5TnTaQSEXLuw53Z8bymM99J7dBF23Tg8sYjMN/VED1BrNI1EsyYcB7vQEz3L sDpQ== X-Gm-Message-State: AOAM531afB6W/QlJlF4Pa36xF0R/nikomkfOUrcaxAOx1nyLV9MFctfC SF3Qj7klCFs2ZsGEpX80n4s= X-Google-Smtp-Source: ABdhPJzTCocXCAk/Kwart0ynFiG4172jybWWbdGW9UsWlCC12/9zh4r+ojE8S1CVBTA8czewgVks4w== X-Received: by 2002:a05:6a00:1995:b0:47c:1f59:a27a with SMTP id d21-20020a056a00199500b0047c1f59a27amr48155914pfl.36.1635981257334; Wed, 03 Nov 2021 16:14:17 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id p7sm2613549pgn.52.2021.11.03.16.14.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 16:14:16 -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 v3 1/7] dt-bindings: watchdog: convert Broadcom's WDT to the json-schema Date: Wed, 3 Nov 2021 16:13:21 -0700 Message-Id: <20211103231327.385186-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211103231327.385186-1-f.fainelli@gmail.com> References: <20211103231327.385186-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211103_161418_420931_72F5CE1D X-CRM114-Status: GOOD ( 17.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Rafał Miłecki This helps validating DTS files. Signed-off-by: Rafał Miłecki --- .../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..69e5a1ef6a1f --- /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,bcm63xx-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 Wed Nov 3 23:13: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: 12601967 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 990E2C433EF for ; Wed, 3 Nov 2021 23:28:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 67D7C61106 for ; Wed, 3 Nov 2021 23:28:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 67D7C61106 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kxyo3KReWTvHr8CxCegiJez4pAHaEMUhjHNUJp7cwXg=; b=oG3k+Ox/cblrLc l5/evLEkUEpta0DIpLWOM82dUX+isvMoP8yUcuKoXYflJ0YeFgDhAUFE9Ll4zP2Ot1hoNRiHk3wx1 bDqTVw9OC1KF5Tpa7G6lVYWZDEZXdIgo+T6071rgzYZs0kC2VhJ4F6LizocjZICSJ1VVuCG40+TsU Az9Ew2s+OvFUHvzlmFKB6vz6mCYLq6gpORYF2iDaMGTOf4aR/lRgcRylEli6R5o+A5ZcUjoBDUPeX jvzNaPEgYIUvFVimi5ia7rm8sYTETaOKLvrX8OCf/Hhi9tADzVrjbvlC2yQaMLoFXEu+HXoOLC0qp n1aXHK9ZwXzoXQ47Ik2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPen-0070ty-28; Wed, 03 Nov 2021 23:27:02 +0000 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPSV-006wXc-8m for linux-arm-kernel@lists.infradead.org; Wed, 03 Nov 2021 23:14:20 +0000 Received: by mail-pg1-x52a.google.com with SMTP id j9so3735568pgh.1 for ; Wed, 03 Nov 2021 16:14: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=xWNHzDke48KqNNwTsf3sswBb6ctIv7kyGu4hU5wmmqQ=; b=RWslXcYj9EY6rOiqALEDbPClbjgf/umc7mgbfa3N1kwHHlVSj/UR9iKcDMr7gfcCqw SMTC97+mtV65cfAjGLKdHDU5qNn2voefnR2U5Bab7M/N2DL/Xa+nbLcGMVhn/9ilZgVP edxLcs/SMYCRS3Ds21xX8NinfZpVg+YmSaZ6LWvqYltD/gPTqJXxUlkJoopYOnE24Pif AJzBa4XNAUDvVhtojnFQcKp4TQNif0vWAE0mvRWtsc8lonlt5C/vugigooWG0S9g7G58 FsxweNrG8mL59WDJV5Cq860a/XTAWpT+TT+ERyNZmKkwq5ocPcoxb0TORjoJdiVso4f/ UrPw== 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=xWNHzDke48KqNNwTsf3sswBb6ctIv7kyGu4hU5wmmqQ=; b=4tJDCckjdZb5OrZuAsgZnfPaw0YL26rj2rAFHeYMPVT0YPJXm3NK2yoSxyheQVs91+ buNnA7IVrMeXijLBcHFdAEKPXyM818OmfDunzzwdlS/9KQ1xVK4ApHTT+Fa2MIwAoeg0 D34TtM9C1iSGEWky7OXX4rdPd/ZlWTHUu/axCUQNy3K5jYBJpcjHnSr7zsS6hsFeAhvS j5esMD46Gkm6YiAU0GgxY6NxuVXsWq6vrUVma2s79/yucZEhoT1l2tRokB1rUo8BVgUR 9flls0nnwh9mTilktPJ1GWo89F1Dj4tdqhl+etBtmG4IGh09hZQy9KQfNthPz36Qla8U Y2GA== X-Gm-Message-State: AOAM533nHYFTkopNHNXtKOqZQrSQXyfxR6zuouJOrWyRLdjSu8S0zx4Y JsvHrAR4XvFSNtCvOdrh07M= X-Google-Smtp-Source: ABdhPJza7kBUgxzop/h22Iu3/rblAMo93lhJN1ukdY/J90FrJzZSMxA4GqiZ3YnK7Xxb6kfvPDhFGQ== X-Received: by 2002:aa7:9208:0:b0:44d:3044:baf0 with SMTP id 8-20020aa79208000000b0044d3044baf0mr47291369pfo.73.1635981258339; Wed, 03 Nov 2021 16:14:18 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id p7sm2613549pgn.52.2021.11.03.16.14.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 16:14:17 -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 v3 2/7] dt-bindings: watchdog: Add BCM6345 compatible to BCM7038 binding Date: Wed, 3 Nov 2021 16:13:22 -0700 Message-Id: <20211103231327.385186-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211103231327.385186-1-f.fainelli@gmail.com> References: <20211103231327.385186-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211103_161419_364627_5012D25C X-CRM114-Status: GOOD ( 12.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 | 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 69e5a1ef6a1f..12d64d4c719e 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,bcm63xx-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 Wed Nov 3 23:13:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12601969 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 92AA2C433EF for ; Wed, 3 Nov 2021 23:30:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 522F261076 for ; Wed, 3 Nov 2021 23:30:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 522F261076 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=J1yWVFVVYQCXcpxwRei1qv82O3Ptbw6L32nCspLuSkw=; b=fBzpziqVbCVLMJ qZuTIMzAWYtzF/Uiw6n2M8ocX609RR0ZVdT61sujPHK6zpmcOY7ZBek6JjDdtVvKQ+3oWmzdQj6G+ 5WGT5NVunvrpsDNNRoyD8ZAgkP1aqD1SYcVVPCKUyxwAzbyDFqw2owZ25KEIf9BsYtEbDLazCa5ef MYHI6mY195HDIRcpKHuU5DH+HpnP285AaVH8/N7R2FcsIax/dlh2wQUyNjxYNq7Ygo416Unmb0oS3 wsEyPIOu1P6fi2dHFknjqL3ZVNLmlfCoH0wdl9mIiDTwGcO6tqHfwhhf27ZiIR3RbCwD3w6GQ3YZw bTN2v3/KAbBT3KQcL4ww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPg1-0071KL-OU; Wed, 03 Nov 2021 23:28:19 +0000 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPSW-006wY0-6Z for linux-arm-kernel@lists.infradead.org; Wed, 03 Nov 2021 23:14:21 +0000 Received: by mail-pf1-x432.google.com with SMTP id g11so3942533pfv.7 for ; Wed, 03 Nov 2021 16:14: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=KS/QFIB9iRAFf7dtvYUgDKvUDEV07sqKABKwHV353E8=; b=me12WnyGdwLMVZ0v7borp06LEDIYMoUZ8EFi4SMmQIiumh8992jWROHeUwgURRBBOg xF35bG0dLz6tdn4MXlkgtrYTEUCK3DNf4puhsOFCdxXgEGi0K3vsI/D4NDu5473t3n2G P5dmxtDTT2Ku77KOnbh0oCVl7/x4MKvMOdRdRCz1JDW0OJ3k/9BKeWv6VOC7mTj1NU/z 7OgY2vnKe6GsfY9ozLDQBCb8gHPFRL4Xg5pDAgkGm1mVGIU4eYkPYmoxdLrqoYIXPQhf u/x3UwASxkFqlc3qDkOSa24AXhh0sht6XZJ8CNqz/FI6xQlmuSbokimXr0kAmIYCDmxG brgw== 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=sBXGSGQZ39AojB65AV3WW9KgLDGlTggn3+ggfoh1bmSk9AcccitSrlub2kSXfxL8qj +3vf6a7ONed4FSBp/3b2GlnnLm0UWoQjElfEyChRz6Aj74Z6ezDbTjoQX8/0yLtwCrgo jc6kJH4UUg6+yRRaEdNeQHRq2pZ7X0CpsSClnMcDjGRH8HZniGZCXTa9EZQM1kyn42FL ucv8SS7K/FxB0QHk75o7zJASCa89fCXfZxdScg6n1GyJ1Tjl0rjOlmjEkN//4vRQNzrC 0zYmDqVlT5kCxQTstVMCrsPYSrdwi/3ynW8zo+cbMEXF6kB4RqqPKfHjc0Ir2lGWpVgC 0k0w== X-Gm-Message-State: AOAM533YQMicQN1pSbclJ0IH84V7iLf8qH6YXI/k+Zz+xndMpLnMs7w1 2vWGdmzwijrdTUmimycAB1M= X-Google-Smtp-Source: ABdhPJwtP9MBIxJTTfIoh7nHEOsZ8ARrx44Cp9SZ6rw4PTxqqwC4CDGcAM2Fw7zrsCMUI4lNs6Yi+Q== X-Received: by 2002:a05:6a00:24d1:b0:481:1ee9:a253 with SMTP id d17-20020a056a0024d100b004811ee9a253mr19047097pfv.16.1635981259287; Wed, 03 Nov 2021 16:14:19 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id p7sm2613549pgn.52.2021.11.03.16.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 16:14: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 v3 3/7] watchdog: bcm7038_wdt: Support platform data configuration Date: Wed, 3 Nov 2021 16:13:23 -0700 Message-Id: <20211103231327.385186-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211103231327.385186-1-f.fainelli@gmail.com> References: <20211103231327.385186-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211103_161420_282949_C326E129 X-CRM114-Status: GOOD ( 21.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Wed Nov 3 23:13:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12601971 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 93A65C433F5 for ; Wed, 3 Nov 2021 23:31:19 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5328161106 for ; Wed, 3 Nov 2021 23:31:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5328161106 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fwySz4TNmUlaEnFgEqyxS+xufEXHJlobanQtHw3NInM=; b=s22rNIPzX0hU1E xEEvpWdCf9Fg56mhlTzrJ5brndh7yV0Kdw1z9DuZ3tyt7Oj+gJseq6aZFUc2l7Y57ugqaQPh/67cF qxG22cfrVebyMMyFRX7efme08lWmd2vP4tDa811KEnrHKzA5ww2supnOk9/eMKA3vJTcKoMEVW+gY HooHOEogi3q0U2kzlAFBH2XgdOfM04NXKlvvhxN5/dderV15kwwjCHperaje2zMbyXG8wKFT6U6lx /tZ2B66LDoiJ3Q74GroTk/qFuZXQqyC/RcBIO7s8mq9gc7IepW9NvH7BpoIYPRdgMizuJXoUewzkJ Ev8Jl7OjyLnUuzN0xXeg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPhF-0071kl-0M; Wed, 03 Nov 2021 23:29:33 +0000 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPSX-006wYZ-8i for linux-arm-kernel@lists.infradead.org; Wed, 03 Nov 2021 23:14:22 +0000 Received: by mail-pg1-x532.google.com with SMTP id s136so3723191pgs.4 for ; Wed, 03 Nov 2021 16:14:20 -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=AYKs8DG5aY7Ez32ozoVHTajRv/Q2Rt0Xxh3ZKd1RZW4=; b=ghCXrz/kqRISKfiTcmzNDDkevcetSQzBSw68JqOjqDFPR6JLVcyzTh+eBDUYYkOK5N phGPACbF4rq9ipcxLuVKOxFBbBbj3dn53KkeY1i+vR9DKGnVBV5VcwLzhMoQHSRdVZMy r5OhgPVUGg2fNhnpkhRSrHV4VjBxpBdk7ONQVn0aGClsaFUrl+LWkl35IvNBtj9M8PcN HrAEDbmgxIi27PIwLiJdPx2G8nPahuvvw8MiwRemz6M1o3sC5oaZl7MaVP6ozEuKwqmN TdhkWi9aoz0Hd5ENAYgvtMj27qSsC1HHkE7eQxhhtIptggtWbr5cEKbiLQg03ZhPisH2 l/Gw== 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=AYKs8DG5aY7Ez32ozoVHTajRv/Q2Rt0Xxh3ZKd1RZW4=; b=tojgIVx/2TbfbEGpNZxZLdpa9gxGWGTTgeBoTK4FhxYITPvUX9j/46/jFO+n3Mtv60 M6nVQkxAH2V/4czgGIRrpf/XZsAYiGE9wXAO0p1dqz8PG8Ht1JIGhkLbVdUKi5WWgS4R 2Ew00nVvzjxzRWAbC2LBiJPX9u51on3AKraHKWeRn28HvguLGuZIRtnPwTtb3YyFDt4J M0O1RP821ww+izaZdz3sTXRT0cQ0MDuJ6cQPhKkZleYxprg+JTlLmQNnYxOT++MFpzgI gl3ZuAllmaLitg5t0RttG8Wc8Km7FkOlMiGnGZlrMlLtIjqAG4L2/IXn+j7BY4JhqzrN tTJw== X-Gm-Message-State: AOAM531dNLcoGwmjzWpNX+9WZRMPbRCFMX6AWx1T9UhwAqc8AB4HhnTg iCbS44Anm3oojbsVL8WBf5k= X-Google-Smtp-Source: ABdhPJzqaGgk4G2XlVB2TDrYcdgAC/XC0dwa1fn7D4CRo42Tk30pa2nBmniEbzktPiTpDvLOb1qv9g== X-Received: by 2002:a05:6a00:2ad:b0:480:fae5:2693 with SMTP id q13-20020a056a0002ad00b00480fae52693mr30204115pfs.37.1635981260413; Wed, 03 Nov 2021 16:14:20 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id p7sm2613549pgn.52.2021.11.03.16.14.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 16:14:20 -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 v3 4/7] watchdog: Allow building BCM7038_WDT for BCM63XX Date: Wed, 3 Nov 2021 16:13:24 -0700 Message-Id: <20211103231327.385186-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211103231327.385186-1-f.fainelli@gmail.com> References: <20211103231327.385186-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211103_161421_362671_162129DF X-CRM114-Status: GOOD ( 15.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 | 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 Wed Nov 3 23:13:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12601973 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 E1C7CC433F5 for ; Wed, 3 Nov 2021 23:32:15 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B223F60E0C for ; Wed, 3 Nov 2021 23:32:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B223F60E0C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IBprARMoBKlJlxYlnaH3aa0QzP7TGDkMIgf/QXDLv/s=; b=sYTGnsbHVryYyV x2LxijgXZZkkPj82rj7DvIcBoI0jotQRMaEw6GCsCcWlydroigPZGJPxn0f61dQhtTUMGljYU3W4j 9HkJspagk0c0SnLNhz0o/3nNxrzM9xgDSfiDyg8QICh/eg5J6xo1egX0zomogj2u9lrqWb4/IxCHL Qpl3X6dqKV7PNQPy2Dvd6EEswDbVKegOf4MyFwh8HEP38xx2itPIKgFvCPUvuqXbJOuckqKHQhhwz ns24JMNrqBa/Ezm+kIiOpCD5RgLyF05JMnFefRolBCoP179a7+qHTtQIH33qoccPlEVoWeRRoS/ts fVotARusnE7TBltm4g8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPiA-00724L-TR; Wed, 03 Nov 2021 23:30:32 +0000 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPSY-006wZf-LM for linux-arm-kernel@lists.infradead.org; Wed, 03 Nov 2021 23:14:24 +0000 Received: by mail-pf1-x42e.google.com with SMTP id x64so3946346pfd.6 for ; Wed, 03 Nov 2021 16:14: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=5tJguGsd/yhajMqKVQpl9RHTa8E0C6uvBpHGThfw2qI=; b=i46YcPFhxeJhhR5TNgTJjEH3myValJYdzJWuapw45e3IBgNQzawBZOrfCNnqaRk0vl BJWq0d8tzSFe2k1GKL94t1zw5iOr35odGaURpRFE+IwUcAxIzxOE8H9lI15RICS9ZVpX gq9IA+hyNAR0s2nSVYiEI3u8xkzfwYis5Zb7Yc0nFYqwQAHKnrxH+grZfuIkE5yK64sZ SzVWuwnUPVSRwYBnE4cXnc2hrmm6dJiJMSInLQERMwzq4pvz2Iezx5kJObsCydHtGOdt CqSEYGya6XYBe/I53VGTD8L+mhhFtrpwi1mLs2DXxqpfgrz4ei9mSgpItn1nkxtbq350 hvpA== 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=rdwE7geLV4igPoT3ZYQmHlj3KNUwYHBCUzQprz52q4S0/ZCRkRwmDPTmJDuIz2IG3u H42Ho1TugvOBh/EGWVct+NU0x0AWribSUDEdklZTEm9+ab/nvrseFFLH6blaoHVaymcv pNgiNA/wGeTVsPS0OkUu/ClHVQxHU66k+uSPhanI2ciRTH11/JmXcsvYEmd53cMG4BuP DOYdADUAXMI8SIGnczRiFMXp85F5Cz4RGflGoFp5HXpqzEmnObAkiEpDucn4vQUsQA9N 7RjcSqX7sgxBmHAVZxt2ZO5KFqjXt7PJoAUJZUCuXuAyrbCjTBzazjwr7FnJnbGmcNFH djEw== X-Gm-Message-State: AOAM531kH9QOsWFPFlPKvX7+x9Xu5bA6xz0znIVbGpFGnHY4U65d9ctF YsJZa3sZAIrjQmKIMnIJGCU= X-Google-Smtp-Source: ABdhPJz1ckvqLaN1kUqu98azVkkNO+1zbwA/6iP2o1lSawNhg4pK1LG/PnwPsSYg9iE4wQONeNfbNg== X-Received: by 2002:a05:6a00:22c2:b0:481:1f34:d8eb with SMTP id f2-20020a056a0022c200b004811f34d8ebmr18675523pfj.38.1635981261766; Wed, 03 Nov 2021 16:14:21 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id p7sm2613549pgn.52.2021.11.03.16.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 16:14:21 -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 v3 5/7] watchdog: bcm7038_wdt: Add platform device id for bcm63xx-wdt Date: Wed, 3 Nov 2021 16:13:25 -0700 Message-Id: <20211103231327.385186-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211103231327.385186-1-f.fainelli@gmail.com> References: <20211103231327.385186-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211103_161422_740987_4C63CDFF X-CRM114-Status: GOOD ( 13.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Wed Nov 3 23:13:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12601977 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 99285C433EF for ; Wed, 3 Nov 2021 23:33:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 55FF260EB4 for ; Wed, 3 Nov 2021 23:33:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 55FF260EB4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IYyzOLAqkH7PdRJXY1bjfx2dvoK5bcoCAX5/ijBmhOI=; b=2j4DO5c760YA// ZyJ4oL+Am5rOQxVvBrqvyK6iKWzbuW8I+KH2KBM85TwDOE6PxajD8AqsdTk7AbyO6eX/Oqdoe+6h/ TslJGN2wMZQK3OuLb1TQMfVSCsMSmdxPuS8qqZi4dkHETgEKxURlibypsD2t2hP45tTPLiZYmbs7K a1P4renzfrjnS/nBGYfNk0CWSiuj8YWR4gBvO9M/Gb3/KXQIHXCM01mgXk13E3KBdWdU/XaXfvkQ9 K5mBI4KazmT7171Hbt3U/y2bM7ms08/gwoLVvJrcCH2kFdvrfHb5hOCJr1Uv+cNQ+Lv8wYjEnanwZ Auuis4TSDu4+REDYkNHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPjD-0072S3-AM; Wed, 03 Nov 2021 23:31:36 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPSZ-006waK-Lx for linux-arm-kernel@lists.infradead.org; Wed, 03 Nov 2021 23:14:25 +0000 Received: by mail-pl1-x62d.google.com with SMTP id u11so4133974plf.3 for ; Wed, 03 Nov 2021 16:14:23 -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=oUOMWLm7pFApmOxrY5LbpiR/ypi1CNlykSlB/f5ivWHC4SL333V57CaG20RkPpzg+S ndPL7vMDzQqkcr7NajmQWcJCUC8C/gW7U+YlI8h4ySIZJw2ppQziWafQujGrRN6lfmTI tW7s9jbjZuV2BufJhSPOsvrQ2wXosrbEo3Aom0rhcs1y5HNecyxjzNgknJ0yi1mFTYHu XgbbAjqYXEtYtkiMryHl7vWS3RHQjXYIPBUlukwLrOW1spUIRldUPHDkuMszUwX43iso RTE8amvuqlCQOQ/2YyyYUVQp8RCa1x81fStvvN0kZARK0QVF3pyZxKUO4ZBVsJey/+dg urWg== 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=yp2eKySFBYGFUsZg3eRVpcQU3C/6y7jK1CeZUy5NKABs8nNyatBh4NOAVTicMygg4Z V1RH9FvMIYyQvNqL5oNRN1kS4+bMCNwRVmSfkOZY1M+Qe7v5x4PcQVLV73MATtXsLgeM bYFwjeEsGmk+lA3oXesnagLRMJRiXh3E+P9KlZpe9PgxToiIZcUTWkzBKuj7SthCZaAW iN0VmxS3aFLBHi37TewzAh1J4jMkG/MMO/CaezGCBe4gJ59yc86vqPGz6ClQ/hjC7pPq /b1bNws2759lHpNW3hj/DFYx6b2oISnsHkzMP+pA3hxkkxiGls0PnsEl7SZTyi1/Fe5y 1+yg== X-Gm-Message-State: AOAM533Fjm3cG9uQhV+ibKuOS5wZo/vzwf02MagixLOe1Bkzy3Grh9aM nLVa4zUDyAPIe60onNoXCQxqemjReOQ= X-Google-Smtp-Source: ABdhPJxEYzC6KYaWHuW8EtDqKdl9Emje1OiMe/c8PqUhl5nf/Ax7475nv1y2qE2+9Pek1ix77miQQA== X-Received: by 2002:a17:903:22c5:b0:142:3100:65af with SMTP id y5-20020a17090322c500b00142310065afmr713080plg.83.1635981262807; Wed, 03 Nov 2021 16:14:22 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id p7sm2613549pgn.52.2021.11.03.16.14.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 16:14:22 -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 v3 6/7] MIPS: BCM63XX: Provide platform data to watchdog device Date: Wed, 3 Nov 2021 16:13:26 -0700 Message-Id: <20211103231327.385186-7-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211103231327.385186-1-f.fainelli@gmail.com> References: <20211103231327.385186-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211103_161423_832562_CCB31BC4 X-CRM114-Status: GOOD ( 14.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Wed Nov 3 23:13:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12601979 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 7FE74C433F5 for ; Wed, 3 Nov 2021 23:34:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3BBFE6058D for ; Wed, 3 Nov 2021 23:34:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3BBFE6058D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=G4NXa34hYgWOfv4X4b8iwKD3D32Ug/gxA2bAww5mhY0=; b=b7rhM34Zwrqe/g o4IhPntlnNR8Eh2mw2r9imZM+S9SmUYpv649Z+H5dOvqJWUebfoiPkkBWh8FBr4Yjb/Dr3VzB9C36 TIvJtY/P7RNUz0I6wtoRnzN+YsXfP+H7l7nmevPChRotqIl1yAxWK+f01DL5c41zeP5qDIMuGcgfw oj42xM4HGG+VoiJiZ72F60fGTsz9Yc343u1b98VV3cE4kkv2206xfu0TaCTXv7VFsMbhySGQbBfoy bi9VUuoT6XXPQ6G1Hbi2D72o2JbrnRgvR+8ToBSKDoDVE1tQ1AhFcI4eoR2fVh3tuFU1LSKD5qyiL +LnOdJa2fFKqkQQGiKaA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPk7-0072mu-3i; Wed, 03 Nov 2021 23:32:31 +0000 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPSa-006wat-Sp for linux-arm-kernel@lists.infradead.org; Wed, 03 Nov 2021 23:14:27 +0000 Received: by mail-pg1-x530.google.com with SMTP id t7so3701954pgl.9 for ; Wed, 03 Nov 2021 16:14: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=zWHBIEcvoeupNEkr+7OvuNvuzEArssjhvYw0m7qAAEk=; b=h1fxT2PIqk5MHEGIC1L9l5GqP4j2951iSrhTbrC4IzsJ0g/rSLJifK6HJlP7r8sOCv 0y+kUnnM6FwBUC1ilxgJiFLOccIYm8CPYX1ZhsQ99UlIZwJ+tpQYeG3Y46i1yuYhCRkC 79le6u9lZSgRH8zI9MlBrrgGCP59nhFn6Uq7i85VVlrg/Qkk6jDNItrENMTOdJPg3e27 r30PpKjTZcn6VKacwAN5XzMB0T5nsl7qNpAdA8qmPtCBtnT6pIHGR/ivM1bKl+bwTQzH 29rOfHTa7i/lj6GLbGKvZEAT00IB5vlzJqAxbAXm7UsjA5Sp9xl2WtRo3CtbXtABlLWP 0JJw== 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=zWHBIEcvoeupNEkr+7OvuNvuzEArssjhvYw0m7qAAEk=; b=UJ+GL8VfqwhAPVmbBwdk8eL+3ia/MSPxp5D9DgO+TiwQEEOlL4eM9tC470xakjdkVV XKAFbrPBA0fvMm4/cLL8K3UlajIIKPJcoivx3JFOKkumgzgKO+etd5KeJ7TBEq6GQZDO VfrMeglwfY3n+v8EnMPdpwvdpdchYLla3sr4hMGAenLEVzZNXpSxwCsnAYO5l5Z9SsSW CUASrGyDfqGehQDmGLCwXdh+BgFYpnr0fKGXs4MlyRVlBMFi7ExXP9xdDGb49FZz5Vwb KhhgT+JGt5ZrmUuvAxZALfIMZM2cNpk6hVRP42Ra9bKlpH4/ffrVNT/vPJC5Z2FAotMm nsnQ== X-Gm-Message-State: AOAM5311+zlfvaZZh0ssLk+RCgqE8G8JtVxm5MmwNMTBzzJtaI/IS+pQ LHQuStfzC847o7Zc4VMjFuTZZR9G6nA= X-Google-Smtp-Source: ABdhPJzTiBeo7W8E7Ia1g1nNcXjWvW+MDFVMxhiBhK6N2EW9E2ffiushHhJcn60x6ZskJU7F/tHiHw== X-Received: by 2002:a63:33cb:: with SMTP id z194mr35998525pgz.380.1635981263856; Wed, 03 Nov 2021 16:14:23 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id p7sm2613549pgn.52.2021.11.03.16.14.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 16:14:23 -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 v3 7/7] watchdog: Remove BCM63XX_WDT Date: Wed, 3 Nov 2021 16:13:27 -0700 Message-Id: <20211103231327.385186-8-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211103231327.385186-1-f.fainelli@gmail.com> References: <20211103231327.385186-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211103_161424_982908_37E4C6B9 X-CRM114-Status: GOOD ( 29.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 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");