Patch "ASoC: rt5677: Add OF device ID table" has been added to the 4.9-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
ASoC: rt5677: Add OF device ID table
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-rt5677-add-of-device-id-table.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Sun Mar 18 16:55:33 CET 2018
From: Javier Martinez Canillas <[email protected]>
Date: Tue, 4 Apr 2017 15:26:30 -0400
Subject: ASoC: rt5677: Add OF device ID table
From: Javier Martinez Canillas <[email protected]>
[ Upstream commit 7b87463edf3e2c16d72eeea3d1cf3c12bb5487c6 ]
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-rt5677.ko | grep alias alias: i2c:RT5677CE:00 alias: i2c:rt5676 alias: i2c:rt5677
After this patch:
$ modinfo sound/soc/codecs/snd-soc-rt5677.ko | grep alias alias: of:N*T*Crealtek,rt5677C* alias: of:N*T*Crealtek,rt5677 alias: i2c:RT5677CE:00 alias: i2c:rt5676 alias: i2c:rt5677
--- sound/soc/codecs/rt5677.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/codecs/rt5677.c +7 -0
@@ -5035,6 +5035,12 @@ static const struct i2c_device_id rt5677 };MODULE_DEVICE_TABLE (i2c, rt5677_i2c_id); +static const struct of_device_id rt5677_of_match[] = { + { .compatible ="realtek,rt5677" , }, + { } +}; +MODULE_DEVICE_TABLE (of, rt5677_of_match); +static const struct acpi_gpio_params plug_det_gpio = {RT5677_GPIO_PLUG_DET ,0 , false };static const struct acpi_gpio_params mic_present_gpio = {RT5677_GPIO_MIC_PRESENT_L ,0 , false };static const struct acpi_gpio_params headphone_enable_gpio = {RT5677_GPIO_HP_AMP_SHDN_L ,0 , false };
@@ -5294,6 +5300,7 @@ static int rt5677_i2c_remove(struct i2c_static struct i2c_driver rt5677_i2c_driver = { .driver = { .name ="rt5677" , + .of_match_table = rt5677_of_match, }, .probe = rt5677_i2c_probe, .remove = rt5677_i2c_remove,
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/asoc-rt5677-add-of-device-id-table.patch queue-4.9/regulator-core-limit-propagation-of-parent-voltage-count-and-list.patch queue-4.9/input-qt1070-add-of-device-id-table.patch