diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 11:45:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 11:45:05 +0000 |
| commit | 04af964f9cb666caa7c1436d003f8fac0f1fedcc (patch) | |
| tree | f59aeb6c00b10294217b5ea75eb87403c61c314d /sound | |
| parent | 7b306dae22ca377ea0020261ef13aea85b8f5f3f (diff) | |
| parent | 2811fe2beb7cb9f34eef4bc9627dcabb401bc05e (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/max98088.c | 11 | ||||
| -rw-r--r-- | sound/soc/codecs/uda134x.c | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index ef06007d889..9c322373d5d 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -28,6 +28,11 @@ #include <sound/max98088.h> #include "max98088.h" +enum max98088_type { + MAX98088, + MAX98089, +}; + struct max98088_cdata { unsigned int rate; unsigned int fmt; @@ -36,6 +41,7 @@ struct max98088_cdata { struct max98088_priv { u8 reg_cache[M98088_REG_CNT]; + enum max98088_type devtype; void *control_data; struct max98088_pdata *pdata; unsigned int sysclk; @@ -2042,6 +2048,8 @@ static int max98088_i2c_probe(struct i2c_client *i2c, if (max98088 == NULL) return -ENOMEM; + max98088->devtype = id->driver_data; + i2c_set_clientdata(i2c, max98088); max98088->control_data = i2c; max98088->pdata = i2c->dev.platform_data; @@ -2061,7 +2069,8 @@ static int __devexit max98088_i2c_remove(struct i2c_client *client) } static const struct i2c_device_id max98088_i2c_id[] = { - { "max98088", 0 }, + { "max98088", MAX98088 }, + { "max98089", MAX98089 }, { } }; MODULE_DEVICE_TABLE(i2c, max98088_i2c_id); diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index 8ea81d48124..6b6c0d291ab 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c @@ -597,6 +597,7 @@ static struct snd_soc_codec_driver soc_codec_dev_uda134x = { .resume = uda134x_soc_resume, .reg_cache_size = sizeof(uda134x_reg), .reg_word_size = sizeof(u8), + .reg_cache_default = uda134x_reg, .reg_cache_step = 1, .read = uda134x_read_reg_cache, .write = uda134x_write, |