From patchwork Fri Nov 12 22:46:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12617447 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 DED6DC433FE for ; Fri, 12 Nov 2021 22:46:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD32A610A0 for ; Fri, 12 Nov 2021 22:46:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236008AbhKLWtd (ORCPT ); Fri, 12 Nov 2021 17:49:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236001AbhKLWtd (ORCPT ); Fri, 12 Nov 2021 17:49:33 -0500 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E03CDC061766; Fri, 12 Nov 2021 14:46:41 -0800 (PST) Received: by mail-pf1-x42e.google.com with SMTP id g18so9635593pfk.5; Fri, 12 Nov 2021 14:46:41 -0800 (PST) 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=uh9Qlw6LxLHXooJsqQQ7CfQ5xCKmfK88jAvFllzkUvI=; b=mCcsii4K1rxmyzWbuQL4gEA71mR8vzZ+wcj+vP08Y7bs2GfwQvJXUh7mlZ8vHuUh8M eTWeltYU9rOV89TGAjaIzaGATy31MFYrtysAEIDCfNdlM/BGYhauyXCswCoyyZ+9nIJM TraghKoAjfGzFSqi0kp1j4V+6Sy6hJNoRUEfMmq1+PtEH9aIsOAdmfII4/IH4kyDm50Y f86FjTzLlJkfLFAT5r5XcTCz/AiPuoPPm9MNDDaHmai2MoHZExrroHoCjkC/H8tDYhBg 6L/OE+91cUsHk/2QqAULUv61FyEoYZyqblpcMqmxqtomudk1Cw6TaPcLyPwZaH6NKOqm J9mQ== 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=uh9Qlw6LxLHXooJsqQQ7CfQ5xCKmfK88jAvFllzkUvI=; b=ivo0I75upz/0jQVr1QF7M1Eq0BtfFQN8V5RyXrS/4n31aeTzxli3YsHayE0Dxmx+pS FYOGFd8eJQI1hINBpDndcCgavk7xWNpvoenafN1LiUdtbS9zbJhC39Cj6iZ04c69i3Sa rywDpiXocHqxm1Xthx76AExCklqkKvU5gcHZRLG5LiZPP6iJG4ghcffrUtKC8ctdW3zC IXoKULXa5C+q0GumGgUMG1mfYdNN1nJtYDAqZy0/VT+IY12VGL7r/EVUPKIhrcpm/vwt Jd5sf1zc0UX0cJId1RTXC015CXj1qD2Gt/mT/vk7rb/9zBHBaMddgfI26SDj319GfUMR Yw6A== X-Gm-Message-State: AOAM533C0VtcvxbjofA98HpafsWk/3lkIMqkf+imj5T2wkWO2uvzhR0G WGZafevlcJfsSs7OzgDsF65+gN3DPwU= X-Google-Smtp-Source: ABdhPJzwkOp2KP+3vkm3FfojZvwIjm28DWaDuRGlqOldG5gxUB704AvfqQePJSgymKqvkfzdWpJDFg== X-Received: by 2002:a05:6a00:148c:b0:49f:e048:25dc with SMTP id v12-20020a056a00148c00b0049fe04825dcmr17289615pfu.12.1636757201077; Fri, 12 Nov 2021 14:46:41 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id k14sm5647004pga.65.2021.11.12.14.46.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 14:46:40 -0800 (PST) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Rob Herring , 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 v5 1/7] dt-bindings: watchdog: convert Broadcom's WDT to the json-schema Date: Fri, 12 Nov 2021 14:46:30 -0800 Message-Id: <20211112224636.395101-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112224636.395101-1-f.fainelli@gmail.com> References: <20211112224636.395101-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. Reviewed-by: Rob Herring Signed-off-by: Rafał Miłecki --- .../bindings/watchdog/brcm,bcm7038-wdt.txt | 19 --------- .../bindings/watchdog/brcm,bcm7038-wdt.yaml | 41 +++++++++++++++++++ 2 files changed, 41 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..ed6210666ead --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml @@ -0,0 +1,41 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/watchdog/brcm,bcm7038-wdt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: BCM7038 watchdog timer + +allOf: + - $ref: "watchdog.yaml#" + +maintainers: + - Florian Fainelli + - Justin Chen + - Rafał Miłecki + +properties: + compatible: + const: brcm,bcm7038-wdt + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + description: > + The clock running the watchdog. If no clock is found the driver will + default to 27000000 Hz. + +unevaluatedProperties: false + +required: + - reg + +examples: + - | + watchdog@f040a7e8 { + compatible = "brcm,bcm7038-wdt"; + reg = <0xf040a7e8 0x16>; + clocks = <&upg_fixed>; + }; From patchwork Fri Nov 12 22:46:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12617449 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 F3121C433F5 for ; Fri, 12 Nov 2021 22:46:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D7E9B60F4B for ; Fri, 12 Nov 2021 22:46:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236064AbhKLWti (ORCPT ); Fri, 12 Nov 2021 17:49:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236041AbhKLWte (ORCPT ); Fri, 12 Nov 2021 17:49:34 -0500 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75B2FC06127A; Fri, 12 Nov 2021 14:46:43 -0800 (PST) Received: by mail-pg1-x535.google.com with SMTP id q126so9189487pgq.13; Fri, 12 Nov 2021 14:46:43 -0800 (PST) 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=1c795j380kZ2wYLseY0gdjj5PsNSwOyZ6nJ1Ad2m/6g=; b=qW+Fea4G9NfmZxOGPrvv6fKH5ff1X+on5yuhOunROkcXG7l5Vyx31JbV1SYfZGx8cN w9TrFHcE6LyEu12fwpitGv01gYjaxlJxdh7Ypd3Z2uhDPj4EFpo9HtLXUbqsbgzcWhlo eRNFNfDE6JZr99nTxrrwniJRwgGMDoAXy6P/tsaeDYCf6hXhNPBo68WVf6Xdmx8E2Hgk uUtzoDKhnfeaHU12YvMMtTQ1WUoJvcv1EczbBGSCjC0z38WR+4hVP7x9+gEF6cSE3JfR D1OANVlPMULXtS9Z+8NfMuU7EAv/ndXBSl7hlK0h1FklbozIgAneiTcXTr6tHjv5RUT0 9Ryw== 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=1c795j380kZ2wYLseY0gdjj5PsNSwOyZ6nJ1Ad2m/6g=; b=kKIlRY1hx20qIKeyDLcyPoLGaSI2otsjTRaHiK7MsD0cVezrENeEJFdMtrZMw3p+0E tb3WCvG91qyYSjYUBbsH454qbtalP6GBZhrfbf8TLnEHLgCLUf6sQ7jVLtkTzlwFFpuY IgdG7IbO4/gbox5p5YNTZWhHZj+daHE4E85EXSoZPfPj38vrzSt0X0UWYHrYN0LVHFoZ 9AG98cx4w+7xFy9NlBJsdNqgtyhPZrsalWRccNGsIebOISg23ahzrbx4gpSUzzkY8e9L lzjSzY49PCQEgFVH8DIeH4WfkC4I4EtpP+Npf6m/ggbyy++kJaM9B0yw3H9yMGRLljOd 395w== X-Gm-Message-State: AOAM532c4rfh8/wUtoVXr2uwYT+TDzUgwryVcyw5R1KRAcbeD+5jPEST VamZ20vmah/9HnLWmDAWw0EVFoRV9ws= X-Google-Smtp-Source: ABdhPJzUIqbZItv1cmwzdCt08tSuD//eH9SAXd8pvgW1AmYBDjs3rKZD7VTSQt5Tb5E0uMXjupbY0Q== X-Received: by 2002:aa7:93c4:0:b0:49f:a7f5:7f5a with SMTP id y4-20020aa793c4000000b0049fa7f57f5amr17333001pff.8.1636757202235; Fri, 12 Nov 2021 14:46:42 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id k14sm5647004pga.65.2021.11.12.14.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 14:46:41 -0800 (PST) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Rob Herring , 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 v5 2/7] dt-bindings: watchdog: Add BCM6345 compatible to BCM7038 binding Date: Fri, 12 Nov 2021 14:46:31 -0800 Message-Id: <20211112224636.395101-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112224636.395101-1-f.fainelli@gmail.com> References: <20211112224636.395101-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. Reviewed-by: Rob Herring Signed-off-by: Florian Fainelli Reviewed-by: Guenter Roeck --- .../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 ed6210666ead..a926809352b8 100644 --- a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/watchdog/brcm,bcm7038-wdt.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: BCM7038 watchdog timer +title: BCM63xx and BCM7038 watchdog timer allOf: - $ref: "watchdog.yaml#" @@ -16,7 +16,9 @@ maintainers: properties: compatible: - const: brcm,bcm7038-wdt + enum: + - brcm,bcm6345-wdt + - brcm,bcm7038-wdt reg: maxItems: 1 From patchwork Fri Nov 12 22:46:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12617451 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 2FA54C4332F for ; Fri, 12 Nov 2021 22:46:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A86A60F4F for ; Fri, 12 Nov 2021 22:46:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236070AbhKLWtj (ORCPT ); Fri, 12 Nov 2021 17:49:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236048AbhKLWtf (ORCPT ); Fri, 12 Nov 2021 17:49:35 -0500 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 374F0C061203; Fri, 12 Nov 2021 14:46:44 -0800 (PST) Received: by mail-pj1-x1033.google.com with SMTP id gx15-20020a17090b124f00b001a695f3734aso8792148pjb.0; Fri, 12 Nov 2021 14:46:44 -0800 (PST) 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=BIyGn2he8gllDdl0etGy+C7nF7ouoa4payiBpYKO02FR92clorAeJyRlMuZ+vsVX3N vz9sWOo4jivx3CsPYWuWpuEz6Cu5TUDzgfo+F5KR97JWIaWeFvz8FvLzU3+W/KMq2BH+ EiSnPIpR+dALq/ewZXWf6h5I+It3CbAUbEG+YQCYbGzHW4hD164hhkkohG1z2WDu5XdO jKvWybiNzDMRiaUety1P7M9rlWeNxowMitDMYvUTwCthHa0+ch2c0ICxdYLlFs8LIWrF PvUgudb+P6bZ8yE1PZvcMX9p3WnMa+WxWv/X/djHRHjYot9IM1vSAeYaY1pJlMMx2Gk4 F3eg== 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=CL+mjAXMG8kIVglkL2KXcIrZH/RK++IsltG5uflr0wLUKmWghgBDX2RoE0DPIr+GHS Zgy33DoAT/ZD2UWw+TIoBKSoN8j2aUuwnO16F8jvg3VHpPb/gk0heR7o61SEkLFOm78o nCTFsfGPjKdxwtQ1ovyvpz3+n+nYmWTot2nmqkhz9vu3ssm+q5phWwN3SZfDq0CaSjJZ qJpGWC9n6CjftTCi5tgE7Uu6Ec6DUz2FvA1kr7OgzSF0vrAEI87EYsRMT9IiGC4GK6dT BgLpbMkB+2iH2keY/GDQ7y0PywNaRc03VyK97qfbK9K2hy2y2enuk5Zv3AlGGTjzoPgX BIfQ== X-Gm-Message-State: AOAM5307ZekDW68WeKIZawSngkKtvysPIYXbmEwKyJGH1a5CiuA5Fvel 92w2myD5ZsDpOuRWALU9en7KcpzDyhs= X-Google-Smtp-Source: ABdhPJxGsIhLDTyWc27klyD4bVPuwkTAn1EX/VDpKm9GtaZ5DqXbPZeWhXdx4UwrqhlS6IgCoAl5Wg== X-Received: by 2002:a17:902:9882:b0:143:91ca:ca6e with SMTP id s2-20020a170902988200b0014391caca6emr12127134plp.64.1636757203382; Fri, 12 Nov 2021 14:46:43 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id k14sm5647004pga.65.2021.11.12.14.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 14:46:42 -0800 (PST) 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 v5 3/7] watchdog: bcm7038_wdt: Support platform data configuration Date: Fri, 12 Nov 2021 14:46:32 -0800 Message-Id: <20211112224636.395101-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112224636.395101-1-f.fainelli@gmail.com> References: <20211112224636.395101-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org The BCM7038 watchdog driver needs to be able to obtain a specific clock name on BCM63xx platforms which is the "periph" clock ticking at 50MHz. make it possible to specify the clock name to obtain via platform data. Reviewed-by: Guenter Roeck Signed-off-by: Florian Fainelli --- drivers/watchdog/bcm7038_wdt.c | 8 +++++++- include/linux/platform_data/bcm7038_wdt.h | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 include/linux/platform_data/bcm7038_wdt.h diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index acaaa0005d5b..506cd7ef9c77 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -133,8 +134,10 @@ static void bcm7038_clk_disable_unprepare(void *data) static int bcm7038_wdt_probe(struct platform_device *pdev) { + struct bcm7038_wdt_platform_data *pdata = pdev->dev.platform_data; struct device *dev = &pdev->dev; struct bcm7038_watchdog *wdt; + const char *clk_name = NULL; int err; wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL); @@ -147,7 +150,10 @@ static int bcm7038_wdt_probe(struct platform_device *pdev) if (IS_ERR(wdt->base)) return PTR_ERR(wdt->base); - wdt->clk = devm_clk_get(dev, NULL); + if (pdata && pdata->clk_name) + clk_name = pdata->clk_name; + + wdt->clk = devm_clk_get(dev, clk_name); /* If unable to get clock, use default frequency */ if (!IS_ERR(wdt->clk)) { err = clk_prepare_enable(wdt->clk); diff --git a/include/linux/platform_data/bcm7038_wdt.h b/include/linux/platform_data/bcm7038_wdt.h new file mode 100644 index 000000000000..e18cfd9ec8f9 --- /dev/null +++ b/include/linux/platform_data/bcm7038_wdt.h @@ -0,0 +1,8 @@ +#ifndef __BCM7038_WDT_PDATA_H +#define __BCM7038_WDT_PDATA_H + +struct bcm7038_wdt_platform_data { + const char *clk_name; +}; + +#endif /* __BCM7038_WDT_PDATA_H */ From patchwork Fri Nov 12 22:46:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12617453 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 888E5C43217 for ; Fri, 12 Nov 2021 22:46:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6ED2761073 for ; Fri, 12 Nov 2021 22:46:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236060AbhKLWtj (ORCPT ); Fri, 12 Nov 2021 17:49:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236029AbhKLWtg (ORCPT ); Fri, 12 Nov 2021 17:49:36 -0500 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 49C3DC06120A; Fri, 12 Nov 2021 14:46:45 -0800 (PST) Received: by mail-pj1-x1033.google.com with SMTP id gt5so7887360pjb.1; Fri, 12 Nov 2021 14:46:45 -0800 (PST) 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=gI8AFWtxI/KJkQAnjbp+w24JZkImGuhWbpWDDQUGQHU=; b=RUnnpjWZxG/idK0IzPqNkknV/LVERtESsx0P0BPHsfl3qb9ln4nexXyB+lykLjrzQo rS/8uS0iEyL/mICsQk4X6vWmSoFRY0J7V7GQgLW+Zv/pR8axhkqa+76fBpLGzmreMc0Z Tn0z5GDG7WfE0/YCMVOStQWqisQJB9tV15roqc6XiHV7RqBorl4+SBXUluYrWoZhFa+A fZi/CZEoPGKwmcTjMD//fiEcHaLAy7Q5VQ1/JVv+pmlh4+F0qsJ1f3dGTBTcetlESsMD m64QmOBnulnvtYSJo+wRJJm9VsP50Z1Fxbe+JYMMsqkNna+/Knd4yE0Y6h67rwWBsCYw TbhA== 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=gI8AFWtxI/KJkQAnjbp+w24JZkImGuhWbpWDDQUGQHU=; b=gJPY6vHH9y5VfjugLrtU3kTy8Du6EvEzNs/nYc1GR9kSiGYgA9p3YGyMPWn4tM6agm XVSFlus/Dc2jrvEXIEdoc5Jo9yzWIOLJHUJjvRxIe6sEKPzZkvczZv6MS09U/O2TqVrw T0zkD/Kj/xjsMFrNJbDTsQ19H1u1bnX6q0MTb/wCR3J5pFAPLeYv+6tuqk5n8Dp7xQvB Gy5YMrJZpgO1397ihUSrslw5ARrq7fbysex5wWiYyByuJ3/iWgLQEwB0/20UtXBgkn3Y n0mclt998UZH0KTPPj5wo0pUxZs5EflaIb3ceQ2Amc3lMsr2VPvD6z2oO7Ntv2VB590Z i34A== X-Gm-Message-State: AOAM533jYLqAGp4eTUpMpXqGh65LMEgebypPX/C4wdB7QylKjaH//H4C pCHLONbhAmVdwcAHlvEVs2Ce3wyyvhA= X-Google-Smtp-Source: ABdhPJxDZiOZHfO72CyvwShmY1cagdVI0oKqcEgaxsvfap0N9RjsD1u9AMI4eYYxwUH21borBS7j0g== X-Received: by 2002:a17:90a:c394:: with SMTP id h20mr22513603pjt.136.1636757204541; Fri, 12 Nov 2021 14:46:44 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id k14sm5647004pga.65.2021.11.12.14.46.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 14:46:44 -0800 (PST) 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 v5 4/7] watchdog: Allow building BCM7038_WDT for BCM63XX Date: Fri, 12 Nov 2021 14:46:33 -0800 Message-Id: <20211112224636.395101-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112224636.395101-1-f.fainelli@gmail.com> References: <20211112224636.395101-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org CONFIG_BCM63XX denotes the legacy MIPS-based DSL SoCs which utilize the same piece of hardware as a watchdog, make it possible to select that driver for those platforms. Reviewed-by: Guenter Roeck Signed-off-by: Florian Fainelli --- drivers/watchdog/Kconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 9d222ba17ec6..a86fc5432748 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1740,15 +1740,16 @@ config BCM_KONA_WDT_DEBUG If in doubt, say 'N'. config BCM7038_WDT - tristate "BCM7038 Watchdog" + tristate "BCM63xx/BCM7038 Watchdog" select WATCHDOG_CORE depends on HAS_IOMEM - depends on ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST + depends on ARCH_BRCMSTB || BMIPS_GENERIC || BCM63XX || COMPILE_TEST help Watchdog driver for the built-in hardware in Broadcom 7038 and later SoCs used in set-top boxes. BCM7038 was made public during the 2004 CES, and since then, many Broadcom chips use this - watchdog block, including some cable modem chips. + watchdog block, including some cable modem chips and DSL (63xx) + chips. config IMGPDC_WDT tristate "Imagination Technologies PDC Watchdog Timer" From patchwork Fri Nov 12 22:46:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12617455 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 050A6C4167B for ; Fri, 12 Nov 2021 22:46:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DE8CA60F4B for ; Fri, 12 Nov 2021 22:46:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235900AbhKLWtk (ORCPT ); Fri, 12 Nov 2021 17:49:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236040AbhKLWth (ORCPT ); Fri, 12 Nov 2021 17:49:37 -0500 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 648A3C061767; Fri, 12 Nov 2021 14:46:46 -0800 (PST) Received: by mail-pg1-x532.google.com with SMTP id 136so4566553pgc.0; Fri, 12 Nov 2021 14:46:46 -0800 (PST) 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=XKmhYvw9V304NfvgcggX4aoYAGA8Osycb2EP7vxgFHs=; b=Iuq6wCyTfUr6cDPh9xSDWHYxfzD8ueDkal9urCKtY8u07t7+X4ystYUqc1q4IIkBjN nXAx5E1LH2lc3lkdcNYij+VR4lAeWMUqOQWsQsdS4P91NEtCc/2zYE7wS0/YgghzWFrw SPnVizTtEgppIEFuS0nf8onKnHCB+aFbBcSHTCdgGO04pNKudVitcEvLex0ZG7+WGf8U 62YHijJeVk1PPvZsU7Dp96ZoGIRWtoEmErJ5AXLaV2bo6EeQHvBuqHYJsPWdP5Jm4vq1 9nR3ciPeRFQnR74jQRwK17tDZMFo1Ut12jOHhKHpf98QSK+QZ5NGxpDYlUte74wYTehf wW7A== 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=XKmhYvw9V304NfvgcggX4aoYAGA8Osycb2EP7vxgFHs=; b=BOLkHS0BpmYEppKTAyzGOsW8EppL2qAMLqqdCzYWuQtpir8DwwD2QVgt3BRRss5qz+ 8D1hK9eqIQAkviSe2+IdmkI9jH1niY85oqRQWKiRTV1hqkAcWDNZ7Tzi9aBjTk+nJD56 3ddEhloVNCL6a8FwNoZeZlhgEOsfBLW2SKfLRiKyocglPiYoSiGeBfMWxd8WHhKnjrgK KnaCijNZRyR7+wtBFQTBU9unmdYi/foADVZ3M/l5l+/v20SjobucR5HSNsaf78wb91uH QP2eXxEe0N6pwMekmPpwf0IQ5rDD2fqgNsdzHE22m5XDUOI+PsfnV1r2u3a5rgpewH9X iCtQ== X-Gm-Message-State: AOAM533xEm9jVsEgVy0ZicM4UtWyj+23cBHgwEKm4PGj15VCP+3c8ne9 SHwMDuMhi9MSpeAjzt6UyllGwWF+kfw= X-Google-Smtp-Source: ABdhPJzNUEaHOpCJSG98CaJIWfdCSLJi1SJEA4K31EYRAEdYAbtynIQSzGIdew1CyJtGM/tW/wWU8w== X-Received: by 2002:aa7:8151:0:b0:480:9d40:8e38 with SMTP id d17-20020aa78151000000b004809d408e38mr16631708pfn.72.1636757205656; Fri, 12 Nov 2021 14:46:45 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id k14sm5647004pga.65.2021.11.12.14.46.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 14:46:45 -0800 (PST) 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 v5 5/7] watchdog: bcm7038_wdt: Add platform device id for bcm63xx-wdt Date: Fri, 12 Nov 2021 14:46:34 -0800 Message-Id: <20211112224636.395101-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112224636.395101-1-f.fainelli@gmail.com> References: <20211112224636.395101-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..8656a137e9a4 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -223,8 +223,15 @@ 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 = "bcm63xx-wdt" }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(platform, bcm7038_wdt_devtype); + static struct platform_driver bcm7038_wdt_driver = { .probe = bcm7038_wdt_probe, + .id_table = bcm7038_wdt_devtype, .driver = { .name = "bcm7038-wdt", .of_match_table = bcm7038_wdt_match, From patchwork Fri Nov 12 22:46:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12617459 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 4DF18C433EF for ; Fri, 12 Nov 2021 22:46:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38BD261073 for ; Fri, 12 Nov 2021 22:46:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235908AbhKLWtp (ORCPT ); Fri, 12 Nov 2021 17:49:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236052AbhKLWti (ORCPT ); Fri, 12 Nov 2021 17:49:38 -0500 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC1C5C0613F5; Fri, 12 Nov 2021 14:46:47 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id t5-20020a17090a4e4500b001a0a284fcc2so8324127pjl.2; Fri, 12 Nov 2021 14:46:47 -0800 (PST) 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=OM6XOf5hWr2D5bJKa9xIdGPgfJ/wfHAhF5GW3mWj6qfDVF4FeHyye5D4k88rGzgc4H 39dPf0eKew71/uhYteVkUNIlNo36k4m608WAZjerNT3ViYvp8Ao9t11j1LylXc3M87KG nY975Z7PMwidrZ6Pp/X+GQm8Nx/c/XbySKgEkuHFQgw9ty/t09saO/i8+UoCdW+HIY2e oH6EX3m3a2O6ZX4P3qqV2dQVM76HmBQhkZJA4o+Zw53xXdo1HOy6Ey4ZXhcSRhw0/ZRj 1BTV+Jt4Z0iuJvthAORUP1Wf+8yjLaWhYUVKBDHBXizASEOXMQtnbbHWjYKmbUkmrina K8Ew== 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=VNegyDsQSorFtbm0FsFcEPkuGcT7ogZXoAPP4qRRfUQ6uVen4yiQt3ZAlB3QJTNFoi owpCPUjkRgicfl58JOD3x8kqh2Mk3hb2ZxvzaH99i9IiMzIXPNt4wXzOjdSnttq5xt4a 5iaoTSNSDVbkWSM+HhLVp32zUllYcM+c7ubw+HkWzNm7gjJIIgFqUZkjSVZsnGf7ZDLE 3JmH/yc9zXjtQVI+NwJerJqrsit2Us4FLF1z10F+gqVhrEqoWGVketd/IwWrs1a6wODQ dzbh4SSamEshcKz1jHk3VpOfMaU6CmttdMTlcK/EiU5Cr6eakg59aAo2LcLKuhzrJkrr xMGA== X-Gm-Message-State: AOAM533pyd1uabZ8LZHguMv3v4EBIBxuAhckIM/vGUDdkq6yaxahe7Ve dy3xJOR84tw4EK7KduBvfxZ7+gLGc9o= X-Google-Smtp-Source: ABdhPJxjNRFyodytAdEAoxVQBOTuJ3dbe2y3zrt9uQEtSkMS1mXEcyi+CPAQFv95Bh0GVaKPrRVcqg== X-Received: by 2002:a17:903:2352:b0:142:76bc:de3b with SMTP id c18-20020a170903235200b0014276bcde3bmr12012450plh.36.1636757206809; Fri, 12 Nov 2021 14:46:46 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id k14sm5647004pga.65.2021.11.12.14.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 14:46:46 -0800 (PST) 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 v5 6/7] MIPS: BCM63XX: Provide platform data to watchdog device Date: Fri, 12 Nov 2021 14:46:35 -0800 Message-Id: <20211112224636.395101-7-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112224636.395101-1-f.fainelli@gmail.com> References: <20211112224636.395101-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org In order to utilize the bcm7038_wdt.c driver which needs to know the clock name to obtain, pass it via platform data using the bcm7038_wdt_platform_data structure. Reviewed-by: Guenter Roeck Acked-by: Thomas Bogendoerfer Signed-off-by: Florian Fainelli --- arch/mips/bcm63xx/dev-wdt.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/mips/bcm63xx/dev-wdt.c b/arch/mips/bcm63xx/dev-wdt.c index 2a2346a99bcb..42130914a3c2 100644 --- a/arch/mips/bcm63xx/dev-wdt.c +++ b/arch/mips/bcm63xx/dev-wdt.c @@ -9,6 +9,7 @@ #include #include #include +#include #include static struct resource wdt_resources[] = { @@ -19,11 +20,18 @@ static struct resource wdt_resources[] = { }, }; +static struct bcm7038_wdt_platform_data bcm63xx_wdt_pdata = { + .clk_name = "periph", +}; + static struct platform_device bcm63xx_wdt_device = { .name = "bcm63xx-wdt", .id = -1, .num_resources = ARRAY_SIZE(wdt_resources), .resource = wdt_resources, + .dev = { + .platform_data = &bcm63xx_wdt_pdata, + }, }; int __init bcm63xx_wdt_register(void) From patchwork Fri Nov 12 22:46:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12617457 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 1AAFAC433FE for ; Fri, 12 Nov 2021 22:46:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 02FB960F4F for ; Fri, 12 Nov 2021 22:46:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236096AbhKLWtm (ORCPT ); Fri, 12 Nov 2021 17:49:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236083AbhKLWtk (ORCPT ); Fri, 12 Nov 2021 17:49:40 -0500 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7E96C061767; Fri, 12 Nov 2021 14:46:48 -0800 (PST) Received: by mail-pl1-x630.google.com with SMTP id b11so9501343pld.12; Fri, 12 Nov 2021 14:46:48 -0800 (PST) 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=fYGovxhCK1ldl5JumFNjMUXuCKlrgB4DYq4NxEbfMCE=; b=Tbbsg4RMvd6T+3gzUQWLeEYxVkBp8sn/zTKzLr2poUk7BvdefsdiiPmB/ry+5M/HuC EbHUVHIRZxXa4IPCSalAlo2uzr9vyw+OreNUjalNd0rc7oyWB4+Z9wduPRBPuuJ/YdiS +6TjZUO5Vwa+5mkPSCf0YN33L/lwXHq+1M60UHgp9Nn3QEhzJEwxqOektuTfJxnSo9o0 rQ5WVwPZC8i5W8fXhPgpBhq+wuFX7iysRl+++FQ7N1ei88zgUW8NXAfnI7+heih4P95I 1L3ZPI4bUiXSaYgKTqkku4eJXT1Dljj9XZhPKUAfuaNzMh1n2thCwQ2oSFElmxFdkZAp xM8Q== 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=fYGovxhCK1ldl5JumFNjMUXuCKlrgB4DYq4NxEbfMCE=; b=LHo9H62ofnDrJLF3CEusfjlsmMhXmJvd5OfIIIvWp5Agb++AYzlFvMwllmv45bDCdY 9bNSd6rTrsXn6jdL2i3QGhiOhiZoofSe70P4CDAJmE+qnZmYZ2mfArjYeIr7JDRdtWQW mqfOqz/jF+VWAggVjn2b+Q/mox4WulIxAHzoe4JXcJz4NZm55T1uujV/pwWb6SiUkgX+ 0E9FOTosAmWjzI53pLoUxJvKwQ7iflP2uCkBWS2hs5uN1UvKkglM83M5JMN0nAhQOvnZ L4aajjqJzKOw4JNQzFxAyCxFtzo+LLhXD7yOUyBoCM/t4mzs9Nsh70VE0rZ/Gc7glmcO H1mg== X-Gm-Message-State: AOAM533Z5dAeWG8uBYb7nG0dsAl8pXX2vWWxx8pKbJtMjh8zE7WMF9bq EjDZQer3GTMr+iB6ri/hM3NT0CR4DYM= X-Google-Smtp-Source: ABdhPJwG5mto+suUtzHszfFOh3hrhvyv5y/kekmAXkUKMRdOo4eeSSbxHVoM909FWnKOR3X5Q34MeA== X-Received: by 2002:a17:90a:c286:: with SMTP id f6mr22095548pjt.45.1636757207983; Fri, 12 Nov 2021 14:46:47 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id k14sm5647004pga.65.2021.11.12.14.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 14:46:47 -0800 (PST) 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 v5 7/7] watchdog: Remove BCM63XX_WDT Date: Fri, 12 Nov 2021 14:46:36 -0800 Message-Id: <20211112224636.395101-8-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112224636.395101-1-f.fainelli@gmail.com> References: <20211112224636.395101-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 | 317 --------------------------------- 3 files changed, 328 deletions(-) delete mode 100644 drivers/watchdog/bcm63xx_wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index a86fc5432748..98d4cd4093a5 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1696,16 +1696,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 2ee97064145b..b01007c0396c 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -153,7 +153,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 56cc262571a5..000000000000 --- a/drivers/watchdog/bcm63xx_wdt.c +++ /dev/null @@ -1,317 +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(); - - fallthrough; - - 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");