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: 517829 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 E5FA0C433F5 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 CAC286112F for ; Fri, 12 Nov 2021 22:46:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236019AbhKLWtd (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-watchdog@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: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: 517828 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 4D22CC43219 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 37D3A61078 for ; Fri, 12 Nov 2021 22:46:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236001AbhKLWtj (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-watchdog@vger.kernel.org The BCM7038 watchdog driver needs to be able to obtain a specific clock name on BCM63xx platforms which is the "periph" clock ticking at 50MHz. make it possible to specify the clock name to obtain via platform data. Reviewed-by: Guenter Roeck Signed-off-by: Florian Fainelli --- drivers/watchdog/bcm7038_wdt.c | 8 +++++++- include/linux/platform_data/bcm7038_wdt.h | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 include/linux/platform_data/bcm7038_wdt.h diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index acaaa0005d5b..506cd7ef9c77 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -133,8 +134,10 @@ static void bcm7038_clk_disable_unprepare(void *data) static int bcm7038_wdt_probe(struct platform_device *pdev) { + struct bcm7038_wdt_platform_data *pdata = pdev->dev.platform_data; struct device *dev = &pdev->dev; struct bcm7038_watchdog *wdt; + const char *clk_name = NULL; int err; wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL); @@ -147,7 +150,10 @@ static int bcm7038_wdt_probe(struct platform_device *pdev) if (IS_ERR(wdt->base)) return PTR_ERR(wdt->base); - wdt->clk = devm_clk_get(dev, NULL); + if (pdata && pdata->clk_name) + clk_name = pdata->clk_name; + + wdt->clk = devm_clk_get(dev, clk_name); /* If unable to get clock, use default frequency */ if (!IS_ERR(wdt->clk)) { err = clk_prepare_enable(wdt->clk); diff --git a/include/linux/platform_data/bcm7038_wdt.h b/include/linux/platform_data/bcm7038_wdt.h new file mode 100644 index 000000000000..e18cfd9ec8f9 --- /dev/null +++ b/include/linux/platform_data/bcm7038_wdt.h @@ -0,0 +1,8 @@ +#ifndef __BCM7038_WDT_PDATA_H +#define __BCM7038_WDT_PDATA_H + +struct bcm7038_wdt_platform_data { + const char *clk_name; +}; + +#endif /* __BCM7038_WDT_PDATA_H */ From patchwork 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: 517827 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 E728CC4167E 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 CA8F560F4F for ; Fri, 12 Nov 2021 22:46:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235634AbhKLWtk (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-watchdog@vger.kernel.org In order to phase out bcm63xx_wdt and use bcm7038_wdt instead, introduce a platform_device_id table that allows both names to be matched. Reviewed-by: Guenter Roeck Signed-off-by: Florian Fainelli --- drivers/watchdog/bcm7038_wdt.c | 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: 517826 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 9286CC4332F 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 7CA5160F4B for ; Fri, 12 Nov 2021 22:46:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235917AbhKLWtp (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-watchdog@vger.kernel.org In order to utilize the bcm7038_wdt.c driver which needs to know the clock name to obtain, pass it via platform data using the bcm7038_wdt_platform_data structure. Reviewed-by: Guenter Roeck Acked-by: Thomas Bogendoerfer Signed-off-by: Florian Fainelli --- arch/mips/bcm63xx/dev-wdt.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/mips/bcm63xx/dev-wdt.c b/arch/mips/bcm63xx/dev-wdt.c index 2a2346a99bcb..42130914a3c2 100644 --- a/arch/mips/bcm63xx/dev-wdt.c +++ b/arch/mips/bcm63xx/dev-wdt.c @@ -9,6 +9,7 @@ #include #include #include +#include #include static struct resource wdt_resources[] = { @@ -19,11 +20,18 @@ static struct resource wdt_resources[] = { }, }; +static struct bcm7038_wdt_platform_data bcm63xx_wdt_pdata = { + .clk_name = "periph", +}; + static struct platform_device bcm63xx_wdt_device = { .name = "bcm63xx-wdt", .id = -1, .num_resources = ARRAY_SIZE(wdt_resources), .resource = wdt_resources, + .dev = { + .platform_data = &bcm63xx_wdt_pdata, + }, }; int __init bcm63xx_wdt_register(void)