Commit 55908e38 authored by Huqiang Qin's avatar Huqiang Qin Committed by Wim Van Sebroeck
Browse files

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: default avatarHuqiang Qin <huqiang.qin@amlogic.com>
Reviewed-by: default avatarDmitry Rokosov <ddrokosov@sberdevices.ru>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20230802033222.4024946-3-huqiang.qin@amlogic.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 05c74a23

drivers/watchdog/meson_gxbb_wdt.c

+13 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#define GXBB_WDT_CTRL_CLKDIV_EN			BIT(25)

#define GXBB_WDT_CTRL_CLK_EN			BIT(24)

#define GXBB_WDT_CTRL_EE_RESET			BIT(21)

#define GXBB_WDT_CTRL_EN			BIT(18)

#define GXBB_WDT_CTRL_DIV_MASK			(BIT(18) - 1)
@@ -45,6 +44,10 @@ struct meson_gxbb_wdt { 
	struct clk *clk;

};



struct wdt_params {

	u32 rst;

};



static int meson_gxbb_wdt_start(struct watchdog_device *wdt_dev)

{

	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 = { 
	SET_SYSTEM_SLEEP_PM_OPS(meson_gxbb_wdt_suspend, meson_gxbb_wdt_resume)

};



static const struct wdt_params gxbb_params = {

	.rst = BIT(21),

};



static const struct of_device_id meson_gxbb_wdt_dt_ids[] = {

	 { .compatible = "amlogic,meson-gxbb-wdt", },

	 { .compatible = "amlogic,meson-gxbb-wdt", .data = &gxbb_params, },

	 { /* sentinel */ },

};

MODULE_DEVICE_TABLE(of, meson_gxbb_wdt_dt_ids);
@@ -150,6 +157,7 @@ static int meson_gxbb_wdt_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct meson_gxbb_wdt *data;

	struct wdt_params *params;

	u32 ctrl_reg;



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

		return PTR_ERR(data->clk);



	params = (struct wdt_params *)of_device_get_match_data(dev);



	platform_set_drvdata(pdev, data);



	data->wdt_dev.parent = dev;
@@ -191,7 +201,7 @@ static int meson_gxbb_wdt_probe(struct platform_device *pdev) 
	/* Setup with 1ms timebase */

	ctrl_reg |= ((clk_get_rate(data->clk) / 1000) &

			GXBB_WDT_CTRL_DIV_MASK) |

			GXBB_WDT_CTRL_EE_RESET |

			params->rst |

			GXBB_WDT_CTRL_CLK_EN |

			GXBB_WDT_CTRL_CLKDIV_EN;