ASoC: Register non-AC97 codec DAIs

Currently this is done at module probe time since ASoC ties in codec
device probe to the instantiation of the entire ASoC device. Subsequent
patches will refactor the codec drivers to handle probing separately.
Note that the core does not yet use this information.

AC97 is special since the codec is controlled over the AC97 link but
we want to give the machine driver a chance to set up the system before
trying to instantiate since it may need to do configuration before the
AC97 link will operate

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 12 insertions, 3 deletions

diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index e33fb7e00d1e..29f2f1a017fd 100644
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -426,7 +426,7 @@ static DEVICE_ATTR(keyclick, 0644, aic26_keyclick_show, aic26_keyclick_set);
 static int aic26_spi_probe(struct spi_device *spi)
 {
         struct aic26 *aic26;
-        int rc, i, reg;
+        int ret, i, reg;
 
         dev_dbg(&spi->dev, "probing tlv320aic26 spi device\n");
 
@@ -456,6 +456,14 @@ static int aic26_spi_probe(struct spi_device *spi)
         aic26->codec.reg_cache_size = AIC26_NUM_REGS;
         aic26->codec.reg_cache = aic26->reg_cache;
 
+        aic26_dai.dev = &spi->dev;
+        ret = snd_soc_register_dai(&aic26_dai);
+        if (ret != 0) {
+                dev_err(&spi->dev, "Failed to register DAI: %d\n", ret);
+                kfree(aic26);
+                return ret;
+        }
+
         /* Reset the codec to power on defaults */
         aic26_reg_write(&aic26->codec, AIC26_REG_RESET, 0xBB00);
 
@@ -474,8 +482,8 @@ static int aic26_spi_probe(struct spi_device *spi)
 
         /* Register the sysfs files for debugging */
         /* Create SysFS files */
-        rc = device_create_file(&spi->dev, &dev_attr_keyclick);
-        if (rc)
+        ret = device_create_file(&spi->dev, &dev_attr_keyclick);
+        if (ret)
                 dev_info(&spi->dev, "error creating sysfs files\n");
 
 #if defined(CONFIG_SND_SOC_OF_SIMPLE)
@@ -492,6 +500,7 @@ static int aic26_spi_remove(struct spi_device *spi)
 {
         struct aic26 *aic26 = dev_get_drvdata(&spi->dev);
 
+        snd_soc_unregister_dai(&aic26_dai);
         kfree(aic26);
 
         return 0;