Skip to content

Commit 9ce7651

Browse files
trinitiwai
authored andcommitted
ASoC: rt5677: Reintroduce I2C device IDs
Not all devices with ACPI and this combination of sound devices will have the required information provided via ACPI. Reintroduce the I2C device ID to restore sound functionality on on the Chromebook 'Samus' model. [ More background note: the commit a36afb0 ("ASoC: rt5677: Introduce proper table...") moved the i2c ID probed via ACPI ("RT5677CE:00") to a proper acpi_device_id table. Although the action itself is correct per se, the overseen issue is the reference id->driver_data at rt5677_i2c_probe() for retrieving the corresponding chip model for the given id. Since id=NULL is passed for ACPI matching case, we get an Oops now. We already have queued more fixes for 4.14 and they already address the issue, but they are bigger changes that aren't preferable for the late 4.13-rc stage. So, this patch just papers over the bug as a once-off quick fix for a particular ACPI matching. -- tiwai ] Fixes: a36afb0 ("ASoC: rt5677: Introduce proper table for ACPI enumeration") Signed-off-by: Tom Rini <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
1 parent bbba6f9 commit 9ce7651

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

sound/soc/codecs/rt5677.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5021,6 +5021,7 @@ static const struct regmap_config rt5677_regmap = {
50215021
static const struct i2c_device_id rt5677_i2c_id[] = {
50225022
{ "rt5677", RT5677 },
50235023
{ "rt5676", RT5676 },
5024+
{ "RT5677CE:00", RT5677 },
50245025
{ }
50255026
};
50265027
MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id);

0 commit comments

Comments
 (0)