diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 14:56:00 +0900 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2013-01-21 10:49:40 +0100 |
| commit | e2402172866eaf8f27911c22433bad9d5779b80c (patch) | |
| tree | 654163eab011e30c0a5954874ad150a7214287aa /sound/soc | |
| parent | f627315ac4e4b3109dac75701c3242390af5ba57 (diff) | |
Conflict due to the fix for the register map failure - taken the for-3.1 version.
Conflicts:
sound/soc/codecs/sgtl5000.c
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/sgtl5000.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 7e4066e131e6..666fae6e148d 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -20,6 +20,7 @@ #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> #include <linux/regulator/consumer.h> +#include <linux/of_device.h> #include <sound/core.h> #include <sound/tlv.h> #include <sound/pcm.h> @@ -1436,10 +1437,17 @@ static const struct i2c_device_id sgtl5000_id[] = { MODULE_DEVICE_TABLE(i2c, sgtl5000_id); +static const struct of_device_id sgtl5000_dt_ids[] = { + { .compatible = "fsl,sgtl5000", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(i2c, sgtl5000_dt_ids); + static struct i2c_driver sgtl5000_i2c_driver = { .driver = { .name = "sgtl5000", .owner = THIS_MODULE, + .of_match_table = sgtl5000_dt_ids, }, .probe = sgtl5000_i2c_probe, .remove = __devexit_p(sgtl5000_i2c_remove), |