| Message ID | 20230407110025.516405-3-keguang.zhang@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Devicetree support for Loongson-1 watchdog | expand |
On 4/7/23 04:00, 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() accordingly. > > Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com> > --- > drivers/watchdog/loongson1_wdt.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/watchdog/loongson1_wdt.c b/drivers/watchdog/loongson1_wdt.c > index bb3d075c0633..c2694222ea86 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/mod_devicetable.h> > #include <linux/platform_device.h> > #include <linux/watchdog.h> > #include <loongson1.h> > @@ -100,7 +101,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(dev, pdev->name); > + drvdata->clk = devm_clk_get(dev, NULL); > if (IS_ERR(drvdata->clk)) > return PTR_ERR(drvdata->clk); > > @@ -142,10 +143,19 @@ 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,ls1x-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 = ls1x_wdt_dt_ids, If CONFIG_OF=n, this would result in a missing symbol. Guenter
Hi Keguang,
kernel test robot noticed the following build errors:
[auto build test ERROR on cf3be7e82b129ed34f811f116f2b113f6299d449]
url: https://github.com/intel-lab-lkp/linux/commits/Keguang-Zhang/dt-bindings-watchdog-Add-Loongson-1-watchdog/20230407-190222
base: cf3be7e82b129ed34f811f116f2b113f6299d449
patch link: https://lore.kernel.org/r/20230407110025.516405-3-keguang.zhang%40gmail.com
patch subject: [PATCH 2/2] watchdog: loongson1_wdt: Add DT support
config: mips-loongson1c_defconfig (https://download.01.org/0day-ci/archive/20230408/202304081301.6Ukja1z0-lkp@intel.com/config)
compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project 2c57868e2e877f73c339796c3374ae660bb77f0d)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install mips cross compiling tool for clang build
# apt-get install binutils-mipsel-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/26b8fbfd577b41f39d6af516ef7c49cbffa05117
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Keguang-Zhang/dt-bindings-watchdog-Add-Loongson-1-watchdog/20230407-190222
git checkout 26b8fbfd577b41f39d6af516ef7c49cbffa05117
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=mips olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=mips SHELL=/bin/bash drivers/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202304081301.6Ukja1z0-lkp@intel.com/
All errors (new ones prefixed by >>):
>> drivers/watchdog/loongson1_wdt.c:158:21: error: use of undeclared identifier 'ls1x_wdt_dt_ids'
.of_match_table = ls1x_wdt_dt_ids,
^
1 error generated.
vim +/ls1x_wdt_dt_ids +158 drivers/watchdog/loongson1_wdt.c
153
154 static struct platform_driver ls1x_wdt_driver = {
155 .probe = ls1x_wdt_probe,
156 .driver = {
157 .name = "ls1x-wdt",
> 158 .of_match_table = ls1x_wdt_dt_ids,
159 },
160 };
161
diff --git a/drivers/watchdog/loongson1_wdt.c b/drivers/watchdog/loongson1_wdt.c index bb3d075c0633..c2694222ea86 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/mod_devicetable.h> #include <linux/platform_device.h> #include <linux/watchdog.h> #include <loongson1.h> @@ -100,7 +101,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(dev, pdev->name); + drvdata->clk = devm_clk_get(dev, NULL); if (IS_ERR(drvdata->clk)) return PTR_ERR(drvdata->clk); @@ -142,10 +143,19 @@ 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,ls1x-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 = 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() accordingly. Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com> --- drivers/watchdog/loongson1_wdt.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)