ASoC: samsung: i2s: Use specific name for i2s dais

Add specific dais name when components are registered. Component and dai
name will follow their parent dev name, if the name isn't described.  In
case of this driver, each dais will have same name like '11440000.i2s0' by
fmt_single_name function.

The problem having same name is that TM2 machine driver can't detect
capture devices correctly. Machine driver doesn't know which one is proper
to use for cpu dai. The driver just selects to use 'samsung-i2c-sec' that
doesn't have capture functionality because the component of
samsung-i2s-sec is located in the first of the component_list.

I add dai name like 'samsung-i2s', 'samsung-i2s-sec' for each dais. The
reason why adding dai id to 1 is that it doesn't allow to use particular
dai name in case of when I use 0 for dai id.

Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index d7e7f4244d387c0ef7b24595d8bb2c7b26a58db1..8d5e1861abb1151194c127224d78938f01628e03 100644 (file)
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1099,6 +1099,7 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev,
        i2s->pdev = pdev;
        i2s->pri_dai = NULL;
        i2s->sec_dai = NULL;
+       i2s->i2s_dai_drv.id = 1;
        i2s->i2s_dai_drv.symmetric_rates = 1;
        i2s->i2s_dai_drv.probe = samsung_i2s_dai_probe;
        i2s->i2s_dai_drv.remove = samsung_i2s_dai_remove;
@@ -1111,10 +1112,13 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev,
        i2s->i2s_dai_drv.playback.formats = SAMSUNG_I2S_FMTS;
 
        if (!sec) {
+               i2s->i2s_dai_drv.name = SAMSUNG_I2S_DAI;
                i2s->i2s_dai_drv.capture.channels_min = 1;
                i2s->i2s_dai_drv.capture.channels_max = 2;
                i2s->i2s_dai_drv.capture.rates = i2s_dai_data->pcm_rates;
                i2s->i2s_dai_drv.capture.formats = SAMSUNG_I2S_FMTS;
+       } else {
+               i2s->i2s_dai_drv.name = SAMSUNG_I2S_DAI_SEC;
        }
        return i2s;
 }

diff --git a/sound/soc/samsung/i2s.h b/sound/soc/samsung/i2s.h
index 21ff24e930db6aa61933e2d1e63de8129e63a6eb..79781de2f24713ebee04545a07619b653f4f551d 100644 (file)
--- a/sound/soc/samsung/i2s.h
+++ b/sound/soc/samsung/i2s.h
@@ -13,6 +13,9 @@
 #ifndef __SND_SOC_SAMSUNG_I2S_H
 #define __SND_SOC_SAMSUNG_I2S_H
 
+#define SAMSUNG_I2S_DAI        "samsung-i2s"
+#define SAMSUNG_I2S_DAI_SEC    "samsung-i2s-sec"
+
 #define SAMSUNG_I2S_DIV_BCLK   1
 
 #define SAMSUNG_I2S_RCLKSRC_0  0