From patchwork Fri Oct 29 18:34:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12593289 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 53A64C433F5 for ; Fri, 29 Oct 2021 18:34:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3F05B60FC4 for ; Fri, 29 Oct 2021 18:34:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230517AbhJ2ShK (ORCPT ); Fri, 29 Oct 2021 14:37:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230525AbhJ2ShG (ORCPT ); Fri, 29 Oct 2021 14:37:06 -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 0E02BC06120C; Fri, 29 Oct 2021 11:34:36 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id m21so10627934pgu.13; Fri, 29 Oct 2021 11:34:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x8MeLTK/d7GnlqXrAXWg0WParJO9OxcW6hqMxpYGMbg=; b=EP+8z/W9sU3u+MHqTlHda7Wtm68iwTwyQcuSW6BAJvPFRJESNT8mn54GHkgaBfzeqV A/9X9qoZp5zpMNgOgZK9bfFwZKjvyQ9vwzduHepz33m6haFDNw+pPdkOrST2n1wQbGeV nflqibu+Bgh25jC4u07LF25IP9irXitcz9PN+jfle5xQGUABx2nn8xV0C9XIJBVA1eGM cspUJTcGeH8RwdIOrwb4jm92PLd3aeq/S0sNIIlO2Fl1rL54rVorBTI6LkcWk2C6GTfz 7kV65H3IL+TuIeMemvA2lQ3Pu18g3VGGzs/wN1Alu0I8W/8GSxEw3wr9OeHCtlofBREr NJCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x8MeLTK/d7GnlqXrAXWg0WParJO9OxcW6hqMxpYGMbg=; b=e6XcCdahUbnU3VXtbwHeaIuft0zowCCHysHfxHLrYj30fCnEDpGz0XR1L1ok1yLQnE MgTqJ+0z4wJfRybvD0ot6XCxdDo35JZhsWwG2mn1JiRaymfh4s4GmwindQUproESGcW9 1PRwAV2Y/Hj4wrd+b4nCAqkGrn+sY0PLHSADxOd8LsjmHRO0pdsU5WoVhsKJrnoauun1 xN82wqBChENlauKM4NWP3MSjY9C5/NWulqWcE/X8w0kpDUhU+CkTMs3aIJn3Wp4dypZM N5c7PvKFTyORoizButqMjqxAwqGDPj79eTyFRZatyoV1ZLRLqj7cNQSG32JY9WzL5pvS QOWw== X-Gm-Message-State: AOAM533bMAzDA+ykU2zM9RqXNQhItVfFoguywnbIbvNLZIlP8Azo2MA4 pGOrEgyxL8KXueibntu8axTWvC0wOq4= X-Google-Smtp-Source: ABdhPJwtN3rJYgxyv38V2DnuBEWKAl/IrMtV8We+wQG01E+R6w0948bihyxE5OuhWKgieW/YTHjGUw== X-Received: by 2002:a62:e707:0:b0:47b:e32f:8538 with SMTP id s7-20020a62e707000000b0047be32f8538mr12335462pfh.69.1635532475148; Fri, 29 Oct 2021 11:34:35 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j15sm7730868pfh.35.2021.10.29.11.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 11:34:34 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, Florian Fainelli , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Thomas Bogendoerfer , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM63XX ARM ARCHITECTURE), Justin Chen , linux-watchdog@vger.kernel.org (open list:WATCHDOG DEVICE DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM63XX ARM ARCHITECTURE) Subject: [PATCH v2 1/7] dt-bindings: watchdog: convert Broadcom's WDT to the json-schema Date: Fri, 29 Oct 2021 11:34:24 -0700 Message-Id: <20211029183430.4086765-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029183430.4086765-1-f.fainelli@gmail.com> References: <20211029183430.4086765-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org From: Rafał Miłecki This helps validating DTS files. Signed-off-by: Rafał Miłecki Signed-off-by: Florian Fainelli --- .../bindings/watchdog/brcm,bcm7038-wdt.txt | 19 --------- .../bindings/watchdog/brcm,bcm7038-wdt.yaml | 39 +++++++++++++++++++ 2 files changed, 39 insertions(+), 19 deletions(-) delete mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml diff --git a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt deleted file mode 100644 index 84122270be8f..000000000000 --- a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt +++ /dev/null @@ -1,19 +0,0 @@ -BCM7038 Watchdog timer - -Required properties: - -- compatible : should be "brcm,bcm7038-wdt" -- reg : Specifies base physical address and size of the registers. - -Optional properties: - -- clocks: The clock running the watchdog. If no clock is found the - driver will default to 27000000 Hz. - -Example: - -watchdog@f040a7e8 { - compatible = "brcm,bcm7038-wdt"; - clocks = <&upg_fixed>; - reg = <0xf040a7e8 0x16>; -}; diff --git a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml new file mode 100644 index 000000000000..bbf2e91f9db7 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml @@ -0,0 +1,39 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/watchdog/brcm,bcm7038-wdt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: BCM7038 watchdog timer + +allOf: + - $ref: "watchdog.yaml#" + +maintainers: + - Justin Chen + - Florian Fainelli + +properties: + compatible: + const: brcm,bcm7038-wdt + + reg: + maxItems: 1 + + clocks: + description: > + The clock running the watchdog. If no clock is found the driver will + default to 27000000 Hz. + +unevaluatedProperties: false + +required: + - reg + +examples: + - | + watchdog@f040a7e8 { + compatible = "brcm,bcm7038-wdt"; + reg = <0xf040a7e8 0x16>; + clocks = <&upg_fixed>; + }; From patchwork Fri Oct 29 18:34: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: 12593291 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 2C75CC4332F for ; Fri, 29 Oct 2021 18:34:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1896860FDA for ; Fri, 29 Oct 2021 18:34:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230228AbhJ2ShL (ORCPT ); Fri, 29 Oct 2021 14:37:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231129AbhJ2ShG (ORCPT ); Fri, 29 Oct 2021 14:37:06 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45BE2C061570; Fri, 29 Oct 2021 11:34:37 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id n11-20020a17090a2bcb00b001a1e7a0a6a6so11294769pje.0; Fri, 29 Oct 2021 11:34:37 -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=VjKVm2pl9yDsl4HKclxfy/9nLeyRiZ7xb5K2rv3ZVsE=; b=HHs0hBlkoFz3ofmeHm0GE8rSmDG57jq5UoQFTqRvPVQIJ1ywMPNI9nceCLYa+7OpHS V8p91aP5hOLRbkw0sUK/GZvZr3+dqVo7SuYFpZmYWrCm2DwHS/1tji8JSVzugh09aYH1 oWsxSKMWgcN+iN13ZlxTIRCrDqFZFWV9h3YkMKMygJtY8M/u6tn0EIW1YT7c6knQn3/j aR8APZ9z2cF0m4FEfziT66TB3XD7reGwrmLUNA7EDHQJN9hUxFiOx1pTi13ZIZb7tYxi WnVv/6J9/LCTrWGCQZuBUrCPueru8gmQTlNS/ZFsxCJWBoFuzfEATyomlPGkwVVfZSQi 2WOQ== 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=VjKVm2pl9yDsl4HKclxfy/9nLeyRiZ7xb5K2rv3ZVsE=; b=cmLrXOj8HDiVeZ6ZF+DXUUpWiWd362UFWA6dJb6ODK5cASGKluFOQkjf79dAdc4I+P 4BlNHXCZGygWfv/bIR7NrxsOGmC6EfC9C9sCVPKIZlUbcTlWq+ujtQfd5aa1mV/QiqJg CKwlA715q8irU9588t37npufA6un59cgZAE/c3Mp3AHiqkCtm9yyL4cYpMwOGj57mZG6 O+eXK1jjhPV/xEvSEraCjvuFBRo5unt1/iBk7++98CaEP6PTE3JvUeCZeJtrJKu6mWw0 uNDRFQTn8JFyg3EMuslQrqolDIRFgM3+Du77z9X+LdWe8moXejJgZZ1/7JX1xbzw6tEh 6Udg== X-Gm-Message-State: AOAM5308rOVHFQN/O9yCPhCabrxmiKHiU9CiUTtrWUSM826U0NZLD+1X b2X7MNH7YtdwqvadoU2rWZuE9Nrpi0Q= X-Google-Smtp-Source: ABdhPJzpoPIoyRcNbB2j68YYdpZUaAngKLdezqOME+2CUJOIHfePduFzN2ucvDl3pZQDPa1sJCbTKA== X-Received: by 2002:a17:902:6b0c:b0:13f:aaf4:3db4 with SMTP id o12-20020a1709026b0c00b0013faaf43db4mr11118737plk.46.1635532476436; Fri, 29 Oct 2021 11:34:36 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j15sm7730868pfh.35.2021.10.29.11.34.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 11:34:35 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, Florian Fainelli , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Thomas Bogendoerfer , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM63XX ARM ARCHITECTURE), Justin Chen , linux-watchdog@vger.kernel.org (open list:WATCHDOG DEVICE DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM63XX ARM ARCHITECTURE) Subject: [PATCH v2 2/7] dt-bindings: watchdog: Add BCM6345 compatible to BCM7038 binding Date: Fri, 29 Oct 2021 11:34:25 -0700 Message-Id: <20211029183430.4086765-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029183430.4086765-1-f.fainelli@gmail.com> References: <20211029183430.4086765-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org The BCM7038 watchdog binding is updated to include a "brcm,bcm6345-wdt" compatible string which is the first instance of a DSL (BCM63xx) SoC seeing the integration of such a watchdog timer block. Signed-off-by: Florian Fainelli --- .../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 bbf2e91f9db7..72cce0a046a6 100644 --- a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/watchdog/brcm,bcm7038-wdt.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: BCM7038 watchdog timer +title: BCM63xx and BCM7038 watchdog timer allOf: - $ref: "watchdog.yaml#" @@ -15,7 +15,9 @@ maintainers: properties: compatible: - const: brcm,bcm7038-wdt + enum: + - brcm,bcm6345-wdt + - brcm,bcm7038-wdt reg: maxItems: 1 From patchwork Fri Oct 29 18:34: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: 12593293 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 327B7C4167D for ; Fri, 29 Oct 2021 18:34:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 04CE2610D0 for ; Fri, 29 Oct 2021 18:34:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231262AbhJ2ShM (ORCPT ); Fri, 29 Oct 2021 14:37:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230419AbhJ2ShH (ORCPT ); Fri, 29 Oct 2021 14:37:07 -0400 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06FDFC061714; Fri, 29 Oct 2021 11:34:39 -0700 (PDT) Received: by mail-pl1-x62a.google.com with SMTP id s24so7426887plp.0; Fri, 29 Oct 2021 11:34:39 -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=B2UiioGffHt5mNj/7Xj0XMUQPH4n2y9lJ+N3OnGgeeAzT8KxZDRGpLrMCumrRjUmRJ 1RPP2acX4eeX9SIbzAZ99j95ciYvTmwSNtMYk0UwFI/1IQwObaplTlnJyy7lP4LOUyAM 6RuGulPPn1qhI9L+f4HbGO/YIsEzxJndBlZsqdIqKRIhZEI6W8ybtDrSrcETrJ2mhxgA IIxjSlRdqEHUEdeC8fQ/5F0+RFwvlPr7PyozJOdua9/MdjEwQg3sKflNNqcRjP1md5gb rebRt2KCWqsKyjHxoX9bCL94Nff+TKjlG1y6edsJemRGx6PPgOy9/nxkCd3qWeilf/ys h44g== 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=u6xvkQxHD2vPxERjue4r8C4//CEpRiIEnuDXongyg4igl07X6GeRVrdSAKAmO3pKnJ Fq95OfxzCLFQQAQ9XSSSc6IPQxdPFergLayehooKFfJXIroT5ZzjsdIOVu8B1rVfEVqT 0r6hvlCIRqexVlIgLkPq8YbGDjG+aFGOA592buT9LDpQD4ZCTTwDl2u8jjJRYUT+0TtZ M36EQtn3Zf0W40MBl78jvlR35YQO2UhUj0rGE8Ca8apa0+mF3/cHi3wR94dRpYVRSGA5 ouxblZYZk6wFTHWnH3AG8TncLVAZYqC2yT5Fff37FaryKK656pZFl9FEMK1MsJS6VsCA /ntg== X-Gm-Message-State: AOAM531y9/+QsyTR89ClZm6+tewos6OjvkqSUFCRPUS3ER+y8Yljmn3P /W2Xl6VP0NEmet1sgU5biVsinm6pN0I= X-Google-Smtp-Source: ABdhPJxMVj6wK3FCKR+yxIexnahKPndvOCDIRDoFoUymJ4h+UoK5h17lbhNMYdXIkkMtI81gg4xdLQ== X-Received: by 2002:a17:90b:3802:: with SMTP id mq2mr13182411pjb.213.1635532478146; Fri, 29 Oct 2021 11:34:38 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j15sm7730868pfh.35.2021.10.29.11.34.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 11:34:37 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, 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 v2 3/7] watchdog: bcm7038_wdt: Support platform data configuration Date: Fri, 29 Oct 2021 11:34:26 -0700 Message-Id: <20211029183430.4086765-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029183430.4086765-1-f.fainelli@gmail.com> References: <20211029183430.4086765-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org The BCM7038 watchdog driver needs to be able to obtain a specific clock name on BCM63xx platforms which is the "periph" clock ticking at 50MHz. make it possible to specify the clock name to obtain via platform data. Reviewed-by: Guenter Roeck Signed-off-by: Florian Fainelli --- drivers/watchdog/bcm7038_wdt.c | 8 +++++++- include/linux/platform_data/bcm7038_wdt.h | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 include/linux/platform_data/bcm7038_wdt.h diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index acaaa0005d5b..506cd7ef9c77 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -133,8 +134,10 @@ static void bcm7038_clk_disable_unprepare(void *data) static int bcm7038_wdt_probe(struct platform_device *pdev) { + struct bcm7038_wdt_platform_data *pdata = pdev->dev.platform_data; struct device *dev = &pdev->dev; struct bcm7038_watchdog *wdt; + const char *clk_name = NULL; int err; wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL); @@ -147,7 +150,10 @@ static int bcm7038_wdt_probe(struct platform_device *pdev) if (IS_ERR(wdt->base)) return PTR_ERR(wdt->base); - wdt->clk = devm_clk_get(dev, NULL); + if (pdata && pdata->clk_name) + clk_name = pdata->clk_name; + + wdt->clk = devm_clk_get(dev, clk_name); /* If unable to get clock, use default frequency */ if (!IS_ERR(wdt->clk)) { err = clk_prepare_enable(wdt->clk); diff --git a/include/linux/platform_data/bcm7038_wdt.h b/include/linux/platform_data/bcm7038_wdt.h new file mode 100644 index 000000000000..e18cfd9ec8f9 --- /dev/null +++ b/include/linux/platform_data/bcm7038_wdt.h @@ -0,0 +1,8 @@ +#ifndef __BCM7038_WDT_PDATA_H +#define __BCM7038_WDT_PDATA_H + +struct bcm7038_wdt_platform_data { + const char *clk_name; +}; + +#endif /* __BCM7038_WDT_PDATA_H */ From patchwork Fri Oct 29 18:34: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: 12593297 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 D76A6C4321E for ; Fri, 29 Oct 2021 18:34:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC90461040 for ; Fri, 29 Oct 2021 18:34:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230467AbhJ2ShN (ORCPT ); Fri, 29 Oct 2021 14:37:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231157AbhJ2ShI (ORCPT ); Fri, 29 Oct 2021 14:37:08 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A75DC061766; Fri, 29 Oct 2021 11:34:40 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id y14-20020a17090a2b4e00b001a5824f4918so4452920pjc.4; Fri, 29 Oct 2021 11:34:40 -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=jOTKtbWjKy0S4Qh+8mtMjxBhT5aoLSrORa87133JyvVJ01Pfk18PFdmZ2dq9OTg0Pm mVCHTuQ4gU4nsXlmuDVSlkXgqDReZXg5TuX3bo0ULZwDS9sbCSL3Ol70CSzFhvwOyhYk /jzOLbl9iBLOjfoKe6UcQF2Tmi7JG9G6QphLSaVXOQoXGArdF7uaxN8GDMHzizslKRyF whJvASn9z+/lALDSuZHQlL02mTMfZUBEJJyGCRdSlThi6IharESaqnoYD8Ou91f5idhJ clbIs5Ct+gf6qqVaXfgoqrEaxx8VV0Gv1PAx6r0ahVzAO+1UXnCtOtPScF38OCMK8WHF 8n7g== 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=6Wbx0ibf32NEwyHmXE+Ydwn/td3X0+hn5HPU1AoGQeTi6tIHy7V/8UdZwBtb5rjwxY Ig04WdYYY8LpgNf/wPVZbfOSPzn57Fr1e8gZ0jGfx8J0MXGsCgV65iX78mtgf73u44k2 eF3FKGXmcAzfZD3IbF15NTyBqRCjQyBolt4VIp/wUERttx/kM3s5YILslBZ0SCSeoXPS Z40nw6SvBZvDvAX+Ui89dBFxnYK5FTuR94k0DkNAkn+x5VreeN1mJkoMQZStQZHov5Jw bAiemntR5fSFZ6bUWhGGqJhq9Eno/Geo4JI4VXICtQ4Hiub6KctttpxmmQ1eN1qEiTuP ORFg== X-Gm-Message-State: AOAM531Bapg2nH1IUdfU/ALgSv6wp4z2cKzSOsVPbqCZuf76wpZAkd3u w035ueR65T+hmZfZryLORyUCwQcgyM4= X-Google-Smtp-Source: ABdhPJyjPjKys0TeB7U5Sl0deBind/c0gthESyEQbeTkDRuAR21InRPXLbTYSFLaM+77/A70pXMDTQ== X-Received: by 2002:a17:903:246:b0:13f:2ff9:8b93 with SMTP id j6-20020a170903024600b0013f2ff98b93mr11445830plh.54.1635532479360; Fri, 29 Oct 2021 11:34:39 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j15sm7730868pfh.35.2021.10.29.11.34.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 11:34:38 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, 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 v2 4/7] watchdog: Allow building BCM7038_WDT for BCM63XX Date: Fri, 29 Oct 2021 11:34:27 -0700 Message-Id: <20211029183430.4086765-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029183430.4086765-1-f.fainelli@gmail.com> References: <20211029183430.4086765-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org CONFIG_BCM63XX denotes the legacy MIPS-based DSL SoCs which utilize the same piece of hardware as a watchdog, make it possible to select that driver for those platforms. Reviewed-by: Guenter Roeck Signed-off-by: Florian Fainelli --- drivers/watchdog/Kconfig | 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 Fri Oct 29 18:34:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12593295 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 AFA48C001B6 for ; Fri, 29 Oct 2021 18:34:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 86A3861040 for ; Fri, 29 Oct 2021 18:34:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231307AbhJ2ShO (ORCPT ); Fri, 29 Oct 2021 14:37:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231177AbhJ2ShK (ORCPT ); Fri, 29 Oct 2021 14:37:10 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0E9CC06120A; Fri, 29 Oct 2021 11:34:41 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id in13so5422047pjb.1; Fri, 29 Oct 2021 11:34:41 -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=Evr7N5kMFxVWl61tojIQcMmQ7hRRSJNw1OGzpeBD/UI=; b=p5fAVPj/yMhxSSyVDhufMakw6AkE5Za0+peL5uzSyULK0brWfIG5R84ArdCgclXOA/ EraNDv7KUjU4SWJDRoPuwlGnnUehgXNilUKDkq4j4ssh+sndtm4alODwa3oI30mrAM+i 8FR66oT8EUJWmrM1auY04Y7UG7yG9JDxNi01iun0PRtFPyVUtVF2Vha8BDrS1VXwIDmA jg8Hi4MCxeai4hSbXiuEhdySuryehukB6RpVT9QA/LHL7mag8LV5OYkZO6QejecSfZts SGW7XXl83dDCNqEZabfhwzqPs9pkvlAkuzqvIY7MZKlrpZAFTIHNdZ0wo5rvKFolYdSt ywhw== 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=Evr7N5kMFxVWl61tojIQcMmQ7hRRSJNw1OGzpeBD/UI=; b=ugc9PdybnS3hiDOyTN5hHJHt0duDGob6Sb9imH2yTNVHXvOIMmy+tO/BmdQe+eRvAo oeop/GWPoRvxtMVTyaLz+aAqiCgoXrfpLqiAD+4pwjiVMQhoIRM5dJgbF6aZWL6diqNJ cF9o/+4ZWaoQBHz+KB5S13NowfDqbtNqhScAKqA52XRmybPFYv1ogHZlAzkHNPgZnTyR olpfBSlVj0FMS4Y29LBnDmnxLZbgVs+NjXtQ8PP5oFQeidXVN+5KR2sxTnNb93YMsaLK NteccYW5dp1F3Yz4NGwuLn7vvFG8LavRiVkpEdGwCDXJZFB4tvi4UYEWoBf3szkF0o4O YjUA== X-Gm-Message-State: AOAM5326JZ386nADCFJcReD4sHWy7QPtHEWiP8/e9VuTAM57D/kBYfEr gk7Nqho4koXsKWhMyoDN3fdErpnn9vk= X-Google-Smtp-Source: ABdhPJz/1dGTabz/xd3DJgKJRoAfkUDx+2n9SMd403306qqafc5rrY8DskT5qrvp7YVg+sAjEsLSZw== X-Received: by 2002:a17:902:a410:b0:141:be1a:53d1 with SMTP id p16-20020a170902a41000b00141be1a53d1mr1304815plq.71.1635532480950; Fri, 29 Oct 2021 11:34:40 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j15sm7730868pfh.35.2021.10.29.11.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 11:34:40 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, 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 v2 5/7] watchdog: bcm7038_wdt: Add platform device id for bcm63xx-wdt Date: Fri, 29 Oct 2021 11:34:28 -0700 Message-Id: <20211029183430.4086765-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029183430.4086765-1-f.fainelli@gmail.com> References: <20211029183430.4086765-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org In order to phase out bcm63xx_wdt and use bcm7038_wdt instead, introduce a platform_device_id table that allows both names to be matched. Reviewed-by: Guenter Roeck Signed-off-by: Florian Fainelli --- drivers/watchdog/bcm7038_wdt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index 506cd7ef9c77..2535f450e8a1 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -223,6 +223,13 @@ static const struct of_device_id bcm7038_wdt_match[] = { }; MODULE_DEVICE_TABLE(of, bcm7038_wdt_match); +static const struct platform_device_id bcm7038_wdt_devtype[] = { + { .name = "bcm7038-wdt" }, + { .name = "bcm63xx-wdt" }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(platform, bcm7038_wdt_devtype); + static struct platform_driver bcm7038_wdt_driver = { .probe = bcm7038_wdt_probe, .driver = { From patchwork Fri Oct 29 18:34:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12593299 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 57CE7C433FE for ; Fri, 29 Oct 2021 18:34:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 413D461177 for ; Fri, 29 Oct 2021 18:34:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231364AbhJ2ShP (ORCPT ); Fri, 29 Oct 2021 14:37:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231252AbhJ2ShL (ORCPT ); Fri, 29 Oct 2021 14:37:11 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CACBC061766; Fri, 29 Oct 2021 11:34:43 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id nn3-20020a17090b38c300b001a03bb6c4ebso7973763pjb.1; Fri, 29 Oct 2021 11:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bxPuQkzCjr4bMQ3izqSZWCgKaBxIVRYi/TUmbbXS7uE=; b=ULqODS4st2cEkpjbN+VcS9QFpsj8FVYc302T/VbSyig8qndFTSLDg3B1NIjOLlw7bk BLs6jx2+0GTQoRY9qO6UFzxjCuFfHsb0lxv1CYb0Ytx7Hu4c2HD/Sp1Ml1NGwZCIw5BZ Nsja389kYKaMZ55pr+wacdKmoEFMsKBEKbqhOf8ehuv4Evgg3pDBH8Z7lkRc+jFF3xf0 NT7kQH71vBNnuhrKYtVmUfpA+3gj5Eh2T9GFUCc9GORYnjXyMO2u47fd3mbAgyY4KsUd MynObiB/WIR4yNjsJQiNj7zEW5BLOGDVPhR7f2prQ3jPAOvRFz7ewpVPPb79Fy02KIRV 5Wzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bxPuQkzCjr4bMQ3izqSZWCgKaBxIVRYi/TUmbbXS7uE=; b=jbOEvuw3ByLQr5ujZydE+1UUrTeGLdxJ2EZJtkmO3YiLVPWfqXFLT/VixDJzGuyYcI sBwesAM6MuDF9613SPVVFqgkHhjF1AYbecJOGMYm2Fp2+l9KMaIgh01YP0Gm1UWQ/paT 6G6cKRarFsYh18w6XR2griBq4GjN4/wXEyOiv9wEy6IEYgP97gAcx405yghRbKHYJ5+O YPXACKLynvAeqs+LZ+NDnbLMi0fHow80lecRFEvkrYu7B24wTBn9pyWndD3oXI9l9XOW z6mrB1mSiYjd6TeyESbnamMayussAc3+vETjtfUEVVPgFucEbRu8eUsaD3zEdB3MWKVj 20Tg== X-Gm-Message-State: AOAM532JE2lY1MvfZVKz0tcKrTTblFr9H/Zkpk6mn27QPucdzrf/oyv9 mneBTKb18RG8ZkHkE98vSZDubWsjnvQ= X-Google-Smtp-Source: ABdhPJyhQph7vUTcpErM+npJza8ndayuNekge5Uz2UBOw056O1Ux9P8dVfpW4exJJisGD1X1ZcVP1Q== X-Received: by 2002:a17:903:124a:b0:13f:cb85:1a3a with SMTP id u10-20020a170903124a00b0013fcb851a3amr11140944plh.32.1635532482188; Fri, 29 Oct 2021 11:34:42 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j15sm7730868pfh.35.2021.10.29.11.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 11:34:41 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, Florian Fainelli , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Thomas Bogendoerfer , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM63XX ARM ARCHITECTURE), Justin Chen , linux-watchdog@vger.kernel.org (open list:WATCHDOG DEVICE DRIVERS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-mips@vger.kernel.org (open list:MIPS), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM63XX ARM ARCHITECTURE) Subject: [PATCH v2 6/7] MIPS: BCM63XX: Provide platform data to watchdog device Date: Fri, 29 Oct 2021 11:34:29 -0700 Message-Id: <20211029183430.4086765-7-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029183430.4086765-1-f.fainelli@gmail.com> References: <20211029183430.4086765-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org In order to utilize the bcm7038_wdt.c driver which needs to know the clock name to obtain, pass it via platform data using the bcm7038_wdt_platform_data structure. Signed-off-by: Florian Fainelli Reviewed-by: Guenter Roeck --- arch/mips/bcm63xx/dev-wdt.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/mips/bcm63xx/dev-wdt.c b/arch/mips/bcm63xx/dev-wdt.c index 2a2346a99bcb..42130914a3c2 100644 --- a/arch/mips/bcm63xx/dev-wdt.c +++ b/arch/mips/bcm63xx/dev-wdt.c @@ -9,6 +9,7 @@ #include #include #include +#include #include static struct resource wdt_resources[] = { @@ -19,11 +20,18 @@ static struct resource wdt_resources[] = { }, }; +static struct bcm7038_wdt_platform_data bcm63xx_wdt_pdata = { + .clk_name = "periph", +}; + static struct platform_device bcm63xx_wdt_device = { .name = "bcm63xx-wdt", .id = -1, .num_resources = ARRAY_SIZE(wdt_resources), .resource = wdt_resources, + .dev = { + .platform_data = &bcm63xx_wdt_pdata, + }, }; int __init bcm63xx_wdt_register(void) From patchwork Fri Oct 29 18:34:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12593301 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 57D1EC4332F for ; Fri, 29 Oct 2021 18:34:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 33CEF60FC4 for ; Fri, 29 Oct 2021 18:34:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230168AbhJ2ShQ (ORCPT ); Fri, 29 Oct 2021 14:37:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230509AbhJ2ShN (ORCPT ); Fri, 29 Oct 2021 14:37:13 -0400 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D807C061570; Fri, 29 Oct 2021 11:34:44 -0700 (PDT) Received: by mail-pf1-x431.google.com with SMTP id l203so10016422pfd.2; Fri, 29 Oct 2021 11:34:44 -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=kIIeB4esScXEFsvrUoZDME8FYdVf1VWGPtUumBrrm+Xh+na1/8qW7O/nXQWQ13jAMK 6FSoOcNvQyuTuw/PX75A8+lYfogAA2+m6iUtGEvAzept23UBttI9KXGTIWqdEUNO1AG6 r4EAsXJmZwWMRB3ASKVLfao3Qy5zLESoGnVYsJdJW5koQIuASFCGmYJpO48aLA6bGLte LO7puKutboac/ONoti+zzJ8R4Gyj5f+iLChNi8bQhM4nzQxwuY9GiKq/UjYi8U2DLJHH kF+u4Afmk96W8XDDH33aQL/z+4dGQh34+WZ5LK1qFm7TjKODXSZgkBrx1Uz2TjPKc2tf VAcQ== 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=qkuCYqeC9FSkKsHdiaV96frir6txDYUGNu7haROnYpTLmB3mxXzrqVtsTWA24Vono1 fXKAZMMjWHSjMm5Gnih40l9op5oTKl9d05oOHzyC64N8uD0mahcibazkBqwbOgJBmxTz AGs8MzdQKLKxQVufFdo/fennvVHw27wZIzZE15lihzXJrb3BpTRkBR0yJSSHwmHSDjlW qSVCNWnxxqwdbyPvU9HQuX6xOYdxviVnd8/578yZE4nTgZS+ayR/Hok7x3ey/xvXaOh0 R1wiMH0CVsNv4AWHQeH+KtjLewF9IJPh+Mx8yYZb2Pl0J8wneqkpCzuqDQZEDM5ei5fI 1sMw== X-Gm-Message-State: AOAM5313yHjatpM8pwT6ncECdUWIBlIQZiem8wUE8FiM3xoC7LbPEugP y1aTRahfwf6Sm1xMTzXUddiMYTKA+Ow= X-Google-Smtp-Source: ABdhPJwy0TJVYrNtoCTVMmU9GaGIF5hKicBn4y2EIbWmg+yquzZ9HGS4j+RZswwFNLqlQEqedrqusQ== X-Received: by 2002:a62:ab14:0:b0:47b:e126:ea50 with SMTP id p20-20020a62ab14000000b0047be126ea50mr12562259pff.58.1635532483497; Fri, 29 Oct 2021 11:34:43 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j15sm7730868pfh.35.2021.10.29.11.34.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 11:34:42 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: rafal@milecki.pl, 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 v2 7/7] watchdog: Remove BCM63XX_WDT Date: Fri, 29 Oct 2021 11:34:30 -0700 Message-Id: <20211029183430.4086765-8-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029183430.4086765-1-f.fainelli@gmail.com> References: <20211029183430.4086765-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Now that we can utilize the BCM7038_WDT driver, remove that one which was not converted to the watchdog APIs. There are a couple of notable differences with how the bcm7038_wdt driver proceeds: - bcm63xx_wdt would register with the ad-hoc BCM63xx hardware timer API, but this would only be used in order to catch the interrupt *before* a SoC reset and make the kernel "die" - bcm6xx_wdt would register a software timer and kick it every second in order to pet the watchdog, thus offering a two step watchdog process. This is not something that is brought over to the bcm7038_wdt as it is deemed unnecessary. If user-space cannot pet the watchdog, but a kernel timer can, the system is still in a bad shape anyway. bcm7038_wdt is simpler in its behavior and behaves as a standard watchdog driver and is not making use of any specific platform APIs, therefore making it more maintainable and extensible. Reviewed-by: Guenter Roeck Signed-off-by: Florian Fainelli --- drivers/watchdog/Kconfig | 10 -- drivers/watchdog/Makefile | 1 - drivers/watchdog/bcm63xx_wdt.c | 315 --------------------------------- 3 files changed, 326 deletions(-) delete mode 100644 drivers/watchdog/bcm63xx_wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 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");