From patchwork Wed Sep 22 23:09:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12511577 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F8A9C433EF for ; Wed, 22 Sep 2021 23:11:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8363D60F24 for ; Wed, 22 Sep 2021 23:11:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238404AbhIVXNW (ORCPT ); Wed, 22 Sep 2021 19:13:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238389AbhIVXNW (ORCPT ); Wed, 22 Sep 2021 19:13:22 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BCABC061574 for ; Wed, 22 Sep 2021 16:11:51 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id u18so17937707lfd.12 for ; Wed, 22 Sep 2021 16:11:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LXrbDHPFbLNfw7aqFMhZysQCuGl8i7wEipi1H6MoIeg=; b=e2ZGk9t3fIF55m6TCjuRyJ+kVyKL8xNgPSZuLe6emtzWGgIO3a4f4ZpxbwGdeAEyZ8 LAaH1F/jv5NQ8t7/7W8kwuce19EJ9s0fTYyIr55k4Otiqo1r7h0q76AcYF8MpLc5NrTE BmWmZp864JT1CZ5ss+76qxHD0gupUE/rDprQiNBzSrtofDsgZYquWM6aX//ZGKglptt6 I8LBF5l9+nVvbKz2duAtsPBJSo/dtDF227DgFhNo+beA4PKBPmcbHDz3A57N3TlJZneJ gR0jBIYZb62gbvHme/VzCDnaoJICpSBLwJAG1hHwdk2Y5iZgCLB4iPA7iYrUJQhCceDb sfsA== 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:mime-version :content-transfer-encoding; bh=LXrbDHPFbLNfw7aqFMhZysQCuGl8i7wEipi1H6MoIeg=; b=Y+/pzVrgeaHscTvGK+jNfPOR7CDRjxsrxX3En5KcWb28F3P+xXqVfHtmqAo4jD/QDG 970CGfZ3XoHKsFO2xc++wpLd/QzCyt3eazokUlGRz7OHgYVB+4JlAvXCdXns2hfwgY2L mbCGMh4geiasWhCZtXfDI0vX0brA9OBTqG/pxstOOPLmUZZQmB7JbxJJY9VyJmVExpML sXJs7M+xrUqj9DgMOQr5gLi4eanrq3UVgQxjMKVYaZECm6i2tnGp7oTRh1jSXfrmLKVF s6Kl6kQ67NaC/WHvBBT3xT78r3vvkkh8klYEAUiRf/WTJ+fqQwloZDjAYy+kUGatYUq7 SNsg== X-Gm-Message-State: AOAM530OfptfzZeP/HXBFUXmjcX7YW1G1aRk4x68jg2LZUDewwtGiG+v iDoNclVCDRzsiM+WlnEjbf95Kg== X-Google-Smtp-Source: ABdhPJyFLweLwcrt1j+irutQlYb59s4/pZEbUO3rBNteQNknTIa5/erb34P0hINyJGKqheuwwIHDsg== X-Received: by 2002:a2e:58c:: with SMTP id 134mr1909870ljf.269.1632352309508; Wed, 22 Sep 2021 16:11:49 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id u28sm288044lfo.47.2021.09.22.16.11.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 16:11:49 -0700 (PDT) From: Linus Walleij To: Wim Van Sebroeck , Guenter Roeck Cc: linux-watchdog@vger.kernel.org, Linus Walleij , Lee Jones Subject: [PATCH 1/3] watchdog: ux500_wdt: Drop platform data Date: Thu, 23 Sep 2021 01:09:45 +0200 Message-Id: <20210922230947.1864357-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Drop the platform data passing from the PRCMU driver. This platform data was part of the ambition to support more SoCs, which in turn were never mass produced. Only a name remains of the MFD cell so switch to MFD_CELL_NAME(). Cc: Lee Jones Signed-off-by: Linus Walleij Reviewed-by: Guenter Roeck --- Lee: it'd be prefect if you could ACK this so the watchdog people can merge it, it shouldn't collide with any other changes to the PRCMU driver. --- drivers/mfd/db8500-prcmu.c | 13 +------------ drivers/watchdog/ux500_wdt.c | 13 ++----------- include/linux/platform_data/ux500_wdt.h | 18 ------------------ 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 include/linux/platform_data/ux500_wdt.h diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index c1d3e7c116cf..ccf6be922b39 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -36,7 +36,6 @@ #include #include #include -#include #include "db8500-prcmu-regs.h" /* Index of different voltages to be used when accessing AVSData */ @@ -2939,18 +2938,8 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = { }, }; -static struct ux500_wdt_data db8500_wdt_pdata = { - .timeout = 600, /* 10 minutes */ - .has_28_bits_resolution = true, -}; - static const struct mfd_cell common_prcmu_devs[] = { - { - .name = "ux500_wdt", - .platform_data = &db8500_wdt_pdata, - .pdata_size = sizeof(db8500_wdt_pdata), - .id = -1, - }, + MFD_CELL_NAME("ux500_wdt"), MFD_CELL_NAME("db8500-cpuidle"), }; diff --git a/drivers/watchdog/ux500_wdt.c b/drivers/watchdog/ux500_wdt.c index 072758106865..40f8cf1cb234 100644 --- a/drivers/watchdog/ux500_wdt.c +++ b/drivers/watchdog/ux500_wdt.c @@ -15,7 +15,6 @@ #include #include #include -#include #include @@ -23,7 +22,6 @@ #define WATCHDOG_MIN 0 #define WATCHDOG_MAX28 268435 /* 28 bit resolution in ms == 268435.455 s */ -#define WATCHDOG_MAX32 4294967 /* 32 bit resolution in ms == 4294967.295 s */ static unsigned int timeout = WATCHDOG_TIMEOUT; module_param(timeout, uint, 0); @@ -80,22 +78,15 @@ static struct watchdog_device ux500_wdt = { .info = &ux500_wdt_info, .ops = &ux500_wdt_ops, .min_timeout = WATCHDOG_MIN, - .max_timeout = WATCHDOG_MAX32, + .max_timeout = WATCHDOG_MAX28, }; static int ux500_wdt_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; int ret; - struct ux500_wdt_data *pdata = dev_get_platdata(dev); - - if (pdata) { - if (pdata->timeout > 0) - timeout = pdata->timeout; - if (pdata->has_28_bits_resolution) - ux500_wdt.max_timeout = WATCHDOG_MAX28; - } + timeout = 600; /* Default to 10 minutes */ ux500_wdt.parent = dev; watchdog_set_nowayout(&ux500_wdt, nowayout); diff --git a/include/linux/platform_data/ux500_wdt.h b/include/linux/platform_data/ux500_wdt.h deleted file mode 100644 index de6a4ad41e76..000000000000 --- a/include/linux/platform_data/ux500_wdt.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) ST Ericsson SA 2011 - * - * STE Ux500 Watchdog platform data - */ -#ifndef __UX500_WDT_H -#define __UX500_WDT_H - -/** - * struct ux500_wdt_data - */ -struct ux500_wdt_data { - unsigned int timeout; - bool has_28_bits_resolution; -}; - -#endif /* __UX500_WDT_H */ From patchwork Wed Sep 22 23:09:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12511581 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5316EC433F5 for ; Wed, 22 Sep 2021 23:18:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39E1E611C4 for ; Wed, 22 Sep 2021 23:18:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238426AbhIVXUH (ORCPT ); Wed, 22 Sep 2021 19:20:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231259AbhIVXUG (ORCPT ); Wed, 22 Sep 2021 19:20:06 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DE80C061574 for ; Wed, 22 Sep 2021 16:18:35 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id i25so18807584lfg.6 for ; Wed, 22 Sep 2021 16:18:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XWHoHaMPxRDd6KUyHTUtlTzeXeEx5cXpfpbjlCQ+0A4=; b=gP9CXgDNSVM/LavH2gUJP1ClgjZhEVZ1ShIw8JsuQbfKFOWub883G/23caxOYndAC1 M7PDhNly8z3uhPs1/V2B8uY1AqqJDQUwgU+J+9gta4sfJZX4UiMQMll8iSxYMXX3yi47 38VrD9ka43EaZnr6CtvNcC8dDTwPVVvUHQ2yar2ATydAPA10fdIQhqvr0I5FZtm5k+vf bVQqoRBCRy5XJO7RoLi3cfAS0qlbeY47kjLlt10PVLakm9ar4yzgQjsMkJHCvuCsbAF2 /Oe/zCrqFlJ1hXBVq8ITVoKD4s101RE1/jRoB9T8W0mP10Y2fRmG3Zl0wFGOprDkB25a 3fFQ== 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=XWHoHaMPxRDd6KUyHTUtlTzeXeEx5cXpfpbjlCQ+0A4=; b=PxAD5ZMdFr0aAxKke0FeeohRgBGQLV3Dq7yBjbwTsPmAE5ziHzCQ6WvdIT1gISLyru CfNEl4q/CBNERYohTQDwOyfrFHeFAqy4PcO4wds7Zy3pHAPNAhZVHpWhvr2kF/H4363c /DmCLnvrpt7X5jqhtSw6RaadlfuKehjW9ym7yNsEY6BMW5ptw5BZq6LlqtCXswtmkpFQ yrtifmsP9I3Rs27O8SSDYT5lpPbpzLsfgotZjeD63Wj7x4+xHkU5S9cWnWG+6oJCGYDy v9Q4ApsTgZD6osz/wXePyaqCWCjePtr6vpTEQgcy8+y/elg27K8I4Agp2i9J4bI29AXH +/ow== X-Gm-Message-State: AOAM531S8Kn14Jjz6hlrKxYRGQ/wDbEnCf2HjQniCHi4E2yZhf21qTJe 74VoePSoMmPjv1AxTWkZNSKNfw== X-Google-Smtp-Source: ABdhPJzioIJqf8a4ahllXsaCa18LsUkdU6Dbe7GtduX0TYr9t+aAZ4hJWyJFNXyFf4KvZRzikambkg== X-Received: by 2002:a05:6512:2354:: with SMTP id p20mr1447900lfu.204.1632352713921; Wed, 22 Sep 2021 16:18:33 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id u28sm288044lfo.47.2021.09.22.16.18.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 16:18:33 -0700 (PDT) From: Linus Walleij To: Wim Van Sebroeck , Guenter Roeck Cc: linux-watchdog@vger.kernel.org, Linus Walleij Subject: [PATCH 2/3] watchdog: db8500_wdt: Rename driver Date: Thu, 23 Sep 2021 01:09:46 +0200 Message-Id: <20210922230947.1864357-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210922230947.1864357-1-linus.walleij@linaro.org> References: <20210922230947.1864357-1-linus.walleij@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org This driver is named after the ambition to support more SoCs than the DB8500. Those were never produced, so cut down the scope and rename the driver accordingly. Since the Kconfig for the watchdog defaults to y this will still be built by default. Signed-off-by: Linus Walleij Reviewed-by: Guenter Roeck --- drivers/watchdog/Kconfig | 8 ++++---- drivers/watchdog/Makefile | 2 +- drivers/watchdog/{ux500_wdt.c => db8500_wdt.c} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename drivers/watchdog/{ux500_wdt.c => db8500_wdt.c} (100%) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b81fe4f7d434..b5fe869991f9 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -743,17 +743,17 @@ config IMX7ULP_WDT To compile this driver as a module, choose M here: the module will be called imx7ulp_wdt. -config UX500_WATCHDOG - tristate "ST-Ericsson Ux500 watchdog" +config DB500_WATCHDOG + tristate "ST-Ericsson DB800 watchdog" depends on MFD_DB8500_PRCMU select WATCHDOG_CORE default y help Say Y here to include Watchdog timer support for the watchdog - existing in the prcmu of ST-Ericsson Ux500 series platforms. + existing in the prcmu of ST-Ericsson DB8500 platform. To compile this driver as a module, choose M here: the - module will be called ux500_wdt. + module will be called db500_wdt. config RETU_WATCHDOG tristate "Retu watchdog" diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 1bd2d6f37c53..f500f242f46b 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -69,7 +69,7 @@ obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o obj-$(CONFIG_IMX_SC_WDT) += imx_sc_wdt.o obj-$(CONFIG_IMX7ULP_WDT) += imx7ulp_wdt.o -obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o +obj-$(CONFIG_DB500_WATCHDOG) += db8500_wdt.o obj-$(CONFIG_RETU_WATCHDOG) += retu_wdt.o obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o obj-$(CONFIG_MOXART_WDT) += moxart_wdt.o diff --git a/drivers/watchdog/ux500_wdt.c b/drivers/watchdog/db8500_wdt.c similarity index 100% rename from drivers/watchdog/ux500_wdt.c rename to drivers/watchdog/db8500_wdt.c From patchwork Wed Sep 22 23:09:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12511583 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35DE9C433EF for ; Wed, 22 Sep 2021 23:18:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 14ABD60EE4 for ; Wed, 22 Sep 2021 23:18:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238428AbhIVXUI (ORCPT ); Wed, 22 Sep 2021 19:20:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238431AbhIVXUH (ORCPT ); Wed, 22 Sep 2021 19:20:07 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D88FBC061574 for ; Wed, 22 Sep 2021 16:18:36 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id p29so18231249lfa.11 for ; Wed, 22 Sep 2021 16:18:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8c9lieVpqkGq0z+P8vsTZtzmbllYE5v1S+LgyE8LNrw=; b=zh3XIZHo2w2ehA36vPOdCSaMSbb+oPTq0RLy73mETSRmAbhrwp+HrA88uzR2Xb7ZQF 03SDVBJe9Hqe8m3NEWaqz7UJYcXOzRK0fJkTJLQSQiuzK43D8/8vDVF2yRZWURxg1IKr Hobsu9grYjTXtgFZkRAiM3cFzFEiH7MNAxr5nLDCrmKRd19YpUdecDP6pZQLNqIs3f7+ z78czD5UCu96Hl3KRaZnvtvU5F98X2mQuOD7DcvH2hm1aDnGr+WVxLTcJBv0WvYEzDuB 17tbTMligu1bKja2cmR/k1wlws8XdP4Zj02L3oqyM361oQGuOaGrRQLc7ffqgr4Q736m F35g== 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=8c9lieVpqkGq0z+P8vsTZtzmbllYE5v1S+LgyE8LNrw=; b=s95xLCA7oBHm7UtaPs21Hf5rd8v06gzmCFZdzpiKdObWIJaK7go0gWV2TTJugsNJQc ZI+gUB8mOxSjEFDtUNZ0/PuIE0kQ7jbH6zy08ZZ+lJTefe3QJsf50LKi92pQgBJmL2Iw pORfutw4OzpBHdOfP3SrHlwWrzGNWEGaPmLMMVIpLJ9993QN0N1IqKB2uvLm6xcUedRP lhuDoapwCAy+RNIU19JYeZKqjOR+aKWPxm+N+K3Epi1U6TPohneESYMg7PL0dQqMPI+0 jHZRWuUUJZPwibpmExZgH4lGk4oJIPxrgCIdSZUvOPdyqvUggKYY0KitOqyaiDIw/12p eKxA== X-Gm-Message-State: AOAM530x8z0CMpumHdBZyt8lkXCSDzFveBYwJAoxZqNStPTcsLMR9/Kf bYzs3YlRGiznut9ma8m+RA+bPQ== X-Google-Smtp-Source: ABdhPJwm2ZKlQPyJFMLnleYfOEhjR2e4hhccJ2AEsfx3u7uYH+JtIGKljufhXBCKbYWGYI93lC37Gw== X-Received: by 2002:a05:6512:3407:: with SMTP id i7mr1366457lfr.149.1632352715212; Wed, 22 Sep 2021 16:18:35 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id u28sm288044lfo.47.2021.09.22.16.18.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 16:18:34 -0700 (PDT) From: Linus Walleij To: Wim Van Sebroeck , Guenter Roeck Cc: linux-watchdog@vger.kernel.org, Linus Walleij , Lee Jones Subject: [PATCH 3/3] watchdog: db8500_wdt: Rename symbols Date: Thu, 23 Sep 2021 01:09:47 +0200 Message-Id: <20210922230947.1864357-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210922230947.1864357-1-linus.walleij@linaro.org> References: <20210922230947.1864357-1-linus.walleij@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org For conistency and clarity, rename all symbols and strings from ux500 to db8500 in the driver. Cc: Lee Jones Signed-off-by: Linus Walleij Reviewed-by: Guenter Roeck Acked-by: Lee Jones --- Lee it would be perfect if you could ACK the oneliner in this patch along with the rest. --- drivers/mfd/db8500-prcmu.c | 2 +- drivers/watchdog/db8500_wdt.c | 76 +++++++++++++++++------------------ 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index ccf6be922b39..56c61c99eb23 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -2939,7 +2939,7 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = { }; static const struct mfd_cell common_prcmu_devs[] = { - MFD_CELL_NAME("ux500_wdt"), + MFD_CELL_NAME("db8500_wdt"), MFD_CELL_NAME("db8500-cpuidle"), }; diff --git a/drivers/watchdog/db8500_wdt.c b/drivers/watchdog/db8500_wdt.c index 40f8cf1cb234..6ed8b63d310d 100644 --- a/drivers/watchdog/db8500_wdt.c +++ b/drivers/watchdog/db8500_wdt.c @@ -35,60 +35,60 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); -static int ux500_wdt_start(struct watchdog_device *wdd) +static int db8500_wdt_start(struct watchdog_device *wdd) { return prcmu_enable_a9wdog(PRCMU_WDOG_ALL); } -static int ux500_wdt_stop(struct watchdog_device *wdd) +static int db8500_wdt_stop(struct watchdog_device *wdd) { return prcmu_disable_a9wdog(PRCMU_WDOG_ALL); } -static int ux500_wdt_keepalive(struct watchdog_device *wdd) +static int db8500_wdt_keepalive(struct watchdog_device *wdd) { return prcmu_kick_a9wdog(PRCMU_WDOG_ALL); } -static int ux500_wdt_set_timeout(struct watchdog_device *wdd, +static int db8500_wdt_set_timeout(struct watchdog_device *wdd, unsigned int timeout) { - ux500_wdt_stop(wdd); + db8500_wdt_stop(wdd); prcmu_load_a9wdog(PRCMU_WDOG_ALL, timeout * 1000); - ux500_wdt_start(wdd); + db8500_wdt_start(wdd); return 0; } -static const struct watchdog_info ux500_wdt_info = { +static const struct watchdog_info db8500_wdt_info = { .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, - .identity = "Ux500 WDT", + .identity = "DB8500 WDT", .firmware_version = 1, }; -static const struct watchdog_ops ux500_wdt_ops = { +static const struct watchdog_ops db8500_wdt_ops = { .owner = THIS_MODULE, - .start = ux500_wdt_start, - .stop = ux500_wdt_stop, - .ping = ux500_wdt_keepalive, - .set_timeout = ux500_wdt_set_timeout, + .start = db8500_wdt_start, + .stop = db8500_wdt_stop, + .ping = db8500_wdt_keepalive, + .set_timeout = db8500_wdt_set_timeout, }; -static struct watchdog_device ux500_wdt = { - .info = &ux500_wdt_info, - .ops = &ux500_wdt_ops, +static struct watchdog_device db8500_wdt = { + .info = &db8500_wdt_info, + .ops = &db8500_wdt_ops, .min_timeout = WATCHDOG_MIN, .max_timeout = WATCHDOG_MAX28, }; -static int ux500_wdt_probe(struct platform_device *pdev) +static int db8500_wdt_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; int ret; timeout = 600; /* Default to 10 minutes */ - ux500_wdt.parent = dev; - watchdog_set_nowayout(&ux500_wdt, nowayout); + db8500_wdt.parent = dev; + watchdog_set_nowayout(&db8500_wdt, nowayout); /* disable auto off on sleep */ prcmu_config_a9wdog(PRCMU_WDOG_CPU1, false); @@ -96,7 +96,7 @@ static int ux500_wdt_probe(struct platform_device *pdev) /* set HW initial value */ prcmu_load_a9wdog(PRCMU_WDOG_ALL, timeout * 1000); - ret = devm_watchdog_register_device(dev, &ux500_wdt); + ret = devm_watchdog_register_device(dev, &db8500_wdt); if (ret) return ret; @@ -106,47 +106,47 @@ static int ux500_wdt_probe(struct platform_device *pdev) } #ifdef CONFIG_PM -static int ux500_wdt_suspend(struct platform_device *pdev, +static int db8500_wdt_suspend(struct platform_device *pdev, pm_message_t state) { - if (watchdog_active(&ux500_wdt)) { - ux500_wdt_stop(&ux500_wdt); + if (watchdog_active(&db8500_wdt)) { + db8500_wdt_stop(&db8500_wdt); prcmu_config_a9wdog(PRCMU_WDOG_CPU1, true); prcmu_load_a9wdog(PRCMU_WDOG_ALL, timeout * 1000); - ux500_wdt_start(&ux500_wdt); + db8500_wdt_start(&db8500_wdt); } return 0; } -static int ux500_wdt_resume(struct platform_device *pdev) +static int db8500_wdt_resume(struct platform_device *pdev) { - if (watchdog_active(&ux500_wdt)) { - ux500_wdt_stop(&ux500_wdt); + if (watchdog_active(&db8500_wdt)) { + db8500_wdt_stop(&db8500_wdt); prcmu_config_a9wdog(PRCMU_WDOG_CPU1, false); prcmu_load_a9wdog(PRCMU_WDOG_ALL, timeout * 1000); - ux500_wdt_start(&ux500_wdt); + db8500_wdt_start(&db8500_wdt); } return 0; } #else -#define ux500_wdt_suspend NULL -#define ux500_wdt_resume NULL +#define db8500_wdt_suspend NULL +#define db8500_wdt_resume NULL #endif -static struct platform_driver ux500_wdt_driver = { - .probe = ux500_wdt_probe, - .suspend = ux500_wdt_suspend, - .resume = ux500_wdt_resume, +static struct platform_driver db8500_wdt_driver = { + .probe = db8500_wdt_probe, + .suspend = db8500_wdt_suspend, + .resume = db8500_wdt_resume, .driver = { - .name = "ux500_wdt", + .name = "db8500_wdt", }, }; -module_platform_driver(ux500_wdt_driver); +module_platform_driver(db8500_wdt_driver); MODULE_AUTHOR("Jonas Aaberg "); -MODULE_DESCRIPTION("Ux500 Watchdog Driver"); +MODULE_DESCRIPTION("DB8500 Watchdog Driver"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:ux500_wdt"); +MODULE_ALIAS("platform:db8500_wdt");