ASoC: ssm4567: Add OF device ID table
The driver doesn't have a struct of_device_id table but supported devices are registered via Device Trees. This is working on the assumption that a I2C device registered via OF will always match a legacy I2C device ID and that the MODALIAS reported will always be of the form i2c:<device>. But this could change in the future so the correct approach is to have an OF device ID table if the devices are registered via OF. Before this patch: $ modinfo sound/soc/codecs/snd-soc-ssm4567.ko | grep alias alias: acpi*:INT343B:* alias: i2c:ssm4567 After this patch: $ modinfo sound/soc/codecs/snd-soc-ssm4567.ko | grep alias alias: acpi*:INT343B:* alias: of:N*T*Cadi,ssm4567C* alias: of:N*T*Cadi,ssm4567 alias: i2c:ssm4567 Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
a5de5b74a5
Коммит
71c314d7ef
|
@ -485,6 +485,14 @@ static const struct i2c_device_id ssm4567_i2c_ids[] = {
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(i2c, ssm4567_i2c_ids);
|
MODULE_DEVICE_TABLE(i2c, ssm4567_i2c_ids);
|
||||||
|
|
||||||
|
#ifdef CONFIG_OF
|
||||||
|
static const struct of_device_id ssm4567_of_match[] = {
|
||||||
|
{ .compatible = "adi,ssm4567", },
|
||||||
|
{ }
|
||||||
|
};
|
||||||
|
MODULE_DEVICE_TABLE(of, ssm4567_of_match);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_ACPI
|
#ifdef CONFIG_ACPI
|
||||||
|
|
||||||
static const struct acpi_device_id ssm4567_acpi_match[] = {
|
static const struct acpi_device_id ssm4567_acpi_match[] = {
|
||||||
|
@ -498,6 +506,7 @@ MODULE_DEVICE_TABLE(acpi, ssm4567_acpi_match);
|
||||||
static struct i2c_driver ssm4567_driver = {
|
static struct i2c_driver ssm4567_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "ssm4567",
|
.name = "ssm4567",
|
||||||
|
.of_match_table = of_match_ptr(ssm4567_of_match),
|
||||||
.acpi_match_table = ACPI_PTR(ssm4567_acpi_match),
|
.acpi_match_table = ACPI_PTR(ssm4567_acpi_match),
|
||||||
},
|
},
|
||||||
.probe = ssm4567_i2c_probe,
|
.probe = ssm4567_i2c_probe,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче