| Message ID | 20230315110650.142577-4-keguang.zhang@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Devicetree support for Loongson-1 GPIO | expand |
On Wed, Mar 15, 2023 at 12:07 PM Keguang Zhang <keguang.zhang@gmail.com> wrote: > > This patch adds DT support for Loongson-1 GPIO driver. > > Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com> > --- > V2 -> V3: None > V1 -> V2: Let gpiolib parse ngpios property > Remove unnecessary alias id parsing > Remove superfluous initialization done by bgpio_init() > Add MODULE_DEVICE_TABLE() > Other minor fixes > --- > drivers/gpio/gpio-loongson1.c | 19 ++++++++++++++++--- > 1 file changed, 16 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpio/gpio-loongson1.c b/drivers/gpio/gpio-loongson1.c > index dddfc71f0e10..6ca3b969db4d 100644 > --- a/drivers/gpio/gpio-loongson1.c > +++ b/drivers/gpio/gpio-loongson1.c > @@ -68,25 +68,38 @@ static int ls1x_gpio_probe(struct platform_device *pdev) > ls1x_gc->gc.owner = THIS_MODULE; > ls1x_gc->gc.request = ls1x_gpio_request; > ls1x_gc->gc.free = ls1x_gpio_free; > - ls1x_gc->gc.base = pdev->id * 32; > + /* > + * Clear ngpio to let gpiolib get the correct number > + * by reading ngpios property > + */ > + ls1x_gc->gc.ngpio = 0; > > ret = devm_gpiochip_add_data(dev, &ls1x_gc->gc, ls1x_gc); > if (ret) > goto err; > > platform_set_drvdata(pdev, ls1x_gc); > - dev_info(dev, "Loongson1 GPIO driver registered\n"); > + > + dev_info(dev, "GPIO controller registered with %d pins\n", > + ls1x_gc->gc.ngpio); > > return 0; > err: > - dev_err(dev, "failed to register GPIO device\n"); > + dev_err(dev, "failed to register GPIO controller\n"); > return ret; > } > > +static const struct of_device_id ls1x_gpio_dt_ids[] = { > + { .compatible = "loongson,ls1x-gpio" }, > + { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(of, ls1x_gpio_dt_ids); > + > static struct platform_driver ls1x_gpio_driver = { > .probe = ls1x_gpio_probe, > .driver = { > .name = "ls1x-gpio", > + .of_match_table = ls1x_gpio_dt_ids, > }, > }; > > -- > 2.34.1 > I applied this and the last one but switched patches 3 and 4 as it's customary to have bindings in the tree before DT support. Bart
diff --git a/drivers/gpio/gpio-loongson1.c b/drivers/gpio/gpio-loongson1.c index dddfc71f0e10..6ca3b969db4d 100644 --- a/drivers/gpio/gpio-loongson1.c +++ b/drivers/gpio/gpio-loongson1.c @@ -68,25 +68,38 @@ static int ls1x_gpio_probe(struct platform_device *pdev) ls1x_gc->gc.owner = THIS_MODULE; ls1x_gc->gc.request = ls1x_gpio_request; ls1x_gc->gc.free = ls1x_gpio_free; - ls1x_gc->gc.base = pdev->id * 32; + /* + * Clear ngpio to let gpiolib get the correct number + * by reading ngpios property + */ + ls1x_gc->gc.ngpio = 0; ret = devm_gpiochip_add_data(dev, &ls1x_gc->gc, ls1x_gc); if (ret) goto err; platform_set_drvdata(pdev, ls1x_gc); - dev_info(dev, "Loongson1 GPIO driver registered\n"); + + dev_info(dev, "GPIO controller registered with %d pins\n", + ls1x_gc->gc.ngpio); return 0; err: - dev_err(dev, "failed to register GPIO device\n"); + dev_err(dev, "failed to register GPIO controller\n"); return ret; } +static const struct of_device_id ls1x_gpio_dt_ids[] = { + { .compatible = "loongson,ls1x-gpio" }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, ls1x_gpio_dt_ids); + static struct platform_driver ls1x_gpio_driver = { .probe = ls1x_gpio_probe, .driver = { .name = "ls1x-gpio", + .of_match_table = ls1x_gpio_dt_ids, }, };
This patch adds DT support for Loongson-1 GPIO driver. Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com> --- V2 -> V3: None V1 -> V2: Let gpiolib parse ngpios property Remove unnecessary alias id parsing Remove superfluous initialization done by bgpio_init() Add MODULE_DEVICE_TABLE() Other minor fixes --- drivers/gpio/gpio-loongson1.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)