| Message ID | 20230511121159.463645-3-keguang.zhang@gmail.com |
|---|---|
| State | Accepted |
| Commit | 20fbe6291e54739beb905e0b7fc45ba534cf644d |
| Headers | show |
| Series | Devicetree support for Loongson-1 watchdog | expand |
On Thu, May 11, 2023 at 08:11:59PM +0800, Keguang Zhang wrote: > This patch adds the of_match_table to enable DT support > of Loongson-1 watchdog driver. > And modify the parameter of devm_clk_get_enabled() accordingly. > > Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > V1 -> V2: Change the wildcard compatible string to specific ones > Use of_match_ptr() to aviod the build error when CONFIG_OF=n > --- > drivers/watchdog/loongson1_wdt.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/drivers/watchdog/loongson1_wdt.c b/drivers/watchdog/loongson1_wdt.c > index 3c651c50a98c..4ac7810a314d 100644 > --- a/drivers/watchdog/loongson1_wdt.c > +++ b/drivers/watchdog/loongson1_wdt.c > @@ -5,6 +5,7 @@ > > #include <linux/clk.h> > #include <linux/module.h> > +#include <linux/of.h> > #include <linux/platform_device.h> > #include <linux/watchdog.h> > > @@ -112,7 +113,7 @@ static int ls1x_wdt_probe(struct platform_device *pdev) > if (IS_ERR(drvdata->base)) > return PTR_ERR(drvdata->base); > > - drvdata->clk = devm_clk_get_enabled(dev, pdev->name); > + drvdata->clk = devm_clk_get_enabled(dev, NULL); > if (IS_ERR(drvdata->clk)) > return PTR_ERR(drvdata->clk); > > @@ -144,10 +145,20 @@ static int ls1x_wdt_probe(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_OF > +static const struct of_device_id ls1x_wdt_dt_ids[] = { > + { .compatible = "loongson,ls1b-wdt", }, > + { .compatible = "loongson,ls1c-wdt", }, > + { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(of, ls1x_wdt_dt_ids); > +#endif > + > static struct platform_driver ls1x_wdt_driver = { > .probe = ls1x_wdt_probe, > .driver = { > .name = "ls1x-wdt", > + .of_match_table = of_match_ptr(ls1x_wdt_dt_ids), > }, > }; > > -- > 2.39.2 >
diff --git a/drivers/watchdog/loongson1_wdt.c b/drivers/watchdog/loongson1_wdt.c index 3c651c50a98c..4ac7810a314d 100644 --- a/drivers/watchdog/loongson1_wdt.c +++ b/drivers/watchdog/loongson1_wdt.c @@ -5,6 +5,7 @@ #include <linux/clk.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/watchdog.h> @@ -112,7 +113,7 @@ static int ls1x_wdt_probe(struct platform_device *pdev) if (IS_ERR(drvdata->base)) return PTR_ERR(drvdata->base); - drvdata->clk = devm_clk_get_enabled(dev, pdev->name); + drvdata->clk = devm_clk_get_enabled(dev, NULL); if (IS_ERR(drvdata->clk)) return PTR_ERR(drvdata->clk); @@ -144,10 +145,20 @@ static int ls1x_wdt_probe(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static const struct of_device_id ls1x_wdt_dt_ids[] = { + { .compatible = "loongson,ls1b-wdt", }, + { .compatible = "loongson,ls1c-wdt", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, ls1x_wdt_dt_ids); +#endif + static struct platform_driver ls1x_wdt_driver = { .probe = ls1x_wdt_probe, .driver = { .name = "ls1x-wdt", + .of_match_table = of_match_ptr(ls1x_wdt_dt_ids), }, };
This patch adds the of_match_table to enable DT support of Loongson-1 watchdog driver. And modify the parameter of devm_clk_get_enabled() accordingly. Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com> --- V1 -> V2: Change the wildcard compatible string to specific ones Use of_match_ptr() to aviod the build error when CONFIG_OF=n --- drivers/watchdog/loongson1_wdt.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)