diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-04-09 17:50:02 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-04-09 17:50:02 +0200 |
commit | 50487c3a4a96d91e25d43d63262773f14961d9de (patch) | |
tree | 9649437556ec56e5ba27e943313f093318b17b81 /sound/soc/codecs/rt5640.c | |
parent | 17c3ad030213da23158082ea90ebbe2a3940a2d2 (diff) | |
parent | ab5d6fbdb71c183add7431243c7f615c42b643bb (diff) | |
download | op-kernel-dev-50487c3a4a96d91e25d43d63262773f14961d9de.zip op-kernel-dev-50487c3a4a96d91e25d43d63262773f14961d9de.tar.gz |
Merge tag 'asoc-v3.15-5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.15
A smattering of device specific fixes, nothing stands out here except
for the multiplatform fixes for Samsung and the device IDs being added
by Stephen Warren - there's no real code changes from those and they
give better robustness to the enumeration with DT.
Diffstat (limited to 'sound/soc/codecs/rt5640.c')
-rw-r--r-- | sound/soc/codecs/rt5640.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 0061ae6..68b4dd6 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2074,6 +2074,14 @@ static const struct i2c_device_id rt5640_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id); +#if defined(CONFIG_OF) +static const struct of_device_id rt5640_of_match[] = { + { .compatible = "realtek,rt5640", }, + {}, +}; +MODULE_DEVICE_TABLE(of, rt5640_of_match); +#endif + #ifdef CONFIG_ACPI static struct acpi_device_id rt5640_acpi_match[] = { { "INT33CA", 0 }, @@ -2203,6 +2211,7 @@ static struct i2c_driver rt5640_i2c_driver = { .name = "rt5640", .owner = THIS_MODULE, .acpi_match_table = ACPI_PTR(rt5640_acpi_match), + .of_match_table = of_match_ptr(rt5640_of_match), }, .probe = rt5640_i2c_probe, .remove = rt5640_i2c_remove, |