aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/uda1380.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-09-01 13:47:04 -0400
committerJaroslav Kysela <perex@perex.cz>2008-09-04 04:34:30 -0400
commitb7c9d8520564eca89da8733e5248c7ce8ee8e1b0 (patch)
tree2788d304f3e00e91cbaec157291270105af7e52a /sound/soc/codecs/uda1380.c
parentd2a403553ba7659d85dae2a05b1f3767d2fefcfe (diff)
ALSA: ASoC: Don't suggest compile time selection of codec access
Currently the boiler plate code used by most ASoC codecs to provide a placeholder for SPI access suggests making the selection of SPI a compile time option which is suboptimal when trying to build kernels supporting multiple systems. Change this template to suggest allowing runtime selection instead. Leave the drivers not yet converted to new style I2C access for now to avoid collisions. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc/codecs/uda1380.c')
-rw-r--r--sound/soc/codecs/uda1380.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index f0c80436b975..d206d7f892b6 100644
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -788,7 +788,7 @@ static int uda1380_probe(struct platform_device *pdev)
788 struct snd_soc_device *socdev = platform_get_drvdata(pdev); 788 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
789 struct uda1380_setup_data *setup; 789 struct uda1380_setup_data *setup;
790 struct snd_soc_codec *codec; 790 struct snd_soc_codec *codec;
791 int ret = 0; 791 int ret;
792 792
793 pr_info("UDA1380 Audio Codec %s", UDA1380_VERSION); 793 pr_info("UDA1380 Audio Codec %s", UDA1380_VERSION);
794 794
@@ -803,13 +803,13 @@ static int uda1380_probe(struct platform_device *pdev)
803 INIT_LIST_HEAD(&codec->dapm_paths); 803 INIT_LIST_HEAD(&codec->dapm_paths);
804 804
805 uda1380_socdev = socdev; 805 uda1380_socdev = socdev;
806 ret = -ENODEV;
807
806#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 808#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
807 if (setup->i2c_address) { 809 if (setup->i2c_address) {
808 codec->hw_write = (hw_write_t)i2c_master_send; 810 codec->hw_write = (hw_write_t)i2c_master_send;
809 ret = uda1380_add_i2c_device(pdev, setup); 811 ret = uda1380_add_i2c_device(pdev, setup);
810 } 812 }
811#else
812 /* Add other interfaces here */
813#endif 813#endif
814 814
815 if (ret != 0) 815 if (ret != 0)