[PATCH 1/3] watchdog: ux500_wdt: Drop platform data

[PATCH 1/3] watchdog: ux500_wdt: Drop platform data

[Linus Walleij]

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 <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
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 <linux/mfd/abx500/ab8500.h>
 #include <linux/regulator/db8500-prcmu.h>
 #include <linux/regulator/machine.h>
-#include <linux/platform_data/ux500_wdt.h>
 #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 <linux/uaccess.h>
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
-#include <linux/platform_data/ux500_wdt.h>
 
 #include <linux/mfd/dbx500-prcmu.h>
 
@@ -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 */
-- 
2.31.1

[PATCH 2/3] watchdog: db8500_wdt: Rename driver

[Linus Walleij]

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 <linus.walleij@linaro.org>
---
 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
-- 
2.31.1

[PATCH 3/3] watchdog: db8500_wdt: Rename symbols

[Linus Walleij]

For conistency and clarity, rename all symbols and strings from
ux500 to db8500 in the driver.

Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
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 <jonas.aberg@stericsson.com>");
-MODULE_DESCRIPTION("Ux500 Watchdog Driver");
+MODULE_DESCRIPTION("DB8500 Watchdog Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:ux500_wdt");
+MODULE_ALIAS("platform:db8500_wdt");
-- 
2.31.1

Re: [PATCH 1/3] watchdog: ux500_wdt: Drop platform data

[Guenter Roeck]

On 9/22/21 4:09 PM, Linus Walleij wrote:
> 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 <lee.jones@linaro.org>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
> 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 <linux/mfd/abx500/ab8500.h>
>   #include <linux/regulator/db8500-prcmu.h>
>   #include <linux/regulator/machine.h>
> -#include <linux/platform_data/ux500_wdt.h>
>   #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 <linux/uaccess.h>
>   #include <linux/watchdog.h>
>   #include <linux/platform_device.h>
> -#include <linux/platform_data/ux500_wdt.h>
>   
>   #include <linux/mfd/dbx500-prcmu.h>
>   
> @@ -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 */
> 

Re: [PATCH 2/3] watchdog: db8500_wdt: Rename driver

[Guenter Roeck]

On 9/22/21 4:09 PM, Linus Walleij wrote:
> 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 <linus.walleij@linaro.org>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>   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
> 

Re: [PATCH 3/3] watchdog: db8500_wdt: Rename symbols

[Guenter Roeck]

On 9/22/21 4:09 PM, Linus Walleij wrote:
> For conistency and clarity, rename all symbols and strings from
> ux500 to db8500 in the driver.
> 
> Cc: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
> 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 <jonas.aberg@stericsson.com>");
> -MODULE_DESCRIPTION("Ux500 Watchdog Driver");
> +MODULE_DESCRIPTION("DB8500 Watchdog Driver");
>   MODULE_LICENSE("GPL");
> -MODULE_ALIAS("platform:ux500_wdt");
> +MODULE_ALIAS("platform:db8500_wdt");
> 

Re: [PATCH 1/3] watchdog: ux500_wdt: Drop platform data

[Linus Walleij]

On Thu, Sep 23, 2021 at 1:11 AM Linus Walleij <linus.walleij@linaro.org> wrote:

> 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 <lee.jones@linaro.org>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Lee do you think you could ACK this patch so Guenther
can merge this series?

Yours,
Linus Walleij

Re: [PATCH 3/3] watchdog: db8500_wdt: Rename symbols

[Linus Walleij]

On Thu, Sep 23, 2021 at 1:18 AM Linus Walleij <linus.walleij@linaro.org> wrote:

> For conistency and clarity, rename all symbols and strings from
> ux500 to db8500 in the driver.
>
> Cc: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Lee could you ACK this one?

Alternatively you can merge all three into the MFD
tree since Guenther ACKed them, but they mostly touch
the watchdog tree.

Yours,
Linus Walleij

Re: [PATCH 3/3] watchdog: db8500_wdt: Rename symbols

