Skip to content

Commit 55908e3

Browse files
Huqiang QinWim Van Sebroeck
authored andcommitted
watchdog: Add a new struct for Amlogic-GXBB driver
Add a new structure wdt_params to describe the watchdog difference of different chips. Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com> Reviewed-by: Dmitry Rokosov <ddrokosov@sberdevices.ru> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20230802033222.4024946-3-huqiang.qin@amlogic.com Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
1 parent 05c74a2 commit 55908e3

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

drivers/watchdog/meson_gxbb_wdt.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#define GXBB_WDT_CTRL_CLKDIV_EN BIT(25)
2424
#define GXBB_WDT_CTRL_CLK_EN BIT(24)
25-
#define GXBB_WDT_CTRL_EE_RESET BIT(21)
2625
#define GXBB_WDT_CTRL_EN BIT(18)
2726
#define GXBB_WDT_CTRL_DIV_MASK (BIT(18) - 1)
2827

@@ -45,6 +44,10 @@ struct meson_gxbb_wdt {
4544
struct clk *clk;
4645
};
4746

47+
struct wdt_params {
48+
u32 rst;
49+
};
50+
4851
static int meson_gxbb_wdt_start(struct watchdog_device *wdt_dev)
4952
{
5053
struct meson_gxbb_wdt *data = watchdog_get_drvdata(wdt_dev);
@@ -140,8 +143,12 @@ static const struct dev_pm_ops meson_gxbb_wdt_pm_ops = {
140143
SET_SYSTEM_SLEEP_PM_OPS(meson_gxbb_wdt_suspend, meson_gxbb_wdt_resume)
141144
};
142145

146+
static const struct wdt_params gxbb_params = {
147+
.rst = BIT(21),
148+
};
149+
143150
static const struct of_device_id meson_gxbb_wdt_dt_ids[] = {
144-
{ .compatible = "amlogic,meson-gxbb-wdt", },
151+
{ .compatible = "amlogic,meson-gxbb-wdt", .data = &gxbb_params, },
145152
{ /* sentinel */ },
146153
};
147154
MODULE_DEVICE_TABLE(of, meson_gxbb_wdt_dt_ids);
@@ -150,6 +157,7 @@ static int meson_gxbb_wdt_probe(struct platform_device *pdev)
150157
{
151158
struct device *dev = &pdev->dev;
152159
struct meson_gxbb_wdt *data;
160+
struct wdt_params *params;
153161
u32 ctrl_reg;
154162

155163
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
@@ -164,6 +172,8 @@ static int meson_gxbb_wdt_probe(struct platform_device *pdev)
164172
if (IS_ERR(data->clk))
165173
return PTR_ERR(data->clk);
166174

175+
params = (struct wdt_params *)of_device_get_match_data(dev);
176+
167177
platform_set_drvdata(pdev, data);
168178

169179
data->wdt_dev.parent = dev;
@@ -191,7 +201,7 @@ static int meson_gxbb_wdt_probe(struct platform_device *pdev)
191201
/* Setup with 1ms timebase */
192202
ctrl_reg |= ((clk_get_rate(data->clk) / 1000) &
193203
GXBB_WDT_CTRL_DIV_MASK) |
194-
GXBB_WDT_CTRL_EE_RESET |
204+
params->rst |
195205
GXBB_WDT_CTRL_CLK_EN |
196206
GXBB_WDT_CTRL_CLKDIV_EN;
197207

0 commit comments

Comments
 (0)