* [PATCH v3 0/4] watchdog: meson: Add meson8b watchdog
@ 2015-11-08 12:18 ` Carlo Caione
0 siblings, 0 replies; 27+ messages in thread
From: Carlo Caione @ 2015-11-08 12:18 UTC (permalink / raw)
To: linux-arm-kernel
From: Carlo Caione <carlo@endlessm.com>
Patchset to add support for the watchdog found on the Amlogic meson8b SoCs.
DTS and documentation are also updated.
Changelog:
- V1 -> V2:
* Do not calculate mask at runtime
* Fix few style problems
* Remove useless typecase
- V2 -> V3:
* Changed description for [PATCH 1/4]
* Default timeout is not set as min(default, max)
Carlo Caione (4):
watchdog: meson: Enable meson SoC specific data
watchdog: meson: Add meson8b SoC specific data
Documentation: watchdog: Add new bindings for meson8b
ARM: dts: meson8b: Add watchdog node
.../devicetree/bindings/watchdog/meson-wdt.txt | 13 +++++
.../devicetree/bindings/watchdog/meson6-wdt.txt | 13 -----
arch/arm/boot/dts/meson8b.dtsi | 6 ++
drivers/watchdog/meson_wdt.c | 65 ++++++++++++++++------
4 files changed, 67 insertions(+), 30 deletions(-)
create mode 100644 Documentation/devicetree/bindings/watchdog/meson-wdt.txt
delete mode 100644 Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
--
1.9.1
^ permalink raw reply [flat|nested] 27+ messages in thread* [PATCH v3 1/4] watchdog: meson: Enable meson SoC specific data
2015-11-08 12:18 ` Carlo Caione
@ 2015-11-08 12:18 ` Carlo Caione
-1 siblings, 0 replies; 27+ messages in thread
From: Carlo Caione @ 2015-11-08 12:18 UTC (permalink / raw)
To: linux, wim, linux-watchdog, linux-arm-kernel, robh+dt, drake,
jerry.cao, victor.wan, romain.perier
Cc: Carlo Caione
From: Carlo Caione <carlo@endlessm.com>
With this patch we refactor the driver code to enable watchdog support
for all platforms based on Amlogic meson SoCs.
The new default timeout is also now chosen considering the maximum
timeout allowed by the SoC.
Signed-off-by: Carlo Caione <carlo@endlessm.com>
---
drivers/watchdog/meson_wdt.c | 58 +++++++++++++++++++++++++++++++-------------
1 file changed, 41 insertions(+), 17 deletions(-)
diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
index 1f4155e..89734f0 100644
--- a/drivers/watchdog/meson_wdt.c
+++ b/drivers/watchdog/meson_wdt.c
@@ -19,6 +19,7 @@
#include <linux/moduleparam.h>
#include <linux/notifier.h>
#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/reboot.h>
#include <linux/types.h>
@@ -27,35 +28,47 @@
#define DRV_NAME "meson_wdt"
#define MESON_WDT_TC 0x00
-#define MESON_WDT_TC_EN BIT(22)
-#define MESON_WDT_TC_TM_MASK 0x3fffff
#define MESON_WDT_DC_RESET (3 << 24)
#define MESON_WDT_RESET 0x04
#define MESON_WDT_TIMEOUT 30
#define MESON_WDT_MIN_TIMEOUT 1
-#define MESON_WDT_MAX_TIMEOUT (MESON_WDT_TC_TM_MASK / 100000)
-#define MESON_SEC_TO_TC(s) ((s) * 100000)
+#define MESON_SEC_TO_TC(s, c) ((s) * (c))
static bool nowayout = WATCHDOG_NOWAYOUT;
static unsigned int timeout = MESON_WDT_TIMEOUT;
+struct meson_wdt_data {
+ unsigned int enable;
+ unsigned int terminal_count_mask;
+ unsigned int count_unit;
+};
+
+static struct meson_wdt_data meson6_wdt_data = {
+ .enable = BIT(22),
+ .terminal_count_mask = 0x3fffff,
+ .count_unit = 100000, /* 10 us */
+};
+
struct meson_wdt_dev {
struct watchdog_device wdt_dev;
void __iomem *wdt_base;
struct notifier_block restart_handler;
+ const struct meson_wdt_data *data;
};
static int meson_restart_handle(struct notifier_block *this, unsigned long mode,
void *cmd)
{
- u32 tc_reboot = MESON_WDT_DC_RESET | MESON_WDT_TC_EN;
+ u32 tc_reboot = MESON_WDT_DC_RESET;
struct meson_wdt_dev *meson_wdt = container_of(this,
struct meson_wdt_dev,
restart_handler);
+ tc_reboot |= meson_wdt->data->enable;
+
while (1) {
writel(tc_reboot, meson_wdt->wdt_base + MESON_WDT_TC);
mdelay(5);
@@ -80,8 +93,8 @@ static void meson_wdt_change_timeout(struct watchdog_device *wdt_dev,
u32 reg;
reg = readl(meson_wdt->wdt_base + MESON_WDT_TC);
- reg &= ~MESON_WDT_TC_TM_MASK;
- reg |= MESON_SEC_TO_TC(timeout);
+ reg &= ~meson_wdt->data->terminal_count_mask;
+ reg |= MESON_SEC_TO_TC(timeout, meson_wdt->data->count_unit);
writel(reg, meson_wdt->wdt_base + MESON_WDT_TC);
}
@@ -102,7 +115,7 @@ static int meson_wdt_stop(struct watchdog_device *wdt_dev)
u32 reg;
reg = readl(meson_wdt->wdt_base + MESON_WDT_TC);
- reg &= ~MESON_WDT_TC_EN;
+ reg &= ~meson_wdt->data->enable;
writel(reg, meson_wdt->wdt_base + MESON_WDT_TC);
return 0;
@@ -117,7 +130,7 @@ static int meson_wdt_start(struct watchdog_device *wdt_dev)
meson_wdt_ping(wdt_dev);
reg = readl(meson_wdt->wdt_base + MESON_WDT_TC);
- reg |= MESON_WDT_TC_EN;
+ reg |= meson_wdt->data->enable;
writel(reg, meson_wdt->wdt_base + MESON_WDT_TC);
return 0;
@@ -138,10 +151,17 @@ static const struct watchdog_ops meson_wdt_ops = {
.set_timeout = meson_wdt_set_timeout,
};
+static const struct of_device_id meson_wdt_dt_ids[] = {
+ { .compatible = "amlogic,meson6-wdt", .data = &meson6_wdt_data },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);
+
static int meson_wdt_probe(struct platform_device *pdev)
{
struct resource *res;
struct meson_wdt_dev *meson_wdt;
+ const struct of_device_id *of_id;
int err;
meson_wdt = devm_kzalloc(&pdev->dev, sizeof(*meson_wdt), GFP_KERNEL);
@@ -153,12 +173,22 @@ static int meson_wdt_probe(struct platform_device *pdev)
if (IS_ERR(meson_wdt->wdt_base))
return PTR_ERR(meson_wdt->wdt_base);
+ of_id = of_match_device(meson_wdt_dt_ids, &pdev->dev);
+ if (!of_id) {
+ dev_err(&pdev->dev, "Unable to initialize WDT data\n");
+ return -ENODEV;
+ }
+ meson_wdt->data = of_id->data;
+
meson_wdt->wdt_dev.parent = &pdev->dev;
meson_wdt->wdt_dev.info = &meson_wdt_info;
meson_wdt->wdt_dev.ops = &meson_wdt_ops;
- meson_wdt->wdt_dev.timeout = MESON_WDT_TIMEOUT;
- meson_wdt->wdt_dev.max_timeout = MESON_WDT_MAX_TIMEOUT;
+ meson_wdt->wdt_dev.max_timeout =
+ meson_wdt->data->terminal_count_mask / meson_wdt->data->count_unit;
meson_wdt->wdt_dev.min_timeout = MESON_WDT_MIN_TIMEOUT;
+ meson_wdt->wdt_dev.timeout = min_t(unsigned int,
+ MESON_WDT_TIMEOUT,
+ meson_wdt->wdt_dev.max_timeout);
watchdog_set_drvdata(&meson_wdt->wdt_dev, meson_wdt);
@@ -204,12 +234,6 @@ static void meson_wdt_shutdown(struct platform_device *pdev)
meson_wdt_stop(&meson_wdt->wdt_dev);
}
-static const struct of_device_id meson_wdt_dt_ids[] = {
- { .compatible = "amlogic,meson6-wdt" },
- { /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);
-
static struct platform_driver meson_wdt_driver = {
.probe = meson_wdt_probe,
.remove = meson_wdt_remove,
--
1.9.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v3 1/4] watchdog: meson: Enable meson SoC specific data
@ 2015-11-08 12:18 ` Carlo Caione
0 siblings, 0 replies; 27+ messages in thread
From: Carlo Caione @ 2015-11-08 12:18 UTC (permalink / raw)
To: linux-arm-kernel
From: Carlo Caione <carlo@endlessm.com>
With this patch we refactor the driver code to enable watchdog support
for all platforms based on Amlogic meson SoCs.
The new default timeout is also now chosen considering the maximum
timeout allowed by the SoC.
Signed-off-by: Carlo Caione <carlo@endlessm.com>
---
drivers/watchdog/meson_wdt.c | 58 +++++++++++++++++++++++++++++++-------------
1 file changed, 41 insertions(+), 17 deletions(-)
diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
index 1f4155e..89734f0 100644
--- a/drivers/watchdog/meson_wdt.c
+++ b/drivers/watchdog/meson_wdt.c
@@ -19,6 +19,7 @@
#include <linux/moduleparam.h>
#include <linux/notifier.h>
#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/reboot.h>
#include <linux/types.h>
@@ -27,35 +28,47 @@
#define DRV_NAME "meson_wdt"
#define MESON_WDT_TC 0x00
-#define MESON_WDT_TC_EN BIT(22)
-#define MESON_WDT_TC_TM_MASK 0x3fffff
#define MESON_WDT_DC_RESET (3 << 24)
#define MESON_WDT_RESET 0x04
#define MESON_WDT_TIMEOUT 30
#define MESON_WDT_MIN_TIMEOUT 1
-#define MESON_WDT_MAX_TIMEOUT (MESON_WDT_TC_TM_MASK / 100000)
-#define MESON_SEC_TO_TC(s) ((s) * 100000)
+#define MESON_SEC_TO_TC(s, c) ((s) * (c))
static bool nowayout = WATCHDOG_NOWAYOUT;
static unsigned int timeout = MESON_WDT_TIMEOUT;
+struct meson_wdt_data {
+ unsigned int enable;
+ unsigned int terminal_count_mask;
+ unsigned int count_unit;
+};
+
+static struct meson_wdt_data meson6_wdt_data = {
+ .enable = BIT(22),
+ .terminal_count_mask = 0x3fffff,
+ .count_unit = 100000, /* 10 us */
+};
+
struct meson_wdt_dev {
struct watchdog_device wdt_dev;
void __iomem *wdt_base;
struct notifier_block restart_handler;
+ const struct meson_wdt_data *data;
};
static int meson_restart_handle(struct notifier_block *this, unsigned long mode,
void *cmd)
{
- u32 tc_reboot = MESON_WDT_DC_RESET | MESON_WDT_TC_EN;
+ u32 tc_reboot = MESON_WDT_DC_RESET;
struct meson_wdt_dev *meson_wdt = container_of(this,
struct meson_wdt_dev,
restart_handler);
+ tc_reboot |= meson_wdt->data->enable;
+
while (1) {
writel(tc_reboot, meson_wdt->wdt_base + MESON_WDT_TC);
mdelay(5);
@@ -80,8 +93,8 @@ static void meson_wdt_change_timeout(struct watchdog_device *wdt_dev,
u32 reg;
reg = readl(meson_wdt->wdt_base + MESON_WDT_TC);
- reg &= ~MESON_WDT_TC_TM_MASK;
- reg |= MESON_SEC_TO_TC(timeout);
+ reg &= ~meson_wdt->data->terminal_count_mask;
+ reg |= MESON_SEC_TO_TC(timeout, meson_wdt->data->count_unit);
writel(reg, meson_wdt->wdt_base + MESON_WDT_TC);
}
@@ -102,7 +115,7 @@ static int meson_wdt_stop(struct watchdog_device *wdt_dev)
u32 reg;
reg = readl(meson_wdt->wdt_base + MESON_WDT_TC);
- reg &= ~MESON_WDT_TC_EN;
+ reg &= ~meson_wdt->data->enable;
writel(reg, meson_wdt->wdt_base + MESON_WDT_TC);
return 0;
@@ -117,7 +130,7 @@ static int meson_wdt_start(struct watchdog_device *wdt_dev)
meson_wdt_ping(wdt_dev);
reg = readl(meson_wdt->wdt_base + MESON_WDT_TC);
- reg |= MESON_WDT_TC_EN;
+ reg |= meson_wdt->data->enable;
writel(reg, meson_wdt->wdt_base + MESON_WDT_TC);
return 0;
@@ -138,10 +151,17 @@ static const struct watchdog_ops meson_wdt_ops = {
.set_timeout = meson_wdt_set_timeout,
};
+static const struct of_device_id meson_wdt_dt_ids[] = {
+ { .compatible = "amlogic,meson6-wdt", .data = &meson6_wdt_data },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);
+
static int meson_wdt_probe(struct platform_device *pdev)
{
struct resource *res;
struct meson_wdt_dev *meson_wdt;
+ const struct of_device_id *of_id;
int err;
meson_wdt = devm_kzalloc(&pdev->dev, sizeof(*meson_wdt), GFP_KERNEL);
@@ -153,12 +173,22 @@ static int meson_wdt_probe(struct platform_device *pdev)
if (IS_ERR(meson_wdt->wdt_base))
return PTR_ERR(meson_wdt->wdt_base);
+ of_id = of_match_device(meson_wdt_dt_ids, &pdev->dev);
+ if (!of_id) {
+ dev_err(&pdev->dev, "Unable to initialize WDT data\n");
+ return -ENODEV;
+ }
+ meson_wdt->data = of_id->data;
+
meson_wdt->wdt_dev.parent = &pdev->dev;
meson_wdt->wdt_dev.info = &meson_wdt_info;
meson_wdt->wdt_dev.ops = &meson_wdt_ops;
- meson_wdt->wdt_dev.timeout = MESON_WDT_TIMEOUT;
- meson_wdt->wdt_dev.max_timeout = MESON_WDT_MAX_TIMEOUT;
+ meson_wdt->wdt_dev.max_timeout =
+ meson_wdt->data->terminal_count_mask / meson_wdt->data->count_unit;
meson_wdt->wdt_dev.min_timeout = MESON_WDT_MIN_TIMEOUT;
+ meson_wdt->wdt_dev.timeout = min_t(unsigned int,
+ MESON_WDT_TIMEOUT,
+ meson_wdt->wdt_dev.max_timeout);
watchdog_set_drvdata(&meson_wdt->wdt_dev, meson_wdt);
@@ -204,12 +234,6 @@ static void meson_wdt_shutdown(struct platform_device *pdev)
meson_wdt_stop(&meson_wdt->wdt_dev);
}
-static const struct of_device_id meson_wdt_dt_ids[] = {
- { .compatible = "amlogic,meson6-wdt" },
- { /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);
-
static struct platform_driver meson_wdt_driver = {
.probe = meson_wdt_probe,
.remove = meson_wdt_remove,
--
1.9.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [PATCH v3 1/4] watchdog: meson: Enable meson SoC specific data
2015-11-08 12:18 ` Carlo Caione
@ 2015-11-09 15:03 ` Guenter Roeck
-1 siblings, 0 replies; 27+ messages in thread
From: Guenter Roeck @ 2015-11-09 15:03 UTC (permalink / raw)
To: Carlo Caione, wim, linux-watchdog, linux-arm-kernel, robh+dt,
drake, jerry.cao, victor.wan, romain.perier
Cc: Carlo Caione
On 11/08/2015 04:18 AM, Carlo Caione wrote:
> From: Carlo Caione <carlo@endlessm.com>
>
> With this patch we refactor the driver code to enable watchdog support
> for all platforms based on Amlogic meson SoCs.
> The new default timeout is also now chosen considering the maximum
> timeout allowed by the SoC.
>
> Signed-off-by: Carlo Caione <carlo@endlessm.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/meson_wdt.c | 58 +++++++++++++++++++++++++++++++-------------
> 1 file changed, 41 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
> index 1f4155e..89734f0 100644
> --- a/drivers/watchdog/meson_wdt.c
> +++ b/drivers/watchdog/meson_wdt.c
> @@ -19,6 +19,7 @@
> #include <linux/moduleparam.h>
> #include <linux/notifier.h>
> #include <linux/of.h>
> +#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/reboot.h>
> #include <linux/types.h>
> @@ -27,35 +28,47 @@
> #define DRV_NAME "meson_wdt"
>
> #define MESON_WDT_TC 0x00
> -#define MESON_WDT_TC_EN BIT(22)
> -#define MESON_WDT_TC_TM_MASK 0x3fffff
> #define MESON_WDT_DC_RESET (3 << 24)
>
> #define MESON_WDT_RESET 0x04
>
> #define MESON_WDT_TIMEOUT 30
> #define MESON_WDT_MIN_TIMEOUT 1
> -#define MESON_WDT_MAX_TIMEOUT (MESON_WDT_TC_TM_MASK / 100000)
>
> -#define MESON_SEC_TO_TC(s) ((s) * 100000)
> +#define MESON_SEC_TO_TC(s, c) ((s) * (c))
>
> static bool nowayout = WATCHDOG_NOWAYOUT;
> static unsigned int timeout = MESON_WDT_TIMEOUT;
>
> +struct meson_wdt_data {
> + unsigned int enable;
> + unsigned int terminal_count_mask;
> + unsigned int count_unit;
> +};
> +
> +static struct meson_wdt_data meson6_wdt_data = {
> + .enable = BIT(22),
> + .terminal_count_mask = 0x3fffff,
> + .count_unit = 100000, /* 10 us */
> +};
> +
> struct meson_wdt_dev {
> struct watchdog_device wdt_dev;
> void __iomem *wdt_base;
> struct notifier_block restart_handler;
> + const struct meson_wdt_data *data;
> };
>
> static int meson_restart_handle(struct notifier_block *this, unsigned long mode,
> void *cmd)
> {
> - u32 tc_reboot = MESON_WDT_DC_RESET | MESON_WDT_TC_EN;
> + u32 tc_reboot = MESON_WDT_DC_RESET;
> struct meson_wdt_dev *meson_wdt = container_of(this,
> struct meson_wdt_dev,
> restart_handler);
>
> + tc_reboot |= meson_wdt->data->enable;
> +
> while (1) {
> writel(tc_reboot, meson_wdt->wdt_base + MESON_WDT_TC);
> mdelay(5);
> @@ -80,8 +93,8 @@ static void meson_wdt_change_timeout(struct watchdog_device *wdt_dev,
> u32 reg;
>
> reg = readl(meson_wdt->wdt_base + MESON_WDT_TC);
> - reg &= ~MESON_WDT_TC_TM_MASK;
> - reg |= MESON_SEC_TO_TC(timeout);
> + reg &= ~meson_wdt->data->terminal_count_mask;
> + reg |= MESON_SEC_TO_TC(timeout, meson_wdt->data->count_unit);
> writel(reg, meson_wdt->wdt_base + MESON_WDT_TC);
> }
>
> @@ -102,7 +115,7 @@ static int meson_wdt_stop(struct watchdog_device *wdt_dev)
> u32 reg;
>
> reg = readl(meson_wdt->wdt_base + MESON_WDT_TC);
> - reg &= ~MESON_WDT_TC_EN;
> + reg &= ~meson_wdt->data->enable;
> writel(reg, meson_wdt->wdt_base + MESON_WDT_TC);
>
> return 0;
> @@ -117,7 +130,7 @@ static int meson_wdt_start(struct watchdog_device *wdt_dev)
> meson_wdt_ping(wdt_dev);
>
> reg = readl(meson_wdt->wdt_base + MESON_WDT_TC);
> - reg |= MESON_WDT_TC_EN;
> + reg |= meson_wdt->data->enable;
> writel(reg, meson_wdt->wdt_base + MESON_WDT_TC);
>
> return 0;
> @@ -138,10 +151,17 @@ static const struct watchdog_ops meson_wdt_ops = {
> .set_timeout = meson_wdt_set_timeout,
> };
>
> +static const struct of_device_id meson_wdt_dt_ids[] = {
> + { .compatible = "amlogic,meson6-wdt", .data = &meson6_wdt_data },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);
> +
> static int meson_wdt_probe(struct platform_device *pdev)
> {
> struct resource *res;
> struct meson_wdt_dev *meson_wdt;
> + const struct of_device_id *of_id;
> int err;
>
> meson_wdt = devm_kzalloc(&pdev->dev, sizeof(*meson_wdt), GFP_KERNEL);
> @@ -153,12 +173,22 @@ static int meson_wdt_probe(struct platform_device *pdev)
> if (IS_ERR(meson_wdt->wdt_base))
> return PTR_ERR(meson_wdt->wdt_base);
>
> + of_id = of_match_device(meson_wdt_dt_ids, &pdev->dev);
> + if (!of_id) {
> + dev_err(&pdev->dev, "Unable to initialize WDT data\n");
> + return -ENODEV;
> + }
> + meson_wdt->data = of_id->data;
> +
> meson_wdt->wdt_dev.parent = &pdev->dev;
> meson_wdt->wdt_dev.info = &meson_wdt_info;
> meson_wdt->wdt_dev.ops = &meson_wdt_ops;
> - meson_wdt->wdt_dev.timeout = MESON_WDT_TIMEOUT;
> - meson_wdt->wdt_dev.max_timeout = MESON_WDT_MAX_TIMEOUT;
> + meson_wdt->wdt_dev.max_timeout =
> + meson_wdt->data->terminal_count_mask / meson_wdt->data->count_unit;
> meson_wdt->wdt_dev.min_timeout = MESON_WDT_MIN_TIMEOUT;
> + meson_wdt->wdt_dev.timeout = min_t(unsigned int,
> + MESON_WDT_TIMEOUT,
> + meson_wdt->wdt_dev.max_timeout);
>
> watchdog_set_drvdata(&meson_wdt->wdt_dev, meson_wdt);
>
> @@ -204,12 +234,6 @@ static void meson_wdt_shutdown(struct platform_device *pdev)
> meson_wdt_stop(&meson_wdt->wdt_dev);
> }
>
> -static const struct of_device_id meson_wdt_dt_ids[] = {
> - { .compatible = "amlogic,meson6-wdt" },
> - { /* sentinel */ }
> -};
> -MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);
> -
> static struct platform_driver meson_wdt_driver = {
> .probe = meson_wdt_probe,
> .remove = meson_wdt_remove,
>
^ permalink raw reply [flat|nested] 27+ messages in thread* [PATCH v3 1/4] watchdog: meson: Enable meson SoC specific data
@ 2015-11-09 15:03 ` Guenter Roeck
0 siblings, 0 replies; 27+ messages in thread
From: Guenter Roeck @ 2015-11-09 15:03 UTC (permalink / raw)
To: linux-arm-kernel
On 11/08/2015 04:18 AM, Carlo Caione wrote:
> From: Carlo Caione <carlo@endlessm.com>
>
> With this patch we refactor the driver code to enable watchdog support
> for all platforms based on Amlogic meson SoCs.
> The new default timeout is also now chosen considering the maximum
> timeout allowed by the SoC.
>
> Signed-off-by: Carlo Caione <carlo@endlessm.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/meson_wdt.c | 58 +++++++++++++++++++++++++++++++-------------
> 1 file changed, 41 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
> index 1f4155e..89734f0 100644
> --- a/drivers/watchdog/meson_wdt.c
> +++ b/drivers/watchdog/meson_wdt.c
> @@ -19,6 +19,7 @@
> #include <linux/moduleparam.h>
> #include <linux/notifier.h>
> #include <linux/of.h>
> +#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/reboot.h>
> #include <linux/types.h>
> @@ -27,35 +28,47 @@
> #define DRV_NAME "meson_wdt"
>
> #define MESON_WDT_TC 0x00
> -#define MESON_WDT_TC_EN BIT(22)
> -#define MESON_WDT_TC_TM_MASK 0x3fffff
> #define MESON_WDT_DC_RESET (3 << 24)
>
> #define MESON_WDT_RESET 0x04
>
> #define MESON_WDT_TIMEOUT 30
> #define MESON_WDT_MIN_TIMEOUT 1
> -#define MESON_WDT_MAX_TIMEOUT (MESON_WDT_TC_TM_MASK / 100000)
>
> -#define MESON_SEC_TO_TC(s) ((s) * 100000)
> +#define MESON_SEC_TO_TC(s, c) ((s) * (c))
>
> static bool nowayout = WATCHDOG_NOWAYOUT;
> static unsigned int timeout = MESON_WDT_TIMEOUT;
>
> +struct meson_wdt_data {
> + unsigned int enable;
> + unsigned int terminal_count_mask;
> + unsigned int count_unit;
> +};
> +
> +static struct meson_wdt_data meson6_wdt_data = {
> + .enable = BIT(22),
> + .terminal_count_mask = 0x3fffff,
> + .count_unit = 100000, /* 10 us */
> +};
> +
> struct meson_wdt_dev {
> struct watchdog_device wdt_dev;
> void __iomem *wdt_base;
> struct notifier_block restart_handler;
> + const struct meson_wdt_data *data;
> };
>
> static int meson_restart_handle(struct notifier_block *this, unsigned long mode,
> void *cmd)
> {
> - u32 tc_reboot = MESON_WDT_DC_RESET | MESON_WDT_TC_EN;
> + u32 tc_reboot = MESON_WDT_DC_RESET;
> struct meson_wdt_dev *meson_wdt = container_of(this,
> struct meson_wdt_dev,
> restart_handler);
>
> + tc_reboot |= meson_wdt->data->enable;
> +
> while (1) {
> writel(tc_reboot, meson_wdt->wdt_base + MESON_WDT_TC);
> mdelay(5);
> @@ -80,8 +93,8 @@ static void meson_wdt_change_timeout(struct watchdog_device *wdt_dev,
> u32 reg;
>
> reg = readl(meson_wdt->wdt_base + MESON_WDT_TC);
> - reg &= ~MESON_WDT_TC_TM_MASK;
> - reg |= MESON_SEC_TO_TC(timeout);
> + reg &= ~meson_wdt->data->terminal_count_mask;
> + reg |= MESON_SEC_TO_TC(timeout, meson_wdt->data->count_unit);
> writel(reg, meson_wdt->wdt_base + MESON_WDT_TC);
> }
>
> @@ -102,7 +115,7 @@ static int meson_wdt_stop(struct watchdog_device *wdt_dev)
> u32 reg;
>
> reg = readl(meson_wdt->wdt_base + MESON_WDT_TC);
> - reg &= ~MESON_WDT_TC_EN;
> + reg &= ~meson_wdt->data->enable;
> writel(reg, meson_wdt->wdt_base + MESON_WDT_TC);
>
> return 0;
> @@ -117,7 +130,7 @@ static int meson_wdt_start(struct watchdog_device *wdt_dev)
> meson_wdt_ping(wdt_dev);
>
> reg = readl(meson_wdt->wdt_base + MESON_WDT_TC);
> - reg |= MESON_WDT_TC_EN;
> + reg |= meson_wdt->data->enable;
> writel(reg, meson_wdt->wdt_base + MESON_WDT_TC);
>
> return 0;
> @@ -138,10 +151,17 @@ static const struct watchdog_ops meson_wdt_ops = {
> .set_timeout = meson_wdt_set_timeout,
> };
>
> +static const struct of_device_id meson_wdt_dt_ids[] = {
> + { .compatible = "amlogic,meson6-wdt", .data = &meson6_wdt_data },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);
> +
> static int meson_wdt_probe(struct platform_device *pdev)
> {
> struct resource *res;
> struct meson_wdt_dev *meson_wdt;
> + const struct of_device_id *of_id;
> int err;
>
> meson_wdt = devm_kzalloc(&pdev->dev, sizeof(*meson_wdt), GFP_KERNEL);
> @@ -153,12 +173,22 @@ static int meson_wdt_probe(struct platform_device *pdev)
> if (IS_ERR(meson_wdt->wdt_base))
> return PTR_ERR(meson_wdt->wdt_base);
>
> + of_id = of_match_device(meson_wdt_dt_ids, &pdev->dev);
> + if (!of_id) {
> + dev_err(&pdev->dev, "Unable to initialize WDT data\n");
> + return -ENODEV;
> + }
> + meson_wdt->data = of_id->data;
> +
> meson_wdt->wdt_dev.parent = &pdev->dev;
> meson_wdt->wdt_dev.info = &meson_wdt_info;
> meson_wdt->wdt_dev.ops = &meson_wdt_ops;
> - meson_wdt->wdt_dev.timeout = MESON_WDT_TIMEOUT;
> - meson_wdt->wdt_dev.max_timeout = MESON_WDT_MAX_TIMEOUT;
> + meson_wdt->wdt_dev.max_timeout =
> + meson_wdt->data->terminal_count_mask / meson_wdt->data->count_unit;
> meson_wdt->wdt_dev.min_timeout = MESON_WDT_MIN_TIMEOUT;
> + meson_wdt->wdt_dev.timeout = min_t(unsigned int,
> + MESON_WDT_TIMEOUT,
> + meson_wdt->wdt_dev.max_timeout);
>
> watchdog_set_drvdata(&meson_wdt->wdt_dev, meson_wdt);
>
> @@ -204,12 +234,6 @@ static void meson_wdt_shutdown(struct platform_device *pdev)
> meson_wdt_stop(&meson_wdt->wdt_dev);
> }
>
> -static const struct of_device_id meson_wdt_dt_ids[] = {
> - { .compatible = "amlogic,meson6-wdt" },
> - { /* sentinel */ }
> -};
> -MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);
> -
> static struct platform_driver meson_wdt_driver = {
> .probe = meson_wdt_probe,
> .remove = meson_wdt_remove,
>
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PATCH v3 1/4] watchdog: meson: Enable meson SoC specific data
2015-11-09 15:03 ` Guenter Roeck
@ 2015-11-11 8:54 ` Carlo Caione
-1 siblings, 0 replies; 27+ messages in thread
From: Carlo Caione @ 2015-11-11 8:54 UTC (permalink / raw)
To: Guenter Roeck
Cc: wim, linux-watchdog, linux-arm-kernel, robh+dt, Daniel Drake,
Jerry Cao, Victor Wan, Romain Perier, Carlo Caione
On Mon, Nov 9, 2015 at 4:03 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> On 11/08/2015 04:18 AM, Carlo Caione wrote:
>>
>> From: Carlo Caione <carlo@endlessm.com>
>>
>> With this patch we refactor the driver code to enable watchdog support
>> for all platforms based on Amlogic meson SoCs.
>> The new default timeout is also now chosen considering the maximum
>> timeout allowed by the SoC.
>>
>> Signed-off-by: Carlo Caione <carlo@endlessm.com>
>
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Wim,
any (N)ACK on this?
--
Carlo Caione
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v3 1/4] watchdog: meson: Enable meson SoC specific data
@ 2015-11-11 8:54 ` Carlo Caione
0 siblings, 0 replies; 27+ messages in thread
From: Carlo Caione @ 2015-11-11 8:54 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 9, 2015 at 4:03 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> On 11/08/2015 04:18 AM, Carlo Caione wrote:
>>
>> From: Carlo Caione <carlo@endlessm.com>
>>
>> With this patch we refactor the driver code to enable watchdog support
>> for all platforms based on Amlogic meson SoCs.
>> The new default timeout is also now chosen considering the maximum
>> timeout allowed by the SoC.
>>
>> Signed-off-by: Carlo Caione <carlo@endlessm.com>
>
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Wim,
any (N)ACK on this?
--
Carlo Caione
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 1/4] watchdog: meson: Enable meson SoC specific data
2015-11-11 8:54 ` Carlo Caione
@ 2015-11-24 18:19 ` Guenter Roeck
-1 siblings, 0 replies; 27+ messages in thread
From: Guenter Roeck @ 2015-11-24 18:19 UTC (permalink / raw)
To: Carlo Caione
Cc: wim, linux-watchdog, linux-arm-kernel, robh+dt, Daniel Drake,
Jerry Cao, Victor Wan, Romain Perier, Carlo Caione
On Wed, Nov 11, 2015 at 09:54:04AM +0100, Carlo Caione wrote:
> On Mon, Nov 9, 2015 at 4:03 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> > On 11/08/2015 04:18 AM, Carlo Caione wrote:
> >>
> >> From: Carlo Caione <carlo@endlessm.com>
> >>
> >> With this patch we refactor the driver code to enable watchdog support
> >> for all platforms based on Amlogic meson SoCs.
> >> The new default timeout is also now chosen considering the maximum
> >> timeout allowed by the SoC.
> >>
> >> Signed-off-by: Carlo Caione <carlo@endlessm.com>
> >
> >
> > Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>
> Wim,
> any (N)ACK on this?
>
Carlo,
Unless I missed it, we still don't have an Ack from a devicetree
maintainer for the devicetree changes.
Guenter
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v3 1/4] watchdog: meson: Enable meson SoC specific data
@ 2015-11-24 18:19 ` Guenter Roeck
0 siblings, 0 replies; 27+ messages in thread
From: Guenter Roeck @ 2015-11-24 18:19 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 11, 2015 at 09:54:04AM +0100, Carlo Caione wrote:
> On Mon, Nov 9, 2015 at 4:03 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> > On 11/08/2015 04:18 AM, Carlo Caione wrote:
> >>
> >> From: Carlo Caione <carlo@endlessm.com>
> >>
> >> With this patch we refactor the driver code to enable watchdog support
> >> for all platforms based on Amlogic meson SoCs.
> >> The new default timeout is also now chosen considering the maximum
> >> timeout allowed by the SoC.
> >>
> >> Signed-off-by: Carlo Caione <carlo@endlessm.com>
> >
> >
> > Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>
> Wim,
> any (N)ACK on this?
>
Carlo,
Unless I missed it, we still don't have an Ack from a devicetree
maintainer for the devicetree changes.
Guenter
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 1/4] watchdog: meson: Enable meson SoC specific data
2015-11-24 18:19 ` Guenter Roeck
@ 2015-11-25 9:25 ` Carlo Caione
-1 siblings, 0 replies; 27+ messages in thread
From: Carlo Caione @ 2015-11-25 9:25 UTC (permalink / raw)
To: Guenter Roeck
Cc: Carlo Caione, wim, linux-watchdog, linux-arm-kernel, robh+dt,
Daniel Drake, Jerry Cao, Victor Wan, Romain Perier, Carlo Caione
On Tue, Nov 24, 2015 at 7:19 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> On Wed, Nov 11, 2015 at 09:54:04AM +0100, Carlo Caione wrote:
>> On Mon, Nov 9, 2015 at 4:03 PM, Guenter Roeck <linux@roeck-us.net> wrote:
>> > On 11/08/2015 04:18 AM, Carlo Caione wrote:
>> >>
>> >> From: Carlo Caione <carlo@endlessm.com>
>> >>
>> >> With this patch we refactor the driver code to enable watchdog support
>> >> for all platforms based on Amlogic meson SoCs.
>> >> The new default timeout is also now chosen considering the maximum
>> >> timeout allowed by the SoC.
>> >>
>> >> Signed-off-by: Carlo Caione <carlo@endlessm.com>
>> >
>> >
>> > Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>>
>> Wim,
>> any (N)ACK on this?
>>
> Carlo,
>
> Unless I missed it, we still don't have an Ack from a devicetree
> maintainer for the devicetree changes.
I'm the maintainer for the Meson platform and since the changes are
trivial I'm going to merge them after the driver is taken in the
watchdog tree.
Cheers,
--
Carlo Caione
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v3 1/4] watchdog: meson: Enable meson SoC specific data
@ 2015-11-25 9:25 ` Carlo Caione
0 siblings, 0 replies; 27+ messages in thread
From: Carlo Caione @ 2015-11-25 9:25 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 24, 2015 at 7:19 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> On Wed, Nov 11, 2015 at 09:54:04AM +0100, Carlo Caione wrote:
>> On Mon, Nov 9, 2015 at 4:03 PM, Guenter Roeck <linux@roeck-us.net> wrote:
>> > On 11/08/2015 04:18 AM, Carlo Caione wrote:
>> >>
>> >> From: Carlo Caione <carlo@endlessm.com>
>> >>
>> >> With this patch we refactor the driver code to enable watchdog support
>> >> for all platforms based on Amlogic meson SoCs.
>> >> The new default timeout is also now chosen considering the maximum
>> >> timeout allowed by the SoC.
>> >>
>> >> Signed-off-by: Carlo Caione <carlo@endlessm.com>
>> >
>> >
>> > Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>>
>> Wim,
>> any (N)ACK on this?
>>
> Carlo,
>
> Unless I missed it, we still don't have an Ack from a devicetree
> maintainer for the devicetree changes.
I'm the maintainer for the Meson platform and since the changes are
trivial I'm going to merge them after the driver is taken in the
watchdog tree.
Cheers,
--
Carlo Caione
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 1/4] watchdog: meson: Enable meson SoC specific data
2015-11-25 9:25 ` Carlo Caione
@ 2015-11-25 14:20 ` Guenter Roeck
-1 siblings, 0 replies; 27+ messages in thread
From: Guenter Roeck @ 2015-11-25 14:20 UTC (permalink / raw)
To: Carlo Caione
Cc: wim, linux-watchdog, linux-arm-kernel, robh+dt, Daniel Drake,
Jerry Cao, Victor Wan, Romain Perier, Carlo Caione
On 11/25/2015 01:25 AM, Carlo Caione wrote:
> On Tue, Nov 24, 2015 at 7:19 PM, Guenter Roeck <linux@roeck-us.net> wrote:
>> On Wed, Nov 11, 2015 at 09:54:04AM +0100, Carlo Caione wrote:
>>> On Mon, Nov 9, 2015 at 4:03 PM, Guenter Roeck <linux@roeck-us.net> wrote:
>>>> On 11/08/2015 04:18 AM, Carlo Caione wrote:
>>>>>
>>>>> From: Carlo Caione <carlo@endlessm.com>
>>>>>
>>>>> With this patch we refactor the driver code to enable watchdog support
>>>>> for all platforms based on Amlogic meson SoCs.
>>>>> The new default timeout is also now chosen considering the maximum
>>>>> timeout allowed by the SoC.
>>>>>
>>>>> Signed-off-by: Carlo Caione <carlo@endlessm.com>
>>>>
>>>>
>>>> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>>>
>>> Wim,
>>> any (N)ACK on this?
>>>
>> Carlo,
>>
>> Unless I missed it, we still don't have an Ack from a devicetree
>> maintainer for the devicetree changes.
>
> I'm the maintainer for the Meson platform and since the changes are
> trivial I'm going to merge them after the driver is taken in the
> watchdog tree.
>
Ok. I'll add patches 1 and 2 from the series to my -next tree and send
them to Wim with my next pull request.
Guenter
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v3 1/4] watchdog: meson: Enable meson SoC specific data
@ 2015-11-25 14:20 ` Guenter Roeck
0 siblings, 0 replies; 27+ messages in thread
From: Guenter Roeck @ 2015-11-25 14:20 UTC (permalink / raw)
To: linux-arm-kernel
On 11/25/2015 01:25 AM, Carlo Caione wrote:
> On Tue, Nov 24, 2015 at 7:19 PM, Guenter Roeck <linux@roeck-us.net> wrote:
>> On Wed, Nov 11, 2015 at 09:54:04AM +0100, Carlo Caione wrote:
>>> On Mon, Nov 9, 2015 at 4:03 PM, Guenter Roeck <linux@roeck-us.net> wrote:
>>>> On 11/08/2015 04:18 AM, Carlo Caione wrote:
>>>>>
>>>>> From: Carlo Caione <carlo@endlessm.com>
>>>>>
>>>>> With this patch we refactor the driver code to enable watchdog support
>>>>> for all platforms based on Amlogic meson SoCs.
>>>>> The new default timeout is also now chosen considering the maximum
>>>>> timeout allowed by the SoC.
>>>>>
>>>>> Signed-off-by: Carlo Caione <carlo@endlessm.com>
>>>>
>>>>
>>>> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>>>
>>> Wim,
>>> any (N)ACK on this?
>>>
>> Carlo,
>>
>> Unless I missed it, we still don't have an Ack from a devicetree
>> maintainer for the devicetree changes.
>
> I'm the maintainer for the Meson platform and since the changes are
> trivial I'm going to merge them after the driver is taken in the
> watchdog tree.
>
Ok. I'll add patches 1 and 2 from the series to my -next tree and send
them to Wim with my next pull request.
Guenter
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v3 2/4] watchdog: meson: Add meson8b SoC specific data
2015-11-08 12:18 ` Carlo Caione
@ 2015-11-08 12:18 ` Carlo Caione
-1 siblings, 0 replies; 27+ messages in thread
From: Carlo Caione @ 2015-11-08 12:18 UTC (permalink / raw)
To: linux, wim, linux-watchdog, linux-arm-kernel, robh+dt, drake,
jerry.cao, victor.wan, romain.perier
Cc: Carlo Caione
From: Carlo Caione <carlo@endlessm.com>
Add SoC specific data in the watchdog driver for the meson8b SoC.
Signed-off-by: Carlo Caione <carlo@endlessm.com>
---
drivers/watchdog/meson_wdt.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
index 89734f0..3ec1e91 100644
--- a/drivers/watchdog/meson_wdt.c
+++ b/drivers/watchdog/meson_wdt.c
@@ -52,6 +52,12 @@ static struct meson_wdt_data meson6_wdt_data = {
.count_unit = 100000, /* 10 us */
};
+static struct meson_wdt_data meson8b_wdt_data = {
+ .enable = BIT(19),
+ .terminal_count_mask = 0xffff,
+ .count_unit = 7812, /* 128 us */
+};
+
struct meson_wdt_dev {
struct watchdog_device wdt_dev;
void __iomem *wdt_base;
@@ -153,6 +159,7 @@ static const struct watchdog_ops meson_wdt_ops = {
static const struct of_device_id meson_wdt_dt_ids[] = {
{ .compatible = "amlogic,meson6-wdt", .data = &meson6_wdt_data },
+ { .compatible = "amlogic,meson8b-wdt", .data = &meson8b_wdt_data },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);
--
1.9.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v3 2/4] watchdog: meson: Add meson8b SoC specific data
@ 2015-11-08 12:18 ` Carlo Caione
0 siblings, 0 replies; 27+ messages in thread
From: Carlo Caione @ 2015-11-08 12:18 UTC (permalink / raw)
To: linux-arm-kernel
From: Carlo Caione <carlo@endlessm.com>
Add SoC specific data in the watchdog driver for the meson8b SoC.
Signed-off-by: Carlo Caione <carlo@endlessm.com>
---
drivers/watchdog/meson_wdt.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
index 89734f0..3ec1e91 100644
--- a/drivers/watchdog/meson_wdt.c
+++ b/drivers/watchdog/meson_wdt.c
@@ -52,6 +52,12 @@ static struct meson_wdt_data meson6_wdt_data = {
.count_unit = 100000, /* 10 us */
};
+static struct meson_wdt_data meson8b_wdt_data = {
+ .enable = BIT(19),
+ .terminal_count_mask = 0xffff,
+ .count_unit = 7812, /* 128 us */
+};
+
struct meson_wdt_dev {
struct watchdog_device wdt_dev;
void __iomem *wdt_base;
@@ -153,6 +159,7 @@ static const struct watchdog_ops meson_wdt_ops = {
static const struct of_device_id meson_wdt_dt_ids[] = {
{ .compatible = "amlogic,meson6-wdt", .data = &meson6_wdt_data },
+ { .compatible = "amlogic,meson8b-wdt", .data = &meson8b_wdt_data },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);
--
1.9.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [PATCH v3 2/4] watchdog: meson: Add meson8b SoC specific data
2015-11-08 12:18 ` Carlo Caione
@ 2015-11-09 15:03 ` Guenter Roeck
-1 siblings, 0 replies; 27+ messages in thread
From: Guenter Roeck @ 2015-11-09 15:03 UTC (permalink / raw)
To: Carlo Caione, wim, linux-watchdog, linux-arm-kernel, robh+dt,
drake, jerry.cao, victor.wan, romain.perier
Cc: Carlo Caione
On 11/08/2015 04:18 AM, Carlo Caione wrote:
> From: Carlo Caione <carlo@endlessm.com>
>
> Add SoC specific data in the watchdog driver for the meson8b SoC.
>
> Signed-off-by: Carlo Caione <carlo@endlessm.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/meson_wdt.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
> index 89734f0..3ec1e91 100644
> --- a/drivers/watchdog/meson_wdt.c
> +++ b/drivers/watchdog/meson_wdt.c
> @@ -52,6 +52,12 @@ static struct meson_wdt_data meson6_wdt_data = {
> .count_unit = 100000, /* 10 us */
> };
>
> +static struct meson_wdt_data meson8b_wdt_data = {
> + .enable = BIT(19),
> + .terminal_count_mask = 0xffff,
> + .count_unit = 7812, /* 128 us */
> +};
> +
> struct meson_wdt_dev {
> struct watchdog_device wdt_dev;
> void __iomem *wdt_base;
> @@ -153,6 +159,7 @@ static const struct watchdog_ops meson_wdt_ops = {
>
> static const struct of_device_id meson_wdt_dt_ids[] = {
> { .compatible = "amlogic,meson6-wdt", .data = &meson6_wdt_data },
> + { .compatible = "amlogic,meson8b-wdt", .data = &meson8b_wdt_data },
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);
>
^ permalink raw reply [flat|nested] 27+ messages in thread* [PATCH v3 2/4] watchdog: meson: Add meson8b SoC specific data
@ 2015-11-09 15:03 ` Guenter Roeck
0 siblings, 0 replies; 27+ messages in thread
From: Guenter Roeck @ 2015-11-09 15:03 UTC (permalink / raw)
To: linux-arm-kernel
On 11/08/2015 04:18 AM, Carlo Caione wrote:
> From: Carlo Caione <carlo@endlessm.com>
>
> Add SoC specific data in the watchdog driver for the meson8b SoC.
>
> Signed-off-by: Carlo Caione <carlo@endlessm.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/meson_wdt.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
> index 89734f0..3ec1e91 100644
> --- a/drivers/watchdog/meson_wdt.c
> +++ b/drivers/watchdog/meson_wdt.c
> @@ -52,6 +52,12 @@ static struct meson_wdt_data meson6_wdt_data = {
> .count_unit = 100000, /* 10 us */
> };
>
> +static struct meson_wdt_data meson8b_wdt_data = {
> + .enable = BIT(19),
> + .terminal_count_mask = 0xffff,
> + .count_unit = 7812, /* 128 us */
> +};
> +
> struct meson_wdt_dev {
> struct watchdog_device wdt_dev;
> void __iomem *wdt_base;
> @@ -153,6 +159,7 @@ static const struct watchdog_ops meson_wdt_ops = {
>
> static const struct of_device_id meson_wdt_dt_ids[] = {
> { .compatible = "amlogic,meson6-wdt", .data = &meson6_wdt_data },
> + { .compatible = "amlogic,meson8b-wdt", .data = &meson8b_wdt_data },
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids);
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v3 3/4] Documentation: watchdog: Add new bindings for meson8b
2015-11-08 12:18 ` Carlo Caione
@ 2015-11-08 12:18 ` Carlo Caione
-1 siblings, 0 replies; 27+ messages in thread
From: Carlo Caione @ 2015-11-08 12:18 UTC (permalink / raw)
To: linux, wim, linux-watchdog, linux-arm-kernel, robh+dt, drake,
jerry.cao, victor.wan, romain.perier
Cc: Carlo Caione
From: Carlo Caione <carlo@endlessm.com>
We make the documentation not meson6 specific anymore and add the new
binding for meson8b SoC.
Signed-off-by: Carlo Caione <carlo@endlessm.com>
---
Documentation/devicetree/bindings/watchdog/meson-wdt.txt | 13 +++++++++++++
Documentation/devicetree/bindings/watchdog/meson6-wdt.txt | 13 -------------
2 files changed, 13 insertions(+), 13 deletions(-)
create mode 100644 Documentation/devicetree/bindings/watchdog/meson-wdt.txt
delete mode 100644 Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
diff --git a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt
new file mode 100644
index 0000000..ae70185
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt
@@ -0,0 +1,13 @@
+Meson SoCs Watchdog timer
+
+Required properties:
+
+- compatible : should be "amlogic,meson6-wdt" or "amlogic,meson8b-wdt"
+- reg : Specifies base physical address and size of the registers.
+
+Example:
+
+wdt: watchdog@c1109900 {
+ compatible = "amlogic,meson6-wdt";
+ reg = <0xc1109900 0x8>;
+};
diff --git a/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
deleted file mode 100644
index 9200fc2..0000000
--- a/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Meson SoCs Watchdog timer
-
-Required properties:
-
-- compatible : should be "amlogic,meson6-wdt"
-- reg : Specifies base physical address and size of the registers.
-
-Example:
-
-wdt: watchdog@c1109900 {
- compatible = "amlogic,meson6-wdt";
- reg = <0xc1109900 0x8>;
-};
--
1.9.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v3 3/4] Documentation: watchdog: Add new bindings for meson8b
@ 2015-11-08 12:18 ` Carlo Caione
0 siblings, 0 replies; 27+ messages in thread
From: Carlo Caione @ 2015-11-08 12:18 UTC (permalink / raw)
To: linux-arm-kernel
From: Carlo Caione <carlo@endlessm.com>
We make the documentation not meson6 specific anymore and add the new
binding for meson8b SoC.
Signed-off-by: Carlo Caione <carlo@endlessm.com>
---
Documentation/devicetree/bindings/watchdog/meson-wdt.txt | 13 +++++++++++++
Documentation/devicetree/bindings/watchdog/meson6-wdt.txt | 13 -------------
2 files changed, 13 insertions(+), 13 deletions(-)
create mode 100644 Documentation/devicetree/bindings/watchdog/meson-wdt.txt
delete mode 100644 Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
diff --git a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt
new file mode 100644
index 0000000..ae70185
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt
@@ -0,0 +1,13 @@
+Meson SoCs Watchdog timer
+
+Required properties:
+
+- compatible : should be "amlogic,meson6-wdt" or "amlogic,meson8b-wdt"
+- reg : Specifies base physical address and size of the registers.
+
+Example:
+
+wdt: watchdog at c1109900 {
+ compatible = "amlogic,meson6-wdt";
+ reg = <0xc1109900 0x8>;
+};
diff --git a/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
deleted file mode 100644
index 9200fc2..0000000
--- a/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Meson SoCs Watchdog timer
-
-Required properties:
-
-- compatible : should be "amlogic,meson6-wdt"
-- reg : Specifies base physical address and size of the registers.
-
-Example:
-
-wdt: watchdog at c1109900 {
- compatible = "amlogic,meson6-wdt";
- reg = <0xc1109900 0x8>;
-};
--
1.9.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [PATCH v3 3/4] Documentation: watchdog: Add new bindings for meson8b
2015-11-08 12:18 ` Carlo Caione
@ 2015-11-09 15:07 ` Guenter Roeck
-1 siblings, 0 replies; 27+ messages in thread
From: Guenter Roeck @ 2015-11-09 15:07 UTC (permalink / raw)
To: Carlo Caione, wim, linux-watchdog, linux-arm-kernel, robh+dt,
drake, jerry.cao, victor.wan, romain.perier
Cc: Carlo Caione
On 11/08/2015 04:18 AM, Carlo Caione wrote:
> From: Carlo Caione <carlo@endlessm.com>
>
> We make the documentation not meson6 specific anymore and add the new
> binding for meson8b SoC.
>
> Signed-off-by: Carlo Caione <carlo@endlessm.com>
> ---
> Documentation/devicetree/bindings/watchdog/meson-wdt.txt | 13 +++++++++++++
> Documentation/devicetree/bindings/watchdog/meson6-wdt.txt | 13 -------------
> 2 files changed, 13 insertions(+), 13 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/watchdog/meson-wdt.txt
> delete mode 100644 Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
This will need an Ack from a DT maintainer for the rename.
Guenter
>
> diff --git a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt
> new file mode 100644
> index 0000000..ae70185
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt
> @@ -0,0 +1,13 @@
> +Meson SoCs Watchdog timer
> +
> +Required properties:
> +
> +- compatible : should be "amlogic,meson6-wdt" or "amlogic,meson8b-wdt"
> +- reg : Specifies base physical address and size of the registers.
> +
> +Example:
> +
> +wdt: watchdog@c1109900 {
> + compatible = "amlogic,meson6-wdt";
> + reg = <0xc1109900 0x8>;
> +};
> diff --git a/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
> deleted file mode 100644
> index 9200fc2..0000000
> --- a/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -Meson SoCs Watchdog timer
> -
> -Required properties:
> -
> -- compatible : should be "amlogic,meson6-wdt"
> -- reg : Specifies base physical address and size of the registers.
> -
> -Example:
> -
> -wdt: watchdog@c1109900 {
> - compatible = "amlogic,meson6-wdt";
> - reg = <0xc1109900 0x8>;
> -};
>
^ permalink raw reply [flat|nested] 27+ messages in thread* [PATCH v3 3/4] Documentation: watchdog: Add new bindings for meson8b
@ 2015-11-09 15:07 ` Guenter Roeck
0 siblings, 0 replies; 27+ messages in thread
From: Guenter Roeck @ 2015-11-09 15:07 UTC (permalink / raw)
To: linux-arm-kernel
On 11/08/2015 04:18 AM, Carlo Caione wrote:
> From: Carlo Caione <carlo@endlessm.com>
>
> We make the documentation not meson6 specific anymore and add the new
> binding for meson8b SoC.
>
> Signed-off-by: Carlo Caione <carlo@endlessm.com>
> ---
> Documentation/devicetree/bindings/watchdog/meson-wdt.txt | 13 +++++++++++++
> Documentation/devicetree/bindings/watchdog/meson6-wdt.txt | 13 -------------
> 2 files changed, 13 insertions(+), 13 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/watchdog/meson-wdt.txt
> delete mode 100644 Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
This will need an Ack from a DT maintainer for the rename.
Guenter
>
> diff --git a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt
> new file mode 100644
> index 0000000..ae70185
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt
> @@ -0,0 +1,13 @@
> +Meson SoCs Watchdog timer
> +
> +Required properties:
> +
> +- compatible : should be "amlogic,meson6-wdt" or "amlogic,meson8b-wdt"
> +- reg : Specifies base physical address and size of the registers.
> +
> +Example:
> +
> +wdt: watchdog at c1109900 {
> + compatible = "amlogic,meson6-wdt";
> + reg = <0xc1109900 0x8>;
> +};
> diff --git a/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
> deleted file mode 100644
> index 9200fc2..0000000
> --- a/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -Meson SoCs Watchdog timer
> -
> -Required properties:
> -
> -- compatible : should be "amlogic,meson6-wdt"
> -- reg : Specifies base physical address and size of the registers.
> -
> -Example:
> -
> -wdt: watchdog at c1109900 {
> - compatible = "amlogic,meson6-wdt";
> - reg = <0xc1109900 0x8>;
> -};
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v3 4/4] ARM: dts: meson8b: Add watchdog node
2015-11-08 12:18 ` Carlo Caione
@ 2015-11-08 12:18 ` Carlo Caione
-1 siblings, 0 replies; 27+ messages in thread
From: Carlo Caione @ 2015-11-08 12:18 UTC (permalink / raw)
To: linux, wim, linux-watchdog, linux-arm-kernel, robh+dt, drake,
jerry.cao, victor.wan, romain.perier
Cc: Carlo Caione
From: Carlo Caione <carlo@endlessm.com>
With this patch we add the watchdog node in the meson8b DTS file.
Signed-off-by: Carlo Caione <carlo@endlessm.com>
---
arch/arm/boot/dts/meson8b.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
index ee352bf..8bad557 100644
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
@@ -105,6 +105,12 @@
#interrupt-cells = <3>;
};
+ wdt: watchdog@c1109900 {
+ compatible = "amlogic,meson8b-wdt";
+ reg = <0xc1109900 0x8>;
+ interrupts = <0 0 1>;
+ };
+
timer@c1109940 {
compatible = "amlogic,meson6-timer";
reg = <0xc1109940 0x18>;
--
1.9.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v3 4/4] ARM: dts: meson8b: Add watchdog node
@ 2015-11-08 12:18 ` Carlo Caione
0 siblings, 0 replies; 27+ messages in thread
From: Carlo Caione @ 2015-11-08 12:18 UTC (permalink / raw)
To: linux-arm-kernel
From: Carlo Caione <carlo@endlessm.com>
With this patch we add the watchdog node in the meson8b DTS file.
Signed-off-by: Carlo Caione <carlo@endlessm.com>
---
arch/arm/boot/dts/meson8b.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
index ee352bf..8bad557 100644
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
@@ -105,6 +105,12 @@
#interrupt-cells = <3>;
};
+ wdt: watchdog at c1109900 {
+ compatible = "amlogic,meson8b-wdt";
+ reg = <0xc1109900 0x8>;
+ interrupts = <0 0 1>;
+ };
+
timer at c1109940 {
compatible = "amlogic,meson6-timer";
reg = <0xc1109940 0x18>;
--
1.9.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [PATCH v3 4/4] ARM: dts: meson8b: Add watchdog node
2015-11-08 12:18 ` Carlo Caione
@ 2015-11-09 15:11 ` Guenter Roeck
-1 siblings, 0 replies; 27+ messages in thread
From: Guenter Roeck @ 2015-11-09 15:11 UTC (permalink / raw)
To: Carlo Caione, wim, linux-watchdog, linux-arm-kernel, robh+dt,
drake, jerry.cao, victor.wan, romain.perier
Cc: Carlo Caione
On 11/08/2015 04:18 AM, Carlo Caione wrote:
> From: Carlo Caione <carlo@endlessm.com>
>
> With this patch we add the watchdog node in the meson8b DTS file.
>
> Signed-off-by: Carlo Caione <carlo@endlessm.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> arch/arm/boot/dts/meson8b.dtsi | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
> index ee352bf..8bad557 100644
> --- a/arch/arm/boot/dts/meson8b.dtsi
> +++ b/arch/arm/boot/dts/meson8b.dtsi
> @@ -105,6 +105,12 @@
> #interrupt-cells = <3>;
> };
>
> + wdt: watchdog@c1109900 {
> + compatible = "amlogic,meson8b-wdt";
> + reg = <0xc1109900 0x8>;
> + interrupts = <0 0 1>;
> + };
> +
> timer@c1109940 {
> compatible = "amlogic,meson6-timer";
> reg = <0xc1109940 0x18>;
>
^ permalink raw reply [flat|nested] 27+ messages in thread* [PATCH v3 4/4] ARM: dts: meson8b: Add watchdog node
@ 2015-11-09 15:11 ` Guenter Roeck
0 siblings, 0 replies; 27+ messages in thread
From: Guenter Roeck @ 2015-11-09 15:11 UTC (permalink / raw)
To: linux-arm-kernel
On 11/08/2015 04:18 AM, Carlo Caione wrote:
> From: Carlo Caione <carlo@endlessm.com>
>
> With this patch we add the watchdog node in the meson8b DTS file.
>
> Signed-off-by: Carlo Caione <carlo@endlessm.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> arch/arm/boot/dts/meson8b.dtsi | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
> index ee352bf..8bad557 100644
> --- a/arch/arm/boot/dts/meson8b.dtsi
> +++ b/arch/arm/boot/dts/meson8b.dtsi
> @@ -105,6 +105,12 @@
> #interrupt-cells = <3>;
> };
>
> + wdt: watchdog at c1109900 {
> + compatible = "amlogic,meson8b-wdt";
> + reg = <0xc1109900 0x8>;
> + interrupts = <0 0 1>;
> + };
> +
> timer at c1109940 {
> compatible = "amlogic,meson6-timer";
> reg = <0xc1109940 0x18>;
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v3 0/4] watchdog: meson: Add meson8b watchdog
2015-11-08 12:18 ` Carlo Caione
` (4 preceding siblings ...)
(?)
@ 2015-12-28 21:03 ` Wim Van Sebroeck
-1 siblings, 0 replies; 27+ messages in thread
From: Wim Van Sebroeck @ 2015-12-28 21:03 UTC (permalink / raw)
To: Carlo Caione
Cc: linux, linux-watchdog, linux-arm-kernel, robh+dt, drake,
jerry.cao, victor.wan, romain.perier, Carlo Caione
Hi Carlo
> From: Carlo Caione <carlo@endlessm.com>
>
> Patchset to add support for the watchdog found on the Amlogic meson8b SoCs.
> DTS and documentation are also updated.
>
> Changelog:
> - V1 -> V2:
> * Do not calculate mask at runtime
> * Fix few style problems
> * Remove useless typecase
>
> - V2 -> V3:
> * Changed description for [PATCH 1/4]
> * Default timeout is not set as min(default, max)
>
> Carlo Caione (4):
> watchdog: meson: Enable meson SoC specific data
> watchdog: meson: Add meson8b SoC specific data
> Documentation: watchdog: Add new bindings for meson8b
> ARM: dts: meson8b: Add watchdog node
>
> .../devicetree/bindings/watchdog/meson-wdt.txt | 13 +++++
> .../devicetree/bindings/watchdog/meson6-wdt.txt | 13 -----
> arch/arm/boot/dts/meson8b.dtsi | 6 ++
> drivers/watchdog/meson_wdt.c | 65 ++++++++++++++++------
> 4 files changed, 67 insertions(+), 30 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/watchdog/meson-wdt.txt
> delete mode 100644 Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
>
> --
> 1.9.1
>
patches 1 and 2 have been added to linux-watchdog-next.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 27+ messages in thread