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: 12601877 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 44217C433FE for ; Wed, 3 Nov 2021 23:14:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2DFA0611C4 for ; Wed, 3 Nov 2021 23:14:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229998AbhKCXQ4 (ORCPT ); Wed, 3 Nov 2021 19:16:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229894AbhKCXQy (ORCPT ); Wed, 3 Nov 2021 19:16:54 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D778C061714; Wed, 3 Nov 2021 16:14:18 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id g11so3942478pfv.7; 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=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=QAsyGnwpXaW9DlqukS8/mIowlYOUz8I22DmNOBuMkUSbNJ5EEVxD1FeRWwUFCuoaVT 9SrxEh3fRqSsPvwGyjjwdSUqCqOszHp8w/a5FaujfwxrlUoYNu9jJszlVKfj+QRzH0QL S75bxdBsWIJfWt1oXzO9fZuGm8AHZSjavxlfbXc7ZgVHnTge1enerngIl43ri3x3EvZL gjrjd87fwjqK0Yvhk7/ijWlibK1z1okeklCm2NJ1EHtBIcylfco6SbcUnl8V09gg12C0 TTEo0CYHDbr5JVq77lSwTkdZmM/EjPQvg83hG37Z+m/HUJJ1RIXQSJB60pv2BBzBj13q r4zg== X-Gm-Message-State: AOAM531/U8G0NPmUrgPF+fM4IFvaqOIxjHNitP6ZIxoMSXU1hPXu66sb MXNDKz/IPQ9ewvjERIjYnkh2Dr1Dapw= 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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org From: Rafał Miłecki This helps validating DTS files. Signed-off-by: Rafał Miłecki --- .../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: 12601879 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 6BE64C43217 for ; Wed, 3 Nov 2021 23:14:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5AAB0611C4 for ; Wed, 3 Nov 2021 23:14:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230168AbhKCXQ5 (ORCPT ); Wed, 3 Nov 2021 19:16:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229948AbhKCXQ4 (ORCPT ); Wed, 3 Nov 2021 19:16:56 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10DE3C061714; Wed, 3 Nov 2021 16:14:19 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id m26so3962512pff.3; 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=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=3PtNrGHSStsE5sLFc75WW28z17PmANLwXclcItT0vcscgI39Ie3WAtKB2UGCun1sOX 0ZRJ+C59H8RedTsiXFegGaLrrhFHaEP4H0oIqSpEHV0m3FkODEXQyD3kZWusG1FV/5tE cDCQgwg2N2RN8pLxWotbOd155pDAu/U1DMh33auMfN7ACWF+Pgq80Bei7TYjumbmXKUZ mKzjZ1vF9iqxzEoTlZKadnBGBNUZuWkykg985rOPMl5ocRkuFDsglCoOfBNtHj+nSIJh lT5kaN3aYKbxigTvhAOqnW/LX8UC0wltBPCq2J+ebNjQWvo+EBLDJp8MeU+Z1qjHoPQe ec2Q== X-Gm-Message-State: AOAM532u1j4JRbOfmODn0bIRAdiilt+ECx9GPQ4gfej1uXjo4BbU/fw/ g8rW5FbwLJzDdqkhyjAE4pZyzSWutcU= 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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org The BCM7038 watchdog binding is updated to include a "brcm,bcm6345-wdt" compatible string which is the first instance of a DSL (BCM63xx) SoC seeing the integration of such a watchdog timer block. Signed-off-by: Florian Fainelli --- .../devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml | 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: 12601881 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 735A1C433FE for ; Wed, 3 Nov 2021 23:14:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5A5E060F70 for ; Wed, 3 Nov 2021 23:14:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230343AbhKCXQ7 (ORCPT ); Wed, 3 Nov 2021 19:16:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230108AbhKCXQ5 (ORCPT ); Wed, 3 Nov 2021 19:16:57 -0400 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07E9DC061203; Wed, 3 Nov 2021 16:14:20 -0700 (PDT) Received: by mail-pg1-x52b.google.com with SMTP id j9so3735595pgh.1; 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=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=TvG9NZji6ulMV4BqkkVS9NyOzA1RA62ezgepWaD9Ojwi2TMb55rBbuauMjijPspP1z wl6ux8W7aC3ph2dJlEfz5/u0VOzITysQAyRFYDE8+1EGM1wInIeQeGPIojZeXj0KPdim 07CfoBsignhTZ26j6FJvbsNpbnIi5Rf8R4X8NNnqaZYBEPAYXye6/3I1dHajjbMz/E+j ow8O7IkeDeLb2lCxWs2Q2dLuwwvZzyO6/P9Bn/QzF/yYnAcfSqyunXyJhh0dqow6in2P nHoMC+13/QdkqtYKlGdT27T/g27zLpj+aBdKEzT6hdiBl/kKMx2BRU90EP0DLKONEe+5 OK2Q== X-Gm-Message-State: AOAM530cG1q2/R7o5MlVky76BNfhCWMuzZ+aGzTE1h6KiU6JrYb7Liap hx1ypmZNxbDg1tSdkVAyS3ZbIayPOE0= 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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org The BCM7038 watchdog driver needs to be able to obtain a specific clock name on BCM63xx platforms which is the "periph" clock ticking at 50MHz. make it possible to specify the clock name to obtain via platform data. 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: 12601885 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 2848CC4332F for ; Wed, 3 Nov 2021 23:14:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 139E9611C1 for ; Wed, 3 Nov 2021 23:14:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229948AbhKCXRB (ORCPT ); Wed, 3 Nov 2021 19:17:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230301AbhKCXQ6 (ORCPT ); Wed, 3 Nov 2021 19:16:58 -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 10986C061208; Wed, 3 Nov 2021 16:14:21 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id m21so3687847pgu.13; Wed, 03 Nov 2021 16:14: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=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=R9Q970JEhwfC4zFkGECPiN9RWFWS3wLojVHAYAtqnRlKd9Fi8P9+FmLKSEtQruZ5Gn 1YVz8Zd/MnJPTxBwiBjNuwmuNEIOw1nMQ1jk+Y2rU4EgC6YTeZ7gO6vNGFPFOja7hJfu 1k65eQVeTOLZ3Dc7ccijaKQLzYWjMJL+uS6ERhL+NrNm5tv5V2QG/IW3gRgFIJV0EDf+ 5BZNyh+0e2lz04jWvN5xOG6jZMZ4yBgmTKRuSRwhPeUm6izNoRBqPcmqDHNb+2uX7N1n 3SKWG6fusm+pAjekvWmnZLiaDxdEVKpKaau/+LvG30E4azYrh01waIratPe7RGltyesI c5yw== X-Gm-Message-State: AOAM530AImpeuU2L0i2XQrbx+QCanUNTeKsAbSumi2L8QN4NuZjxZAKe +PAXGKOYLhPri6/SLK1jcrf0KamvE5Q= 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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org CONFIG_BCM63XX denotes the legacy MIPS-based DSL SoCs which utilize the same piece of hardware as a watchdog, make it possible to select that driver for those platforms. 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: 12601883 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 14AD5C433F5 for ; Wed, 3 Nov 2021 23:14:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F1C88611C4 for ; Wed, 3 Nov 2021 23:14:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230478AbhKCXRB (ORCPT ); Wed, 3 Nov 2021 19:17:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229964AbhKCXQ7 (ORCPT ); Wed, 3 Nov 2021 19:16:59 -0400 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 642C1C061714; Wed, 3 Nov 2021 16:14:22 -0700 (PDT) Received: by mail-pg1-x530.google.com with SMTP id f5so3686608pgc.12; 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=XEFKI8ylwuzn/KvaUORKQWzEGi8z/5/kG+RZJ5nOePE2g6BEnB1PBx7lB/cqsnk/AG B7WMMpHJHT7Ys+RByMgzVe12z5xSuSIVUO6bn9zNUp0rJ+mqelpkLo4tXp74rH08ASR1 mXpbPHsiTx0TN4bYg6vqNXjPfb6AYxlu/Q3aCDNc0oIeUcZ+0HwxubZvjds5B+8mGVsY EFjWTwjDVFtooLo30agqqIao6WpcjD1ehM07dqA10zti9AKwwnspzrpkqmu2kCHbwnes aO704Uyzmj8u1UNdlYF502y8jL0PJ1htjJo2SxoL7rYXU3hhyW2i2j87qa6WiSzJB5Hj 9rxQ== X-Gm-Message-State: AOAM531NgyWIVZSztEO1nRFMCy1vi1U/4R8FnwAyxiqPBQNQczyNYy/U 9CJDaSaOIGFZsdDi8531QnhAm6RsbNo= 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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org In order to phase out bcm63xx_wdt and use bcm7038_wdt instead, introduce a platform_device_id table that allows both names to be matched. 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: 12601887 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 689C3C433F5 for ; Wed, 3 Nov 2021 23:14:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39448611C1 for ; Wed, 3 Nov 2021 23:14:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231136AbhKCXRD (ORCPT ); Wed, 3 Nov 2021 19:17:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230414AbhKCXRA (ORCPT ); Wed, 3 Nov 2021 19:17:00 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8296FC06127A; Wed, 3 Nov 2021 16:14:23 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id k4so4090335plx.8; 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=EcdnSNW05PIVhqceyWrxthe7ju1t8EdI9ML/djj59LQzhtWIJuOIHybx4Qj8/TGiqn JkOVLyl811LPwxwhr6A6z5Jh2zf6yYqCUtqvG4Lo5lyrK8Ky6yKVnORK9MZqMBdfkUL0 JtasohxN89+fm9oYJujS67fMEL27IdgoiHTEl9BPkWDtqWSAmdgpV/mYNfnvnycmHOzY 1y+HS6hpCpFQhmZG91mrdoB3AmEthAr+XnJ1xCnVPclF73vWPP2BU11WPBgU9QDSjWtM VY8PqNObT5AOH7t2vA1qVbOSWGWtN/FsuG1qASoNVrWqIkKG+Ep1NNT4XW+PRQDkLs4y 6dbA== X-Gm-Message-State: AOAM531ySi7EiVNR780wEey9J3TNf2GYFSQs0EXU8UgMlej95Mc45hX5 hqLt3HnHD2i9C2N4A7XEuumi43tGDds= 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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org In order to utilize the bcm7038_wdt.c driver which needs to know the clock name to obtain, pass it via platform data using the bcm7038_wdt_platform_data structure. 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: 12601889 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 72421C433EF for ; Wed, 3 Nov 2021 23:14:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 59AC660F70 for ; Wed, 3 Nov 2021 23:14:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230318AbhKCXRS (ORCPT ); Wed, 3 Nov 2021 19:17:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231388AbhKCXRN (ORCPT ); Wed, 3 Nov 2021 19:17:13 -0400 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83546C06120F; Wed, 3 Nov 2021 16:14:29 -0700 (PDT) Received: by mail-pf1-x434.google.com with SMTP id x64so3946535pfd.6; Wed, 03 Nov 2021 16:14:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=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=ZD5EY0Aw4N8g2ohv+JchxRb0pp/M+XmgO9jJqKigAGrYS6YNWhXp35OhYP6XCDPs8o wQWJ63V+BQ6UIna+scldSWk4Xigp4YPrsVQTtCyoQPWwQJrzRQ0A/S8lWb2vk12DroiW mjYMldMV0aIhx+IiHK4+bItzFIl3l2FtGB9mFb+IBhDtkro919ToL/oRjMpS1yX4GqKV 9Pf+oF6ptK3CAt3J5OrsJ2v7cBBmCYau6/Gh/xcnrNvnFaTIYwtcuU53ipQh9biFFyN1 u6Rssp0hEeLJTFLs6YeDYBAjaXiYQqx1pXzTbKthkoUBx0aqRkpfaGpycmdQdTDIESKs Ll0w== X-Gm-Message-State: AOAM531Zxbculj2Ban3EjMh+U0eCDZEGaXL4qGKPqRbccynT0bEQ65MN bifYDLzRI6sUIY62AM5EuoS1wwSm2Og= 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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Now that we can utilize the BCM7038_WDT driver, remove that one which was not converted to the watchdog APIs. There are a couple of notable differences with how the bcm7038_wdt driver proceeds: - bcm63xx_wdt would register with the ad-hoc BCM63xx hardware timer API, but this would only be used in order to catch the interrupt *before* a SoC reset and make the kernel "die" - bcm6xx_wdt would register a software timer and kick it every second in order to pet the watchdog, thus offering a two step watchdog process. This is not something that is brought over to the bcm7038_wdt as it is deemed unnecessary. If user-space cannot pet the watchdog, but a kernel timer can, the system is still in a bad shape anyway. bcm7038_wdt is simpler in its behavior and behaves as a standard watchdog driver and is not making use of any specific platform APIs, therefore making it more maintainable and extensible. 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");