leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: cyttsp - probe from compatibles

Browse Source 
The driver (both SPI and I2C interface) should probe from the compatible
strings, cypress,cy8ctma340 etc when using device tree, not as now, where
it is probing implicitly from the I2C/SPI node name "cypress,cyttsp-i2c"
etc.

Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20210526230352.1433537-2-linus.walleij@linaro.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Linus Walleij 2021-05-26 16:34:41 -07:00 committed by Dmitry Torokhov
parent 4b48d935a5
commit 007704c99f
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/input/touchscreen/cyttsp_i2c.c
View File

@ -52,10 +52,18 @@ static const struct i2c_device_id cyttsp_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, cyttsp_i2c_id);
static const struct of_device_id cyttsp_of_i2c_match[] = {
{ .compatible = "cypress,cy8ctma340", },
{ .compatible = "cypress,cy8ctst341", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, cyttsp_of_i2c_match);
static struct i2c_driver cyttsp_i2c_driver = {
.driver = {
.name = CY_I2C_NAME,
.pm = &cyttsp_pm_ops,
.of_match_table = cyttsp_of_i2c_match,
},
.probe = cyttsp_i2c_probe,
.id_table = cyttsp_i2c_id,

8
drivers/input/touchscreen/cyttsp_spi.c
View File

@ -160,10 +160,18 @@ static int cyttsp_spi_probe(struct spi_device *spi)
return 0;
}
static const struct of_device_id cyttsp_of_spi_match[] = {
{ .compatible = "cypress,cy8ctma340", },
{ .compatible = "cypress,cy8ctst341", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, cyttsp_of_spi_match);
static struct spi_driver cyttsp_spi_driver = {
.driver = {
.name = CY_SPI_NAME,
.pm = &cyttsp_pm_ops,
.of_match_table = cyttsp_of_spi_match,
},
.probe = cyttsp_spi_probe,
};