[Guenter Roeck]

On 10/13/21 4:19 PM, Linus Walleij wrote:
> On Thu, Sep 23, 2021 at 1:18 AM Linus Walleij <linus.walleij@linaro.org> wrote:
> 
>> For conistency and clarity, rename all symbols and strings from
>> ux500 to db8500 in the driver.
>>
>> Cc: Lee Jones <lee.jones@linaro.org>
>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> 
> Lee could you ACK this one?
> 
> Alternatively you can merge all three into the MFD
> tree since Guenther ACKed them, but they mostly touch
> the watchdog tree.
> 

Either way is fine with me.

Guenter

Re: [PATCH 3/3] watchdog: db8500_wdt: Rename symbols

[Lee Jones]

On Thu, 23 Sep 2021, Linus Walleij wrote:

> For conistency and clarity, rename all symbols and strings from
> ux500 to db8500 in the driver.
> 
> Cc: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Lee it would be perfect if you could ACK the oneliner in
> this patch along with the rest.
> ---
>  drivers/mfd/db8500-prcmu.c    |  2 +-

I didn't even see that it contained this change.

No problem.

Acked-by: Lee Jones <lee.jones@linaro.org>

>  drivers/watchdog/db8500_wdt.c | 76 +++++++++++++++++------------------
>  2 files changed, 39 insertions(+), 39 deletions(-)

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 1/3] watchdog: ux500_wdt: Drop platform data

[Guenter Roeck]

On Thu, Sep 23, 2021 at 01:09:45AM +0200, Linus Walleij wrote:
> 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 <lee.jones@linaro.org>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> 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.

Still waiting for an Ack from Lee to be able to apply this patch
(and with it the rest of the series) through the watchdog tree.

Guenter

> ---
>  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 <linux/mfd/abx500/ab8500.h>
>  #include <linux/regulator/db8500-prcmu.h>
>  #include <linux/regulator/machine.h>
> -#include <linux/platform_data/ux500_wdt.h>
>  #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 <linux/uaccess.h>
>  #include <linux/watchdog.h>
>  #include <linux/platform_device.h>
> -#include <linux/platform_data/ux500_wdt.h>
>  
>  #include <linux/mfd/dbx500-prcmu.h>
>  
> @@ -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 */

Re: [PATCH 1/3] watchdog: ux500_wdt: Drop platform data

[Lee Jones]

On Fri, 29 Oct 2021, Guenter Roeck wrote:

> On Thu, Sep 23, 2021 at 01:09:45AM +0200, Linus Walleij wrote:
> > 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 <lee.jones@linaro.org>
> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> > Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> > ---
> > 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.
> 
> Still waiting for an Ack from Lee to be able to apply this patch
> (and with it the rest of the series) through the watchdog tree.

Apologies for not being clear - this was for the series:

https://lore.kernel.org/all/YWfQt8V2YNMr4t8F@google.com/

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 1/3] watchdog: ux500_wdt: Drop platform data

[Guenter Roeck]

On Fri, Oct 29, 2021 at 11:50:37AM +0100, Lee Jones wrote:
> On Fri, 29 Oct 2021, Guenter Roeck wrote:
> 
> > On Thu, Sep 23, 2021 at 01:09:45AM +0200, Linus Walleij wrote:
> > > 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 <lee.jones@linaro.org>
> > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> > > Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> > > ---
> > > 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.
> > 
> > Still waiting for an Ack from Lee to be able to apply this patch
> > (and with it the rest of the series) through the watchdog tree.
> 
> Apologies for not being clear - this was for the series:
> 
> https://lore.kernel.org/all/YWfQt8V2YNMr4t8F@google.com/
> 

No problem, I should have asked earlier.
Thanks a lot for the clarification.

Guenter

> -- 
> Lee Jones [李琼斯]
> Senior Technical Lead - Developer Services
> Linaro.org │ Open source software for Arm SoCs
> Follow Linaro: Facebook | Twitter | Blog