From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751525AbdH1KBQ (ORCPT ); Mon, 28 Aug 2017 06:01:16 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:30743 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751324AbdH1KBH (ORCPT ); Mon, 28 Aug 2017 06:01:07 -0400 X-AuditID: b6c32a47-f79db6d000003732-3b-59a3e9e1b85d From: Jaechul Lee To: Krzysztof Kozlowski , Sangbeom Kim , Sylwester Nawrocki , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org Cc: linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, galaxyra@gmail.com, Jaechul Lee , Chanwoo Choi Subject: [PATCH 1/3] ASoC: samsung: i2s: Use specific name for i2s dais Date: Mon, 28 Aug 2017 19:01:00 +0900 Message-id: <20170828100102.17591-2-jcsing.lee@samsung.com> X-Mailer: git-send-email 2.14.1 In-reply-to: <20170828100102.17591-1-jcsing.lee@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrHKsWRmVeSWpSXmKPExsWy7bCmme7Dl4sjDQ5PNbC4cvEQk8XUh0/Y LK5/ec5qcXzlLGaLt/u7mS3On9/AbvHtSgeTxeVdc9gsZpzfx2TRuauf1eLwm3ZWi4srvjBZ bPi+ltGB12PD5yY2j52z7rJ7bFrVyeax7+0yNo++LasYPdZvucri8XmTXAB7VKpNRmpiSmqR Qmpecn5KZl66rZJ3cLxzvKmZgaGuoaWFuZJCXmJuqq2Si0+ArltmDtC5SgpliTmlQKGAxOJi JX07m6L80pJUhYz84hJbpWhDQyM9QwNzPSMjIz0T41grI1OgkoTUjK1XjzIX/BWsOPy0g72B 8TtfFyMnh4SAiURn2xZ2CFtM4sK99WxdjFwcQgI7GCV6drxkhXC+M0psnnmEFaajtfsAE0Ri N6PEhLkz2eCq7ndsYQGpYhPQkuhf0gOWEBFYxiSxZ9dpRhCHWWA5o8TF1wuYQaqEBdwlbrQ/ AOtgEVCVeLdrPtgOXgFribV/d0Dtk5c49+A2WD2ngI3Ewk1P2EEGSQgcYZM48+EXUBEHkOMi sWhTCUS9sMSr4zAfSUs8W7WREaK+nVHi0M2vUE4Ho8S+KwvYIKqMJU51NTKB2MwCfBIdh/+y QwzllehoE4IwPSTOLdaCqHaU2PZ2KVinkEA/o8SJ/7wTGKUXMDKsYhRLLSjOTU8tNiow1itO zC0uzUvXS87P3cQITlta7jsYt53zOcQowMGoxMN7QntxpBBrYllxZe4hRgkOZiUR3kpg0hPi TUmsrEotyo8vKs1JLT7EaAoMmonMUqLJ+cCUmlcSb2hiaWBiZmZkbmYBTBvivHXbrkUICaQn lqRmp6YWpBbB9DFxcEo1ME4qeu2yVq6guc41VK6CycX8QF1Va5mctvwcp023amziPtT+n8p5 zdRJ+fjCKUfMt+efbzqSOWu9wg/jlR2XbrZOnsft6XltecyODDeZ64vsn7RcKk94bmt52DVV w0LrHk/IvC8l69VEk5fOX3PtRbFaWKVuaO3DiRvVw0veRgRv/BNxiyngsxJLcUaioRZzUXEi AEiqNyNxAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKLMWRmVeSWpSXmKPExsVy+t9jAd2HLxdHGlyZJW9x5eIhJoupD5+w WVz/8pzV4vjKWcwWb/d3M1ucP7+B3eLblQ4mi8u75rBZzDi/j8mic1c/q8XhN+2sFhdXfGGy 2PB9LaMDr8eGz01sHjtn3WX32LSqk81j39tlbB59W1YxeqzfcpXF4/MmuQD2KC6blNSczLLU In27BK6MrVePMhf8Faw4/LSDvYHxO18XIyeHhICJRGv3AaYuRi4OIYGdjBKzV61lg3C+M0o8 vnWOFaSKTUBLon9JDxuILSKwjEni+8cckCJmgeWMEo+OLAQrEhZwl7jR/oAFxGYRUJV4t2s+ WJxXwFpi7d8drBDr5CXOPbjNDGJzCthILNz0hB3EFgKq2XxtBfsERp4FjAyrGCVTC4pz03OL jQqM8lLL9YoTc4tL89L1kvNzNzECA3PbYa3+HYyPl8QfYhTgYFTi4e2wWxwpxJpYVlyZe4hR goNZSYT39ROgEG9KYmVValF+fFFpTmrxIUZpDhYlcd7MvhmRQgLpiSWp2ampBalFMFkmDk6p BkaGUzcdGqbLLbKeJd+88uBW1YKZOS+nFZ+UPr5Jce4jB+U6M5/oL2/8/PZfnhlpeC/iU/fE a5MN03yFonVP+sx1Y9mgbyHBENjwZ5lF17Q7c7qqqyf0OSt68Oysdp7RKl+Zn5o6T/PgJO/9 vuqpdTwf2l6KFeZX/Zr2pKp5e/Rr76+9OdldS5RYijMSDbWYi4oTAViddnpIAgAA X-CMS-MailID: 20170828100105epcas2p18b821aec5caf1d690c33c2b1426d1a17 X-Msg-Generator: CA X-Sender-IP: 182.195.42.143 X-Local-Sender: =?UTF-8?B?7J207J6s7LKgG1RpemVuIFBsYXRmb3JtIExhYihTL1fshLw=?= =?UTF-8?B?7YSwKRvsgrzshLHsoITsnpAbU2VuaW9yIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?SmFlQ2h1bCBMZWUbVGl6ZW4gUGxhdGZvcm0gTGFiLhtTYW1z?= =?UTF-8?B?dW5nIEVsZWN0cm9uaWNzG1NlbmlvciBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG1RFTEUbQzEwVjgxMTE=?= CMS-TYPE: 102P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20170828100105epcas2p18b821aec5caf1d690c33c2b1426d1a17 X-RootMTR: 20170828100105epcas2p18b821aec5caf1d690c33c2b1426d1a17 References: <20170828100102.17591-1-jcsing.lee@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- sound/soc/samsung/i2s.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index af3ba4d4ccc5..9cdd36b9711c 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1076,6 +1076,8 @@ static const struct snd_soc_component_driver samsung_i2s_component = { .name = "samsung-i2s", }; +#define SAMSUNG_I2S_DAI "samsung-i2s" +#define SAMSUNG_I2S_DAI_SEC "samsung-i2s-sec" #define SAMSUNG_I2S_RATES SNDRV_PCM_RATE_8000_96000 #define SAMSUNG_I2S_FMTS (SNDRV_PCM_FMTBIT_S8 | \ @@ -1093,6 +1095,7 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) 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; @@ -1105,10 +1108,13 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) 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 = SAMSUNG_I2S_RATES; i2s->i2s_dai_drv.capture.formats = SAMSUNG_I2S_FMTS; + } else { + i2s->i2s_dai_drv.name = SAMSUNG_I2S_DAI_SEC; } return i2s; } -- 2.14.1