| Date | Mon, 24 Aug 2015 14:59:53 +0100 | From | Lee Jones <> | Subject | Re: [PATCH 12/18] mfd: stmpe: Add OF match table |
| |
On Thu, 20 Aug 2015, Javier Martinez Canillas wrote:
> The Documentation/devicetree/bindings/mfd/stmpe.txt DT binding doc lists > "st,stmpe[610|801|811|1601|2401|2403]" as valid compatible strings but > the corresponding driver does not have an OF match table. Add the table > to the driver so the SPI core can do an OF style match. > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > --- > > drivers/mfd/stmpe-spi.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+)
Applied, thanks.
> diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c > index 6fdb30e84a2b..618ba244d98a 100644 > --- a/drivers/mfd/stmpe-spi.c > +++ b/drivers/mfd/stmpe-spi.c > @@ -11,6 +11,7 @@ > #include <linux/interrupt.h> > #include <linux/kernel.h> > #include <linux/module.h> > +#include <linux/of.h> > #include <linux/types.h> > #include "stmpe.h" > > @@ -108,6 +109,17 @@ static int stmpe_spi_remove(struct spi_device *spi) > return stmpe_remove(stmpe); > } > > +static const struct of_device_id stmpe_spi_of_match[] = { > + { .compatible = "st,stmpe610", }, > + { .compatible = "st,stmpe801", }, > + { .compatible = "st,stmpe811", }, > + { .compatible = "st,stmpe1601", }, > + { .compatible = "st,stmpe2401", }, > + { .compatible = "st,stmpe2403", }, > + { /* sentinel */ }, > +}; > +MODULE_DEVICE_TABLE(of, stmpe_spi_of_match); > + > static const struct spi_device_id stmpe_spi_id[] = { > { "stmpe610", STMPE610 }, > { "stmpe801", STMPE801 }, > @@ -122,6 +134,7 @@ MODULE_DEVICE_TABLE(spi, stmpe_id); > static struct spi_driver stmpe_spi_driver = { > .driver = { > .name = "stmpe-spi", > + .of_match_table = of_match_ptr(stmpe_spi_of_match), > .owner = THIS_MODULE, > #ifdef CONFIG_PM > .pm = &stmpe_dev_pm_ops,
-- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
|