Commit 007704c9 authored by Linus Walleij's avatar Linus Walleij Committed by Dmitry Torokhov
Browse files

Input: cyttsp - probe from compatibles 



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: default avatarJavier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20210526230352.1433537-2-linus.walleij@linaro.org


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 4b48d935

drivers/input/touchscreen/cyttsp_i2c.c

+8 −0
Original line number Diff line number Diff line
@@ -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,

drivers/input/touchscreen/cyttsp_spi.c

+8 −0
Original line number Diff line number Diff line
@@ -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,

};