aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8971.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-10 17:24:27 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-03 11:59:09 -0400
commit7084a42b965d972079201414d19a399e65b26099 (patch)
tree391a0ed913eb769013ca65e3c042ac043981dbfa /sound/soc/codecs/wm8971.c
parent030c819e79e8ad0320486e9ccbe76d2f0870369f (diff)
ASoC: Add I/O control bus information to factored out cache setup
While writes tend to be able to use a fairly bus independant format to do the writes reads are all bus specific. To allow us to factor out this code include the bus type as a parameter when setting up the cache. Initially just use this to factor out hw_write_t for I2C. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8971.c')
-rw-r--r--sound/soc/codecs/wm8971.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index 53f3bc90ea0c..d66efb0546ea 100644
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -640,7 +640,8 @@ static int wm8971_resume(struct platform_device *pdev)
640 return 0; 640 return 0;
641} 641}
642 642
643static int wm8971_init(struct snd_soc_device *socdev) 643static int wm8971_init(struct snd_soc_device *socdev,
644 enum snd_soc_control_type control)
644{ 645{
645 struct snd_soc_codec *codec = socdev->card->codec; 646 struct snd_soc_codec *codec = socdev->card->codec;
646 int reg, ret = 0; 647 int reg, ret = 0;
@@ -656,7 +657,7 @@ static int wm8971_init(struct snd_soc_device *socdev)
656 if (codec->reg_cache == NULL) 657 if (codec->reg_cache == NULL)
657 return -ENOMEM; 658 return -ENOMEM;
658 659
659 ret = snd_soc_codec_set_cache_io(codec, 7, 9); 660 ret = snd_soc_codec_set_cache_io(codec, 7, 9, control);
660 if (ret < 0) { 661 if (ret < 0) {
661 printk(KERN_ERR "wm8971: failed to set cache I/O: %d\n", ret); 662 printk(KERN_ERR "wm8971: failed to set cache I/O: %d\n", ret);
662 goto err; 663 goto err;
@@ -734,7 +735,7 @@ static int wm8971_i2c_probe(struct i2c_client *i2c,
734 735
735 codec->control_data = i2c; 736 codec->control_data = i2c;
736 737
737 ret = wm8971_init(socdev); 738 ret = wm8971_init(socdev, SND_SOC_I2C);
738 if (ret < 0) 739 if (ret < 0)
739 pr_err("failed to initialise WM8971\n"); 740 pr_err("failed to initialise WM8971\n");
740 741
@@ -844,7 +845,6 @@ static int wm8971_probe(struct platform_device *pdev)
844 845
845#if defined (CONFIG_I2C) || defined (CONFIG_I2C_MODULE) 846#if defined (CONFIG_I2C) || defined (CONFIG_I2C_MODULE)
846 if (setup->i2c_address) { 847 if (setup->i2c_address) {
847 codec->hw_write = (hw_write_t)i2c_master_send;
848 ret = wm8971_add_i2c_device(pdev, setup); 848 ret = wm8971_add_i2c_device(pdev, setup);
849 } 849 }
850#endif 850#endif