* [PATCH] watchdog: Remove MV64x60 watchdog driver
@ 2021-03-18 17:25 Christophe Leroy
2021-03-18 17:25 ` [PATCH] powerpc/embedded6xx: Remove CONFIG_MV64X60 Christophe Leroy
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Christophe Leroy @ 2021-03-18 17:25 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck, Sebastian Hesselbarth
Cc: linux-kernel, linuxppc-dev, linux-watchdog, netdev
Commit 92c8c16f3457 ("powerpc/embedded6xx: Remove C2K board support")
removed the last selector of CONFIG_MV64X60.
Therefore CONFIG_MV64X60_WDT cannot be selected anymore and
can be removed.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
drivers/watchdog/Kconfig | 4 -
drivers/watchdog/Makefile | 1 -
drivers/watchdog/mv64x60_wdt.c | 324 ---------------------------------
include/linux/mv643xx.h | 8 -
4 files changed, 337 deletions(-)
delete mode 100644 drivers/watchdog/mv64x60_wdt.c
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 1fe0042a48d2..178296bda151 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1831,10 +1831,6 @@ config 8xxx_WDT
For BookE processors (MPC85xx) use the BOOKE_WDT driver instead.
-config MV64X60_WDT
- tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
- depends on MV64X60 || COMPILE_TEST
-
config PIKA_WDT
tristate "PIKA FPGA Watchdog"
depends on WARP || (PPC64 && COMPILE_TEST)
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index f3a6540e725e..752c6513f731 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -175,7 +175,6 @@ obj-$(CONFIG_PIC32_DMT) += pic32-dmt.o
# POWERPC Architecture
obj-$(CONFIG_GEF_WDT) += gef_wdt.o
obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
-obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt.o
diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
deleted file mode 100644
index 894aa63488d3..000000000000
--- a/drivers/watchdog/mv64x60_wdt.c
+++ /dev/null
@@ -1,324 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * mv64x60_wdt.c - MV64X60 (Marvell Discovery) watchdog userspace interface
- *
- * Author: James Chapman <jchapman@katalix.com>
- *
- * Platform-specific setup code should configure the dog to generate
- * interrupt or reset as required. This code only enables/disables
- * and services the watchdog.
- *
- * Derived from mpc8xx_wdt.c, with the following copyright.
- *
- * 2002 (c) Florian Schirmer <jolt@tuxbox.org>
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/fs.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/miscdevice.h>
-#include <linux/module.h>
-#include <linux/watchdog.h>
-#include <linux/platform_device.h>
-#include <linux/mv643xx.h>
-#include <linux/uaccess.h>
-#include <linux/io.h>
-
-#define MV64x60_WDT_WDC_OFFSET 0
-
-/*
- * The watchdog configuration register contains a pair of 2-bit fields,
- * 1. a reload field, bits 27-26, which triggers a reload of
- * the countdown register, and
- * 2. an enable field, bits 25-24, which toggles between
- * enabling and disabling the watchdog timer.
- * Bit 31 is a read-only field which indicates whether the
- * watchdog timer is currently enabled.
- *
- * The low 24 bits contain the timer reload value.
- */
-#define MV64x60_WDC_ENABLE_SHIFT 24
-#define MV64x60_WDC_SERVICE_SHIFT 26
-#define MV64x60_WDC_ENABLED_SHIFT 31
-
-#define MV64x60_WDC_ENABLED_TRUE 1
-#define MV64x60_WDC_ENABLED_FALSE 0
-
-/* Flags bits */
-#define MV64x60_WDOG_FLAG_OPENED 0
-
-static unsigned long wdt_flags;
-static int wdt_status;
-static void __iomem *mv64x60_wdt_regs;
-static int mv64x60_wdt_timeout;
-static int mv64x60_wdt_count;
-static unsigned int bus_clk;
-static char expect_close;
-static DEFINE_SPINLOCK(mv64x60_wdt_spinlock);
-
-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) ")");
-
-static int mv64x60_wdt_toggle_wdc(int enabled_predicate, int field_shift)
-{
- u32 data;
- u32 enabled;
- int ret = 0;
-
- spin_lock(&mv64x60_wdt_spinlock);
- data = readl(mv64x60_wdt_regs + MV64x60_WDT_WDC_OFFSET);
- enabled = (data >> MV64x60_WDC_ENABLED_SHIFT) & 1;
-
- /* only toggle the requested field if enabled state matches predicate */
- if ((enabled ^ enabled_predicate) == 0) {
- /* We write a 1, then a 2 -- to the appropriate field */
- data = (1 << field_shift) | mv64x60_wdt_count;
- writel(data, mv64x60_wdt_regs + MV64x60_WDT_WDC_OFFSET);
-
- data = (2 << field_shift) | mv64x60_wdt_count;
- writel(data, mv64x60_wdt_regs + MV64x60_WDT_WDC_OFFSET);
- ret = 1;
- }
- spin_unlock(&mv64x60_wdt_spinlock);
-
- return ret;
-}
-
-static void mv64x60_wdt_service(void)
-{
- mv64x60_wdt_toggle_wdc(MV64x60_WDC_ENABLED_TRUE,
- MV64x60_WDC_SERVICE_SHIFT);
-}
-
-static void mv64x60_wdt_handler_enable(void)
-{
- if (mv64x60_wdt_toggle_wdc(MV64x60_WDC_ENABLED_FALSE,
- MV64x60_WDC_ENABLE_SHIFT)) {
- mv64x60_wdt_service();
- pr_notice("watchdog activated\n");
- }
-}
-
-static void mv64x60_wdt_handler_disable(void)
-{
- if (mv64x60_wdt_toggle_wdc(MV64x60_WDC_ENABLED_TRUE,
- MV64x60_WDC_ENABLE_SHIFT))
- pr_notice("watchdog deactivated\n");
-}
-
-static void mv64x60_wdt_set_timeout(unsigned int timeout)
-{
- /* maximum bus cycle count is 0xFFFFFFFF */
- if (timeout > 0xFFFFFFFF / bus_clk)
- timeout = 0xFFFFFFFF / bus_clk;
-
- mv64x60_wdt_count = timeout * bus_clk >> 8;
- mv64x60_wdt_timeout = timeout;
-}
-
-static int mv64x60_wdt_open(struct inode *inode, struct file *file)
-{
- if (test_and_set_bit(MV64x60_WDOG_FLAG_OPENED, &wdt_flags))
- return -EBUSY;
-
- if (nowayout)
- __module_get(THIS_MODULE);
-
- mv64x60_wdt_handler_enable();
-
- return stream_open(inode, file);
-}
-
-static int mv64x60_wdt_release(struct inode *inode, struct file *file)
-{
- if (expect_close == 42)
- mv64x60_wdt_handler_disable();
- else {
- pr_crit("unexpected close, not stopping timer!\n");
- mv64x60_wdt_service();
- }
- expect_close = 0;
-
- clear_bit(MV64x60_WDOG_FLAG_OPENED, &wdt_flags);
-
- return 0;
-}
-
-static ssize_t mv64x60_wdt_write(struct file *file, const char __user *data,
- size_t len, loff_t *ppos)
-{
- if (len) {
- if (!nowayout) {
- size_t i;
-
- 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;
- }
- }
- mv64x60_wdt_service();
- }
-
- return len;
-}
-
-static long mv64x60_wdt_ioctl(struct file *file,
- unsigned int cmd, unsigned long arg)
-{
- int timeout;
- int options;
- void __user *argp = (void __user *)arg;
- static const struct watchdog_info info = {
- .options = WDIOF_SETTIMEOUT |
- WDIOF_MAGICCLOSE |
- WDIOF_KEEPALIVEPING,
- .firmware_version = 0,
- .identity = "MV64x60 watchdog",
- };
-
- switch (cmd) {
- case WDIOC_GETSUPPORT:
- if (copy_to_user(argp, &info, sizeof(info)))
- return -EFAULT;
- break;
-
- case WDIOC_GETSTATUS:
- case WDIOC_GETBOOTSTATUS:
- if (put_user(wdt_status, (int __user *)argp))
- return -EFAULT;
- wdt_status &= ~WDIOF_KEEPALIVEPING;
- break;
-
- case WDIOC_GETTEMP:
- return -EOPNOTSUPP;
-
- case WDIOC_SETOPTIONS:
- if (get_user(options, (int __user *)argp))
- return -EFAULT;
-
- if (options & WDIOS_DISABLECARD)
- mv64x60_wdt_handler_disable();
-
- if (options & WDIOS_ENABLECARD)
- mv64x60_wdt_handler_enable();
- break;
-
- case WDIOC_KEEPALIVE:
- mv64x60_wdt_service();
- wdt_status |= WDIOF_KEEPALIVEPING;
- break;
-
- case WDIOC_SETTIMEOUT:
- if (get_user(timeout, (int __user *)argp))
- return -EFAULT;
- mv64x60_wdt_set_timeout(timeout);
- fallthrough;
-
- case WDIOC_GETTIMEOUT:
- if (put_user(mv64x60_wdt_timeout, (int __user *)argp))
- return -EFAULT;
- break;
-
- default:
- return -ENOTTY;
- }
-
- return 0;
-}
-
-static const struct file_operations mv64x60_wdt_fops = {
- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .write = mv64x60_wdt_write,
- .unlocked_ioctl = mv64x60_wdt_ioctl,
- .compat_ioctl = compat_ptr_ioctl,
- .open = mv64x60_wdt_open,
- .release = mv64x60_wdt_release,
-};
-
-static struct miscdevice mv64x60_wdt_miscdev = {
- .minor = WATCHDOG_MINOR,
- .name = "watchdog",
- .fops = &mv64x60_wdt_fops,
-};
-
-static int mv64x60_wdt_probe(struct platform_device *dev)
-{
- struct mv64x60_wdt_pdata *pdata = dev_get_platdata(&dev->dev);
- struct resource *r;
- int timeout = 10;
-
- bus_clk = 133; /* in MHz */
- if (pdata) {
- timeout = pdata->timeout;
- bus_clk = pdata->bus_clk;
- }
-
- /* Since bus_clk is truncated MHz, actual frequency could be
- * up to 1MHz higher. Round up, since it's better to time out
- * too late than too soon.
- */
- bus_clk++;
- bus_clk *= 1000000; /* convert to Hz */
-
- r = platform_get_resource(dev, IORESOURCE_MEM, 0);
- if (!r)
- return -ENODEV;
-
- mv64x60_wdt_regs = devm_ioremap(&dev->dev, r->start, resource_size(r));
- if (mv64x60_wdt_regs == NULL)
- return -ENOMEM;
-
- mv64x60_wdt_set_timeout(timeout);
-
- mv64x60_wdt_handler_disable(); /* in case timer was already running */
-
- return misc_register(&mv64x60_wdt_miscdev);
-}
-
-static int mv64x60_wdt_remove(struct platform_device *dev)
-{
- misc_deregister(&mv64x60_wdt_miscdev);
-
- mv64x60_wdt_handler_disable();
-
- return 0;
-}
-
-static struct platform_driver mv64x60_wdt_driver = {
- .probe = mv64x60_wdt_probe,
- .remove = mv64x60_wdt_remove,
- .driver = {
- .name = MV64x60_WDT_NAME,
- },
-};
-
-static int __init mv64x60_wdt_init(void)
-{
- pr_info("MV64x60 watchdog driver\n");
-
- return platform_driver_register(&mv64x60_wdt_driver);
-}
-
-static void __exit mv64x60_wdt_exit(void)
-{
- platform_driver_unregister(&mv64x60_wdt_driver);
-}
-
-module_init(mv64x60_wdt_init);
-module_exit(mv64x60_wdt_exit);
-
-MODULE_AUTHOR("James Chapman <jchapman@katalix.com>");
-MODULE_DESCRIPTION("MV64x60 watchdog driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:" MV64x60_WDT_NAME);
diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h
index 47e5679b48e1..000b126acfb6 100644
--- a/include/linux/mv643xx.h
+++ b/include/linux/mv643xx.h
@@ -918,12 +918,4 @@
extern void mv64340_irq_init(unsigned int base);
-/* Watchdog Platform Device, Driver Data */
-#define MV64x60_WDT_NAME "mv64x60_wdt"
-
-struct mv64x60_wdt_pdata {
- int timeout; /* watchdog expiry in seconds, default 10 */
- int bus_clk; /* bus clock in MHz, default 133 */
-};
-
#endif /* __ASM_MV643XX_H */
--
2.25.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH] powerpc/embedded6xx: Remove CONFIG_MV64X60
2021-03-18 17:25 [PATCH] watchdog: Remove MV64x60 watchdog driver Christophe Leroy
@ 2021-03-18 17:25 ` Christophe Leroy
2021-03-18 19:22 ` Wolfram Sang
2021-03-31 1:09 ` Michael Ellerman
2021-03-18 17:25 ` [PATCH] net: marvell: Remove reference to CONFIG_MV64X60 Christophe Leroy
2021-03-18 18:32 ` [PATCH] watchdog: Remove MV64x60 watchdog driver Guenter Roeck
2 siblings, 2 replies; 12+ messages in thread
From: Christophe Leroy @ 2021-03-18 17:25 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman, Wolfram Sang
Cc: linux-kernel, linuxppc-dev, linux-i2c
Commit 92c8c16f3457 ("powerpc/embedded6xx: Remove C2K board support")
moved the last selector of CONFIG_MV64X60.
As it is not a user selectable config, it can be removed.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/platforms/embedded6xx/Kconfig | 5 -----
drivers/i2c/busses/Kconfig | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index c1920961f410..4c6d703a4284 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -71,11 +71,6 @@ config MPC10X_BRIDGE
bool
select PPC_INDIRECT_PCI
-config MV64X60
- bool
- select PPC_INDIRECT_PCI
- select CHECK_CACHE_COHERENCY
-
config GAMECUBE_COMMON
bool
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 05ebf7546e3f..20edcda1c6f4 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -776,7 +776,7 @@ config I2C_MT7621
config I2C_MV64XXX
tristate "Marvell mv64xxx I2C Controller"
- depends on MV64X60 || PLAT_ORION || ARCH_SUNXI || ARCH_MVEBU || COMPILE_TEST
+ depends on PLAT_ORION || ARCH_SUNXI || ARCH_MVEBU || COMPILE_TEST
help
If you say yes to this option, support will be included for the
built-in I2C interface on the Marvell 64xxx line of host bridges.
--
2.25.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] powerpc/embedded6xx: Remove CONFIG_MV64X60
2021-03-18 17:25 ` [PATCH] powerpc/embedded6xx: Remove CONFIG_MV64X60 Christophe Leroy
@ 2021-03-18 19:22 ` Wolfram Sang
2021-03-31 1:09 ` Michael Ellerman
1 sibling, 0 replies; 12+ messages in thread
From: Wolfram Sang @ 2021-03-18 19:22 UTC (permalink / raw)
To: Christophe Leroy
Cc: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
linux-kernel, linuxppc-dev, linux-i2c
[-- Attachment #1: Type: text/plain, Size: 375 bytes --]
On Thu, Mar 18, 2021 at 05:25:07PM +0000, Christophe Leroy wrote:
> Commit 92c8c16f3457 ("powerpc/embedded6xx: Remove C2K board support")
> moved the last selector of CONFIG_MV64X60.
>
> As it is not a user selectable config, it can be removed.
>
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: Wolfram Sang <wsa@kernel.org> # for I2C
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] powerpc/embedded6xx: Remove CONFIG_MV64X60
2021-03-18 17:25 ` [PATCH] powerpc/embedded6xx: Remove CONFIG_MV64X60 Christophe Leroy
2021-03-18 19:22 ` Wolfram Sang
@ 2021-03-31 1:09 ` Michael Ellerman
1 sibling, 0 replies; 12+ messages in thread
From: Michael Ellerman @ 2021-03-31 1:09 UTC (permalink / raw)
To: Michael Ellerman, Paul Mackerras, Christophe Leroy,
Benjamin Herrenschmidt, Wolfram Sang
Cc: linux-kernel, linuxppc-dev, linux-i2c
On Thu, 18 Mar 2021 17:25:07 +0000 (UTC), Christophe Leroy wrote:
> Commit 92c8c16f3457 ("powerpc/embedded6xx: Remove C2K board support")
> moved the last selector of CONFIG_MV64X60.
>
> As it is not a user selectable config, it can be removed.
Applied to powerpc/next.
[1/1] powerpc/embedded6xx: Remove CONFIG_MV64X60
https://git.kernel.org/powerpc/c/a329ddd472fa2af0c19a73b8658898ae7fd658ad
cheers
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] net: marvell: Remove reference to CONFIG_MV64X60
2021-03-18 17:25 [PATCH] watchdog: Remove MV64x60 watchdog driver Christophe Leroy
2021-03-18 17:25 ` [PATCH] powerpc/embedded6xx: Remove CONFIG_MV64X60 Christophe Leroy
@ 2021-03-18 17:25 ` Christophe Leroy
2021-03-18 21:30 ` patchwork-bot+netdevbpf
2021-03-18 18:32 ` [PATCH] watchdog: Remove MV64x60 watchdog driver Guenter Roeck
2 siblings, 1 reply; 12+ messages in thread
From: Christophe Leroy @ 2021-03-18 17:25 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Sebastian Hesselbarth
Cc: linux-kernel, linuxppc-dev, netdev
Commit 92c8c16f3457 ("powerpc/embedded6xx: Remove C2K board support")
removed last selector of CONFIG_MV64X60.
As it is not a user selectable config item, all references to it
are stale. Remove them.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
drivers/net/ethernet/marvell/Kconfig | 4 ++--
drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig
index 7fe15a3286f4..fe0989c0fc25 100644
--- a/drivers/net/ethernet/marvell/Kconfig
+++ b/drivers/net/ethernet/marvell/Kconfig
@@ -6,7 +6,7 @@
config NET_VENDOR_MARVELL
bool "Marvell devices"
default y
- depends on PCI || CPU_PXA168 || MV64X60 || PPC32 || PLAT_ORION || INET || COMPILE_TEST
+ depends on PCI || CPU_PXA168 || PPC32 || PLAT_ORION || INET || COMPILE_TEST
help
If you have a network (Ethernet) card belonging to this class, say Y.
@@ -19,7 +19,7 @@ if NET_VENDOR_MARVELL
config MV643XX_ETH
tristate "Marvell Discovery (643XX) and Orion ethernet support"
- depends on MV64X60 || PPC32 || PLAT_ORION || COMPILE_TEST
+ depends on PPC32 || PLAT_ORION || COMPILE_TEST
depends on INET
select PHYLIB
select MVMDIO
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 90e6111ce534..3bfb659b5c99 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2684,7 +2684,7 @@ static const struct of_device_id mv643xx_eth_shared_ids[] = {
MODULE_DEVICE_TABLE(of, mv643xx_eth_shared_ids);
#endif
-#if defined(CONFIG_OF_IRQ) && !defined(CONFIG_MV64X60)
+#ifdef CONFIG_OF_IRQ
#define mv643xx_eth_property(_np, _name, _v) \
do { \
u32 tmp; \
--
2.25.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] net: marvell: Remove reference to CONFIG_MV64X60
2021-03-18 17:25 ` [PATCH] net: marvell: Remove reference to CONFIG_MV64X60 Christophe Leroy
@ 2021-03-18 21:30 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 12+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-03-18 21:30 UTC (permalink / raw)
To: Christophe Leroy
Cc: davem, kuba, sebastian.hesselbarth, linux-kernel, linuxppc-dev, netdev
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Thu, 18 Mar 2021 17:25:08 +0000 (UTC) you wrote:
> Commit 92c8c16f3457 ("powerpc/embedded6xx: Remove C2K board support")
> removed last selector of CONFIG_MV64X60.
>
> As it is not a user selectable config item, all references to it
> are stale. Remove them.
>
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
>
> [...]
Here is the summary with links:
- net: marvell: Remove reference to CONFIG_MV64X60
https://git.kernel.org/netdev/net/c/600cc3c9c62d
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] watchdog: Remove MV64x60 watchdog driver
2021-03-18 17:25 [PATCH] watchdog: Remove MV64x60 watchdog driver Christophe Leroy
2021-03-18 17:25 ` [PATCH] powerpc/embedded6xx: Remove CONFIG_MV64X60 Christophe Leroy
2021-03-18 17:25 ` [PATCH] net: marvell: Remove reference to CONFIG_MV64X60 Christophe Leroy
@ 2021-03-18 18:32 ` Guenter Roeck
2021-05-17 11:17 ` Michael Ellerman
2 siblings, 1 reply; 12+ messages in thread
From: Guenter Roeck @ 2021-03-18 18:32 UTC (permalink / raw)
To: Christophe Leroy, Wim Van Sebroeck, Sebastian Hesselbarth
Cc: linux-kernel, linuxppc-dev, linux-watchdog, netdev
On 3/18/21 10:25 AM, Christophe Leroy wrote:
> Commit 92c8c16f3457 ("powerpc/embedded6xx: Remove C2K board support")
> removed the last selector of CONFIG_MV64X60.
>
> Therefore CONFIG_MV64X60_WDT cannot be selected anymore and
> can be removed.
>
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/Kconfig | 4 -
> drivers/watchdog/Makefile | 1 -
> drivers/watchdog/mv64x60_wdt.c | 324 ---------------------------------
> include/linux/mv643xx.h | 8 -
> 4 files changed, 337 deletions(-)
> delete mode 100644 drivers/watchdog/mv64x60_wdt.c
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 1fe0042a48d2..178296bda151 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1831,10 +1831,6 @@ config 8xxx_WDT
>
> For BookE processors (MPC85xx) use the BOOKE_WDT driver instead.
>
> -config MV64X60_WDT
> - tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
> - depends on MV64X60 || COMPILE_TEST
> -
> config PIKA_WDT
> tristate "PIKA FPGA Watchdog"
> depends on WARP || (PPC64 && COMPILE_TEST)
> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index f3a6540e725e..752c6513f731 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -175,7 +175,6 @@ obj-$(CONFIG_PIC32_DMT) += pic32-dmt.o
> # POWERPC Architecture
> obj-$(CONFIG_GEF_WDT) += gef_wdt.o
> obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
> -obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
> obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
> obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
> obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt.o
> diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
> deleted file mode 100644
> index 894aa63488d3..000000000000
> --- a/drivers/watchdog/mv64x60_wdt.c
> +++ /dev/null
> @@ -1,324 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * mv64x60_wdt.c - MV64X60 (Marvell Discovery) watchdog userspace interface
> - *
> - * Author: James Chapman <jchapman@katalix.com>
> - *
> - * Platform-specific setup code should configure the dog to generate
> - * interrupt or reset as required. This code only enables/disables
> - * and services the watchdog.
> - *
> - * Derived from mpc8xx_wdt.c, with the following copyright.
> - *
> - * 2002 (c) Florian Schirmer <jolt@tuxbox.org>
> - */
> -
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
> -#include <linux/fs.h>
> -#include <linux/init.h>
> -#include <linux/kernel.h>
> -#include <linux/miscdevice.h>
> -#include <linux/module.h>
> -#include <linux/watchdog.h>
> -#include <linux/platform_device.h>
> -#include <linux/mv643xx.h>
> -#include <linux/uaccess.h>
> -#include <linux/io.h>
> -
> -#define MV64x60_WDT_WDC_OFFSET 0
> -
> -/*
> - * The watchdog configuration register contains a pair of 2-bit fields,
> - * 1. a reload field, bits 27-26, which triggers a reload of
> - * the countdown register, and
> - * 2. an enable field, bits 25-24, which toggles between
> - * enabling and disabling the watchdog timer.
> - * Bit 31 is a read-only field which indicates whether the
> - * watchdog timer is currently enabled.
> - *
> - * The low 24 bits contain the timer reload value.
> - */
> -#define MV64x60_WDC_ENABLE_SHIFT 24
> -#define MV64x60_WDC_SERVICE_SHIFT 26
> -#define MV64x60_WDC_ENABLED_SHIFT 31
> -
> -#define MV64x60_WDC_ENABLED_TRUE 1
> -#define MV64x60_WDC_ENABLED_FALSE 0
> -
> -/* Flags bits */
> -#define MV64x60_WDOG_FLAG_OPENED 0
> -
> -static unsigned long wdt_flags;
> -static int wdt_status;
> -static void __iomem *mv64x60_wdt_regs;
> -static int mv64x60_wdt_timeout;
> -static int mv64x60_wdt_count;
> -static unsigned int bus_clk;
> -static char expect_close;
> -static DEFINE_SPINLOCK(mv64x60_wdt_spinlock);
> -
> -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) ")");
> -
> -static int mv64x60_wdt_toggle_wdc(int enabled_predicate, int field_shift)
> -{
> - u32 data;
> - u32 enabled;
> - int ret = 0;
> -
> - spin_lock(&mv64x60_wdt_spinlock);
> - data = readl(mv64x60_wdt_regs + MV64x60_WDT_WDC_OFFSET);
> - enabled = (data >> MV64x60_WDC_ENABLED_SHIFT) & 1;
> -
> - /* only toggle the requested field if enabled state matches predicate */
> - if ((enabled ^ enabled_predicate) == 0) {
> - /* We write a 1, then a 2 -- to the appropriate field */
> - data = (1 << field_shift) | mv64x60_wdt_count;
> - writel(data, mv64x60_wdt_regs + MV64x60_WDT_WDC_OFFSET);
> -
> - data = (2 << field_shift) | mv64x60_wdt_count;
> - writel(data, mv64x60_wdt_regs + MV64x60_WDT_WDC_OFFSET);
> - ret = 1;
> - }
> - spin_unlock(&mv64x60_wdt_spinlock);
> -
> - return ret;
> -}
> -
> -static void mv64x60_wdt_service(void)
> -{
> - mv64x60_wdt_toggle_wdc(MV64x60_WDC_ENABLED_TRUE,
> - MV64x60_WDC_SERVICE_SHIFT);
> -}
> -
> -static void mv64x60_wdt_handler_enable(void)
> -{
> - if (mv64x60_wdt_toggle_wdc(MV64x60_WDC_ENABLED_FALSE,
> - MV64x60_WDC_ENABLE_SHIFT)) {
> - mv64x60_wdt_service();
> - pr_notice("watchdog activated\n");
> - }
> -}
> -
> -static void mv64x60_wdt_handler_disable(void)
> -{
> - if (mv64x60_wdt_toggle_wdc(MV64x60_WDC_ENABLED_TRUE,
> - MV64x60_WDC_ENABLE_SHIFT))
> - pr_notice("watchdog deactivated\n");
> -}
> -
> -static void mv64x60_wdt_set_timeout(unsigned int timeout)
> -{
> - /* maximum bus cycle count is 0xFFFFFFFF */
> - if (timeout > 0xFFFFFFFF / bus_clk)
> - timeout = 0xFFFFFFFF / bus_clk;
> -
> - mv64x60_wdt_count = timeout * bus_clk >> 8;
> - mv64x60_wdt_timeout = timeout;
> -}
> -
> -static int mv64x60_wdt_open(struct inode *inode, struct file *file)
> -{
> - if (test_and_set_bit(MV64x60_WDOG_FLAG_OPENED, &wdt_flags))
> - return -EBUSY;
> -
> - if (nowayout)
> - __module_get(THIS_MODULE);
> -
> - mv64x60_wdt_handler_enable();
> -
> - return stream_open(inode, file);
> -}
> -
> -static int mv64x60_wdt_release(struct inode *inode, struct file *file)
> -{
> - if (expect_close == 42)
> - mv64x60_wdt_handler_disable();
> - else {
> - pr_crit("unexpected close, not stopping timer!\n");
> - mv64x60_wdt_service();
> - }
> - expect_close = 0;
> -
> - clear_bit(MV64x60_WDOG_FLAG_OPENED, &wdt_flags);
> -
> - return 0;
> -}
> -
> -static ssize_t mv64x60_wdt_write(struct file *file, const char __user *data,
> - size_t len, loff_t *ppos)
> -{
> - if (len) {
> - if (!nowayout) {
> - size_t i;
> -
> - 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;
> - }
> - }
> - mv64x60_wdt_service();
> - }
> -
> - return len;
> -}
> -
> -static long mv64x60_wdt_ioctl(struct file *file,
> - unsigned int cmd, unsigned long arg)
> -{
> - int timeout;
> - int options;
> - void __user *argp = (void __user *)arg;
> - static const struct watchdog_info info = {
> - .options = WDIOF_SETTIMEOUT |
> - WDIOF_MAGICCLOSE |
> - WDIOF_KEEPALIVEPING,
> - .firmware_version = 0,
> - .identity = "MV64x60 watchdog",
> - };
> -
> - switch (cmd) {
> - case WDIOC_GETSUPPORT:
> - if (copy_to_user(argp, &info, sizeof(info)))
> - return -EFAULT;
> - break;
> -
> - case WDIOC_GETSTATUS:
> - case WDIOC_GETBOOTSTATUS:
> - if (put_user(wdt_status, (int __user *)argp))
> - return -EFAULT;
> - wdt_status &= ~WDIOF_KEEPALIVEPING;
> - break;
> -
> - case WDIOC_GETTEMP:
> - return -EOPNOTSUPP;
> -
> - case WDIOC_SETOPTIONS:
> - if (get_user(options, (int __user *)argp))
> - return -EFAULT;
> -
> - if (options & WDIOS_DISABLECARD)
> - mv64x60_wdt_handler_disable();
> -
> - if (options & WDIOS_ENABLECARD)
> - mv64x60_wdt_handler_enable();
> - break;
> -
> - case WDIOC_KEEPALIVE:
> - mv64x60_wdt_service();
> - wdt_status |= WDIOF_KEEPALIVEPING;
> - break;
> -
> - case WDIOC_SETTIMEOUT:
> - if (get_user(timeout, (int __user *)argp))
> - return -EFAULT;
> - mv64x60_wdt_set_timeout(timeout);
> - fallthrough;
> -
> - case WDIOC_GETTIMEOUT:
> - if (put_user(mv64x60_wdt_timeout, (int __user *)argp))
> - return -EFAULT;
> - break;
> -
> - default:
> - return -ENOTTY;
> - }
> -
> - return 0;
> -}
> -
> -static const struct file_operations mv64x60_wdt_fops = {
> - .owner = THIS_MODULE,
> - .llseek = no_llseek,
> - .write = mv64x60_wdt_write,
> - .unlocked_ioctl = mv64x60_wdt_ioctl,
> - .compat_ioctl = compat_ptr_ioctl,
> - .open = mv64x60_wdt_open,
> - .release = mv64x60_wdt_release,
> -};
> -
> -static struct miscdevice mv64x60_wdt_miscdev = {
> - .minor = WATCHDOG_MINOR,
> - .name = "watchdog",
> - .fops = &mv64x60_wdt_fops,
> -};
> -
> -static int mv64x60_wdt_probe(struct platform_device *dev)
> -{
> - struct mv64x60_wdt_pdata *pdata = dev_get_platdata(&dev->dev);
> - struct resource *r;
> - int timeout = 10;
> -
> - bus_clk = 133; /* in MHz */
> - if (pdata) {
> - timeout = pdata->timeout;
> - bus_clk = pdata->bus_clk;
> - }
> -
> - /* Since bus_clk is truncated MHz, actual frequency could be
> - * up to 1MHz higher. Round up, since it's better to time out
> - * too late than too soon.
> - */
> - bus_clk++;
> - bus_clk *= 1000000; /* convert to Hz */
> -
> - r = platform_get_resource(dev, IORESOURCE_MEM, 0);
> - if (!r)
> - return -ENODEV;
> -
> - mv64x60_wdt_regs = devm_ioremap(&dev->dev, r->start, resource_size(r));
> - if (mv64x60_wdt_regs == NULL)
> - return -ENOMEM;
> -
> - mv64x60_wdt_set_timeout(timeout);
> -
> - mv64x60_wdt_handler_disable(); /* in case timer was already running */
> -
> - return misc_register(&mv64x60_wdt_miscdev);
> -}
> -
> -static int mv64x60_wdt_remove(struct platform_device *dev)
> -{
> - misc_deregister(&mv64x60_wdt_miscdev);
> -
> - mv64x60_wdt_handler_disable();
> -
> - return 0;
> -}
> -
> -static struct platform_driver mv64x60_wdt_driver = {
> - .probe = mv64x60_wdt_probe,
> - .remove = mv64x60_wdt_remove,
> - .driver = {
> - .name = MV64x60_WDT_NAME,
> - },
> -};
> -
> -static int __init mv64x60_wdt_init(void)
> -{
> - pr_info("MV64x60 watchdog driver\n");
> -
> - return platform_driver_register(&mv64x60_wdt_driver);
> -}
> -
> -static void __exit mv64x60_wdt_exit(void)
> -{
> - platform_driver_unregister(&mv64x60_wdt_driver);
> -}
> -
> -module_init(mv64x60_wdt_init);
> -module_exit(mv64x60_wdt_exit);
> -
> -MODULE_AUTHOR("James Chapman <jchapman@katalix.com>");
> -MODULE_DESCRIPTION("MV64x60 watchdog driver");
> -MODULE_LICENSE("GPL");
> -MODULE_ALIAS("platform:" MV64x60_WDT_NAME);
> diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h
> index 47e5679b48e1..000b126acfb6 100644
> --- a/include/linux/mv643xx.h
> +++ b/include/linux/mv643xx.h
> @@ -918,12 +918,4 @@
>
> extern void mv64340_irq_init(unsigned int base);
>
> -/* Watchdog Platform Device, Driver Data */
> -#define MV64x60_WDT_NAME "mv64x60_wdt"
> -
> -struct mv64x60_wdt_pdata {
> - int timeout; /* watchdog expiry in seconds, default 10 */
> - int bus_clk; /* bus clock in MHz, default 133 */
> -};
> -
> #endif /* __ASM_MV643XX_H */
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] watchdog: Remove MV64x60 watchdog driver
2021-03-18 18:32 ` [PATCH] watchdog: Remove MV64x60 watchdog driver Guenter Roeck
@ 2021-05-17 11:17 ` Michael Ellerman
2021-05-17 13:39 ` Guenter Roeck
0 siblings, 1 reply; 12+ messages in thread
From: Michael Ellerman @ 2021-05-17 11:17 UTC (permalink / raw)
To: Guenter Roeck, Christophe Leroy, Wim Van Sebroeck, Sebastian Hesselbarth
Cc: linux-kernel, linuxppc-dev, linux-watchdog, netdev
Guenter Roeck <linux@roeck-us.net> writes:
> On 3/18/21 10:25 AM, Christophe Leroy wrote:
>> Commit 92c8c16f3457 ("powerpc/embedded6xx: Remove C2K board support")
>> removed the last selector of CONFIG_MV64X60.
>>
>> Therefore CONFIG_MV64X60_WDT cannot be selected anymore and
>> can be removed.
>>
>> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>
>> ---
>> drivers/watchdog/Kconfig | 4 -
>> drivers/watchdog/Makefile | 1 -
>> drivers/watchdog/mv64x60_wdt.c | 324 ---------------------------------
>> include/linux/mv643xx.h | 8 -
>> 4 files changed, 337 deletions(-)
>> delete mode 100644 drivers/watchdog/mv64x60_wdt.c
I assumed this would go via the watchdog tree, but seems like I
misinterpreted.
Should I take this via the powerpc tree for v5.14 ?
cheers
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] watchdog: Remove MV64x60 watchdog driver
2021-05-17 11:17 ` Michael Ellerman
@ 2021-05-17 13:39 ` Guenter Roeck
2021-06-07 1:43 ` Michael Ellerman
0 siblings, 1 reply; 12+ messages in thread
From: Guenter Roeck @ 2021-05-17 13:39 UTC (permalink / raw)
To: Michael Ellerman, Christophe Leroy, Wim Van Sebroeck,
Sebastian Hesselbarth
Cc: linux-kernel, linuxppc-dev, linux-watchdog, netdev
On 5/17/21 4:17 AM, Michael Ellerman wrote:
> Guenter Roeck <linux@roeck-us.net> writes:
>> On 3/18/21 10:25 AM, Christophe Leroy wrote:
>>> Commit 92c8c16f3457 ("powerpc/embedded6xx: Remove C2K board support")
>>> removed the last selector of CONFIG_MV64X60.
>>>
>>> Therefore CONFIG_MV64X60_WDT cannot be selected anymore and
>>> can be removed.
>>>
>>> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
>>
>> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>>
>>> ---
>>> drivers/watchdog/Kconfig | 4 -
>>> drivers/watchdog/Makefile | 1 -
>>> drivers/watchdog/mv64x60_wdt.c | 324 ---------------------------------
>>> include/linux/mv643xx.h | 8 -
>>> 4 files changed, 337 deletions(-)
>>> delete mode 100644 drivers/watchdog/mv64x60_wdt.c
>
> I assumed this would go via the watchdog tree, but seems like I
> misinterpreted.
>
Wim didn't send a pull request this time around.
Guenter
> Should I take this via the powerpc tree for v5.14 ?
>
> cheers
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] watchdog: Remove MV64x60 watchdog driver
2021-05-17 13:39 ` Guenter Roeck
@ 2021-06-07 1:43 ` Michael Ellerman
2021-06-07 11:29 ` Guenter Roeck
0 siblings, 1 reply; 12+ messages in thread
From: Michael Ellerman @ 2021-06-07 1:43 UTC (permalink / raw)
To: Guenter Roeck, Christophe Leroy, Wim Van Sebroeck, Sebastian Hesselbarth
Cc: linux-kernel, linuxppc-dev, linux-watchdog, netdev
Guenter Roeck <linux@roeck-us.net> writes:
> On 5/17/21 4:17 AM, Michael Ellerman wrote:
>> Guenter Roeck <linux@roeck-us.net> writes:
>>> On 3/18/21 10:25 AM, Christophe Leroy wrote:
>>>> Commit 92c8c16f3457 ("powerpc/embedded6xx: Remove C2K board support")
>>>> removed the last selector of CONFIG_MV64X60.
>>>>
>>>> Therefore CONFIG_MV64X60_WDT cannot be selected anymore and
>>>> can be removed.
>>>>
>>>> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
>>>
>>> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>>>
>>>> ---
>>>> drivers/watchdog/Kconfig | 4 -
>>>> drivers/watchdog/Makefile | 1 -
>>>> drivers/watchdog/mv64x60_wdt.c | 324 ---------------------------------
>>>> include/linux/mv643xx.h | 8 -
>>>> 4 files changed, 337 deletions(-)
>>>> delete mode 100644 drivers/watchdog/mv64x60_wdt.c
>>
>> I assumed this would go via the watchdog tree, but seems like I
>> misinterpreted.
>>
>
> Wim didn't send a pull request this time around.
>
> Guenter
>
>> Should I take this via the powerpc tree for v5.14 ?
I still don't see this in the watchdog tree, should I take it?
cheers
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] watchdog: Remove MV64x60 watchdog driver
2021-06-07 1:43 ` Michael Ellerman
@ 2021-06-07 11:29 ` Guenter Roeck
2021-06-20 13:30 ` gituser
0 siblings, 1 reply; 12+ messages in thread
From: Guenter Roeck @ 2021-06-07 11:29 UTC (permalink / raw)
To: Michael Ellerman
Cc: Christophe Leroy, Wim Van Sebroeck, Sebastian Hesselbarth,
linux-kernel, linuxppc-dev, linux-watchdog, netdev
On Mon, Jun 07, 2021 at 11:43:26AM +1000, Michael Ellerman wrote:
> Guenter Roeck <linux@roeck-us.net> writes:
> > On 5/17/21 4:17 AM, Michael Ellerman wrote:
> >> Guenter Roeck <linux@roeck-us.net> writes:
> >>> On 3/18/21 10:25 AM, Christophe Leroy wrote:
> >>>> Commit 92c8c16f3457 ("powerpc/embedded6xx: Remove C2K board support")
> >>>> removed the last selector of CONFIG_MV64X60.
> >>>>
> >>>> Therefore CONFIG_MV64X60_WDT cannot be selected anymore and
> >>>> can be removed.
> >>>>
> >>>> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> >>>
> >>> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> >>>
> >>>> ---
> >>>> drivers/watchdog/Kconfig | 4 -
> >>>> drivers/watchdog/Makefile | 1 -
> >>>> drivers/watchdog/mv64x60_wdt.c | 324 ---------------------------------
> >>>> include/linux/mv643xx.h | 8 -
> >>>> 4 files changed, 337 deletions(-)
> >>>> delete mode 100644 drivers/watchdog/mv64x60_wdt.c
> >>
> >> I assumed this would go via the watchdog tree, but seems like I
> >> misinterpreted.
> >>
> >
> > Wim didn't send a pull request this time around.
> >
> > Guenter
> >
> >> Should I take this via the powerpc tree for v5.14 ?
>
> I still don't see this in the watchdog tree, should I take it?
>
It is in my personal watchdog-next tree, but afaics Wim hasn't picked any
of it up yet. Wim ?
Thanks,
Guenter
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] watchdog: Remove MV64x60 watchdog driver
2021-06-07 11:29 ` Guenter Roeck
@ 2021-06-20 13:30 ` gituser
0 siblings, 0 replies; 12+ messages in thread
From: gituser @ 2021-06-20 13:30 UTC (permalink / raw)
To: Guenter Roeck
Cc: Michael Ellerman, Christophe Leroy, Wim Van Sebroeck,
Sebastian Hesselbarth, linux-kernel, linuxppc-dev,
linux-watchdog, netdev
Hi All,
On Mon, Jun 07, 2021 at 04:29:50AM -0700, Guenter Roeck wrote:
> On Mon, Jun 07, 2021 at 11:43:26AM +1000, Michael Ellerman wrote:
> > Guenter Roeck <linux@roeck-us.net> writes:
> > > On 5/17/21 4:17 AM, Michael Ellerman wrote:
> > >> Guenter Roeck <linux@roeck-us.net> writes:
> > >>> On 3/18/21 10:25 AM, Christophe Leroy wrote:
> > >>>> Commit 92c8c16f3457 ("powerpc/embedded6xx: Remove C2K board support")
> > >>>> removed the last selector of CONFIG_MV64X60.
> > >>>>
> > >>>> Therefore CONFIG_MV64X60_WDT cannot be selected anymore and
> > >>>> can be removed.
> > >>>>
> > >>>> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> > >>>
> > >>> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> > >>>
> > >>>> ---
> > >>>> drivers/watchdog/Kconfig | 4 -
> > >>>> drivers/watchdog/Makefile | 1 -
> > >>>> drivers/watchdog/mv64x60_wdt.c | 324 ---------------------------------
> > >>>> include/linux/mv643xx.h | 8 -
> > >>>> 4 files changed, 337 deletions(-)
> > >>>> delete mode 100644 drivers/watchdog/mv64x60_wdt.c
> > >>
> > >> I assumed this would go via the watchdog tree, but seems like I
> > >> misinterpreted.
> > >>
> > >
> > > Wim didn't send a pull request this time around.
> > >
> > > Guenter
> > >
> > >> Should I take this via the powerpc tree for v5.14 ?
> >
> > I still don't see this in the watchdog tree, should I take it?
> >
> It is in my personal watchdog-next tree, but afaics Wim hasn't picked any
> of it up yet. Wim ?
Picking it up right now.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-06-20 14:54 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-18 17:25 [PATCH] watchdog: Remove MV64x60 watchdog driver Christophe Leroy
2021-03-18 17:25 ` [PATCH] powerpc/embedded6xx: Remove CONFIG_MV64X60 Christophe Leroy
2021-03-18 19:22 ` Wolfram Sang
2021-03-31 1:09 ` Michael Ellerman
2021-03-18 17:25 ` [PATCH] net: marvell: Remove reference to CONFIG_MV64X60 Christophe Leroy
2021-03-18 21:30 ` patchwork-bot+netdevbpf
2021-03-18 18:32 ` [PATCH] watchdog: Remove MV64x60 watchdog driver Guenter Roeck
2021-05-17 11:17 ` Michael Ellerman
2021-05-17 13:39 ` Guenter Roeck
2021-06-07 1:43 ` Michael Ellerman
2021-06-07 11:29 ` Guenter Roeck
2021-06-20 13:30 ` gituser
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).