From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754086AbdIFBEf (ORCPT ); Tue, 5 Sep 2017 21:04:35 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:17618 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753658AbdIFBEU (ORCPT ); Tue, 5 Sep 2017 21:04:20 -0400 X-AuditID: b6c32a48-f79a16d00000362a-80-59af4991e15c 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 v2 1/3] ASoC: samsung: i2s: Use specific name for i2s dais Date: Wed, 06 Sep 2017 10:04:13 +0900 Message-id: <20170906010415.26952-2-jcsing.lee@samsung.com> X-Mailer: git-send-email 2.14.1 In-reply-to: <20170906010415.26952-1-jcsing.lee@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAz1SfUhTURz17m1vM1q95rKbQo1HEQlbbk59lZah1KtUpPqj9cF66GVK7k32 Nsuo6MvmTDT/yJZGqYmlZZu2REdYTExS0UzNRmZGn6YllNoXRZtb/fc7h3MO516OCJOMCMJE WawJGVkmm8Tn8ZvbV0fLS7faNZH5N+XUYL+bR1149QanhqffC6jOunKM+nT/HEb19TmE1Oxg AY8acF3GKVtfG4+yukoEVPukRUD135jmUY5vDSBBTDu+nsLp1vIXQrqp3orTbZ9qcbrYWQ9o u3OIT39tWpYm3IPiMhGTgYwyxKYbMrJYXTy5fac2URsdE6mUK9dSsaSMZfQonkxKTpNvzsr2 1iVluUy22UulMRxHrtkQZzSYTUiWaeBM8eRepVKlUEbGKlQqlUIdtX+dKtorOYAy+z8XCXIm JYcflQ5gJ8DowkIQLIKEGrZ1jwv9dyh8PGrHC8E8kYRoAXBiqgrzg28AVr89LSgEojlHw2ul n3cAWH65W/Bf9LmmeC4KJyJgSU3RXJSUqOXBe65u4AMYcR3A/olKzKcKIbbBzp4nwBfLJ1bC D/YlPlpMrIce2wju77Qc9o49x3ySYCIOjvUt9cVAogeHPRZPoHcSPPWmKqAPgR87nQE+HL6r bwR+gwVAt2cmAAoAbBusDDiiYFfhSZ7vxogFsKD9t9D/TjEsOCvxS2g4+NKG++lNsMWa56Ml RAmAA98PnwfhlSCoHoSiHE6vQ5wqR63gGD1nZnWKdIO+CcwtK4JuAQ96k92AEAFyvphy3NZI BEwul6d3AyjCSKl4ZJNdIxFnMHlHkNGgNZqzEecG0d6fKcXCFqcbvDtlTVqlem2kOiZGFRtD eZexRHy8+eluCaFjTOggQjnI+M/HEwWHnQCJOru2A6amdh5lrly7WJ4f+mwxGz+RkLWv44et 9tKIs0L2sNFq49U1btmoIpOnpJZU+45DR/hRd35tT2cT84bWN686MztT9mcbOX43tCxj1+Nw TJpiGT52q9IadNWTtDKi2uyU/nQNIXlFd69+ajrlg2fZmDmtTrNmUWvXlxXvSD6XySgjMCPH /AUb8O+AbwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrELMWRmVeSWpSXmKPExsVy+t9jQd2JnusjDXa/4LK4cvEQk8XUh0/Y LK5/ec5qcXzlLGaLt/u7mS3On9/AbvHtSgeTxeVdc9gsZpzfx2TRuauf1eLwm3ZWi4srvjBZ bPi+ltGB12PD5yY2j52z7rJ7bFrVyeax7+0yNo++LasYPdZvucri8XmTXAB7FJdNSmpOZllq kb5dAlfGxXc9rAVvhCpOTrzM3MB4j7+LkYNDQsBEYu1jwy5GLg4hgXWMEkf7utkgnO+MEp9O t7N0MXJysAloSfQv6WEDsUUEljFJfP+YA1LELLCcUeLRkYWsIAlhAS+J42cuMYJMZRFQlXix XhwkzCtgLXFzxh2wXgkBeYlzD24zg5RwCthIPDgvCRIWAip58ewy+wRGngWMDKsYJVMLinPT c4uNCozyUsv1ihNzi0vz0vWS83M3MQJDctthrf4djI+XxB9iFOBgVOLhnbBpXaQQa2JZcWXu IUYJDmYlEd47jusjhXhTEiurUovy44tKc1KLDzFKc7AoifNm9s2IFBJITyxJzU5NLUgtgsky cXBKNTCmBrgv7jw5e6JG8efKg1skfU/9m+paevJRYM28i0WXHyh+vXa1Tr+Ud54+a/jBE1Oj liTecKw70XmB6f6HZTqd6rWm7Fua1v2yvXPyVJ12T77r0b+N7RLxs5OeJEcu5Lojtn/+2UM8 sbUiKS0vD280dWeeoNWy4U7ZAdPpL25Euyw1VHTu3GKixFKckWioxVxUnAgAlxUi2kUCAAA= X-CMS-MailID: 20170906010417epcas2p208db637d89a670d01fa3dbeb78ff0da0 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: 20170906010417epcas2p208db637d89a670d01fa3dbeb78ff0da0 X-RootMTR: 20170906010417epcas2p208db637d89a670d01fa3dbeb78ff0da0 References: <20170906010415.26952-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 | 4 ++++ sound/soc/samsung/i2s.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 10a4da06c0a1..3aa2e7d54ea9 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1096,6 +1096,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; @@ -1108,10 +1109,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 21ff24e930db..79781de2f247 100644 --- 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 -- 2.14.1