aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/ak4535.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/ak4535.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/ak4535.c')
-rw-r--r--sound/soc/codecs/ak4535.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c
index e512cd79d767..088cf9927720 100644
--- a/sound/soc/codecs/ak4535.c
+++ b/sound/soc/codecs/ak4535.c
@@ -622,7 +622,7 @@ static int ak4535_probe(struct platform_device *pdev)
622 struct ak4535_setup_data *setup; 622 struct ak4535_setup_data *setup;
623 struct snd_soc_codec *codec; 623 struct snd_soc_codec *codec;
624 struct ak4535_priv *ak4535; 624 struct ak4535_priv *ak4535;
625 int ret = 0; 625 int ret;
626 626
627 printk(KERN_INFO "AK4535 Audio Codec %s", AK4535_VERSION); 627 printk(KERN_INFO "AK4535 Audio Codec %s", AK4535_VERSION);
628 628
@@ -644,14 +644,14 @@ static int ak4535_probe(struct platform_device *pdev)
644 INIT_LIST_HEAD(&codec->dapm_paths); 644 INIT_LIST_HEAD(&codec->dapm_paths);
645 645
646 ak4535_socdev = socdev; 646 ak4535_socdev = socdev;
647 ret = -ENODEV;
648
647#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 649#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
648 if (setup->i2c_address) { 650 if (setup->i2c_address) {
649 codec->hw_write = (hw_write_t)i2c_master_send; 651 codec->hw_write = (hw_write_t)i2c_master_send;
650 codec->hw_read = (hw_read_t)i2c_master_recv; 652 codec->hw_read = (hw_read_t)i2c_master_recv;
651 ret = ak4535_add_i2c_device(pdev, setup); 653 ret = ak4535_add_i2c_device(pdev, setup);
652 } 654 }
653#else
654 /* Add other interfaces here */
655#endif 655#endif
656 656
657 if (ret != 0) { 657 if (ret != 0) {