From patchwork Wed Sep 6 01:04:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaechul Lee X-Patchwork-Id: 9939859 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AA97060350 for ; Wed, 6 Sep 2017 01:05:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CCB820408 for ; Wed, 6 Sep 2017 01:05:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 913B328A2C; Wed, 6 Sep 2017 01:05:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06D0C20408 for ; Wed, 6 Sep 2017 01:05:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753725AbdIFBEW (ORCPT ); Tue, 5 Sep 2017 21:04:22 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:64990 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753654AbdIFBEU (ORCPT ); Tue, 5 Sep 2017 21:04:20 -0400 Received: from epcas1p1.samsung.com (unknown [182.195.41.45]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20170906010418epoutp01fc7fc2e9f9ae041d342f7f45c15796f8~hoCtNhed71763717637epoutp01U; Wed, 6 Sep 2017 01:04:18 +0000 (GMT) Received: from epsmges1p3.samsung.com (unknown [182.195.40.65]) by epcas1p1.samsung.com (KnoxPortal) with ESMTP id 20170906010417epcas1p101f9ebe3c0e812066ac038fc0b2069e6~hoCssNcEL0125401254epcas1p1b; Wed, 6 Sep 2017 01:04:17 +0000 (GMT) Received: from epcas1p3.samsung.com ( [182.195.41.47]) by epsmges1p3.samsung.com (Symantec Messaging Gateway) with SMTP id 88.D1.20246.1994FA95; Wed, 6 Sep 2017 10:04:17 +0900 (KST) Received: from epsmgms2p1new.samsung.com (unknown [182.195.42.142]) by epcas1p2.samsung.com (KnoxPortal) with ESMTP id 20170906010417epcas1p2b3460cf27e35e64f5e35fad98f554108~hoCsZMPv61694016940epcas1p2b; Wed, 6 Sep 2017 01:04:17 +0000 (GMT) X-AuditID: b6c32a37-f79886d000004f16-8e-59af4991ecbd Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p1new.samsung.com (Symantec Messaging Gateway) with SMTP id EE.C2.11757.1994FA95; Wed, 6 Sep 2017 10:04:17 +0900 (KST) Received: from localhost.localdomain ([10.113.62.92]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OVU000M22Z3W220@mmp2.samsung.com>; Wed, 06 Sep 2017 10:04:17 +0900 (KST) 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 2/3] ASoC: samsung: Use 'samsung-i2s' cpu_dai for dai_links Date: Wed, 06 Sep 2017 10:04:14 +0900 Message-id: <20170906010415.26952-3-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: H4sIAAAAAAAAAzWSfUgTYRzHe3bb7bQm1zR90kg7KUpw7ubUW7nKkrioyIwojVqXXjpyL+02 yfpHe/MVtRchREjIalm5JSJOQmNRUqlrplmkUlJY+Rb4RsGo267++/6e5/P9Pc/vxxdD5COS SExvtLIWI1NAoMHi9mebEuKv7nZkKV2DCmrQ6xZRdZ+/oNTw/ISE6rlfj1DT3ZUI5fE4pdTi YJmIetvZgFI3PV0iqryzRkI9myqVUF77vIhyLj0C22W0c+4CSrvqR6V0a3M5SndN30Xp6rZm QDvahsT0XOvaDGk2m5rPMrmsJYY15phy9cY8LbHnoG6nLilZScaTGiqFiDEyBlZLpO/NiN+l L+C/S8QUMgU2/iiD4TgiYWuqxWSzsjH5Js6qJY6SpEpBKlMUKpVKoU48tlmVxCMn2Pxix0Wp 2Y6fLf+dWAzssgoQhEFcDecH6lBBh8M3Yw5eB2NyvAPAD09vi/wXcnwJwPe1If8Nj79NiQXI CeCNIS8QCh6aaaqW+ikUj4M1TVWBVmH4XRF80vk6QCH4PQC9k42InwrFM+DL8p8BLcbXw45H i8CvZfgWeOd7iVh4Lxr2f/rIMxgWhKfCT57V/j4Q70Vh6bVLUoFJh6OeCxJBh8IfPW1SPw/x KDjwXCvwpQC6PywAoSgDsGuw8d/UifBVRUlgUAQPgTMLVRLBLINlV+QCQsNG7x+RoNNg380y ibCXGgDrBjJrQVQjWNYMwlkzZ8hjOdKcqOAYA2cz5ilyTIZWEEhWXEoHcPbvdQMcA8QKWW1r S5ZcwhRyRQY3gBhChMlG0hxZclkuU3SOtZh0FlsBy7lBEr+aq0jkqhwTn1OjVUeqNUp1sorP hYYkiQhZuOPdETmex1jZ0yxrZi3/fSIsKLIYXPY9WEnvaj/PRCDHMrtnYx86mrZtcrkSTqrJ PmW6IkWbFFIC1jVlRi8xLeGfe/eddIaN3l+qajgce2b6lCbykNm+we7qXpjwOQ+89a0Zb/Gl xX6cZRSltw4f74KVaZO1mn3LX+jRsPZp2/4det+vyfXOx9nDX9HrW8c26mbH7xFiLp8h4xAL x/wFVnq7zG8DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrELMWRmVeSWpSXmKPExsVy+t9jQd2JnusjDbqPillcuXiIyWLqwyds Fte/PGe1OL5yFrPF2/3dzBbnz29gt/h2pYPJ4vKuOWwWM87vY7Lo3NXPanH4TTurxcUVX5gs Nnxfy+jA67HhcxObx85Zd9k9Nq3qZPPY93YZm0ffllWMHuu3XGXx+LxJLoA9issmJTUnsyy1 SN8ugSujYX0ze8EKgYrOX8YNjCt4uxg5OSQETCQ2vnjD0sXIxSEksI5R4vDuT0wQzndGiU+n 21lAqtgEtCT6l/SwgdgiAsuYJL5/zAEpYhZYzijx6MhC1i5GDg5hAT+Jrl31IDUsAqoSO9Z+ YwSxeQWsJZa+bGSB2CYvce7BbWaQck4BG4kH5yVBwkJAJS+eXWafwMizgJFhFaNkakFxbnpu sVGBYV5quV5xYm5xaV66XnJ+7iZGYEhuO6zVt4Px/pL4Q4wCHIxKPLwTNq2LFGJNLCuuzD3E KMHBrCTCe8dxfaQQb0piZVVqUX58UWlOavEhRmkOFiVx3sy+GZFCAumJJanZqakFqUUwWSYO TqkGRqsSHZ6LXHKbG69Z5Tz9HrR4295/c5STQ+y3LtvoeUhkSrGEh+n1gK9Xw3bv1VlaZPrh 3bTp1guzS9r5D327Hv10nd53xazvakeuaBvvtcr6r54rLnduV5brrKat5q9mbN2waNKcVqNv 5fW+HaYhZTumaPJ//iFb5Ph0y0aXmpa657Lvc7dIzVNiKc5INNRiLipOBAAIbJNaRQIAAA== X-CMS-MailID: 20170906010417epcas1p2b3460cf27e35e64f5e35fad98f554108 X-Msg-Generator: CA X-Sender-IP: 182.195.42.142 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: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20170906010417epcas1p2b3460cf27e35e64f5e35fad98f554108 X-RootMTR: 20170906010417epcas1p2b3460cf27e35e64f5e35fad98f554108 References: <20170906010415.26952-1-jcsing.lee@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add specific cpu_dai_name to dai_link because samsung i2s driver registers two dais and components. Selecting one of them clearly is needed more information like cpu_dai_name, of_node. The reason why the dai_links have to use 'samsung-i2s' for cpu_dai is that 'samsung-i2s-sec' doesn't have a capture functionality. Without this code, cpu_dai will be selected the first one of the component_list. For example, if I describe nothing to cpu_dai_name, 'samsung-i2s-sec' might be selected to HiFi Primay. Signed-off-by: Jaechul Lee Reviewed-by: Krzysztof Kozlowski --- sound/soc/samsung/tm2_wm5110.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index 68698f3d72f9..710e2151141f 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -383,6 +383,7 @@ static struct snd_soc_dai_link tm2_dai_links[] = { { .name = "WM5110 AIF1", .stream_name = "HiFi Primary", + .cpu_dai_name = SAMSUNG_I2S_DAI, .codec_dai_name = "wm5110-aif1", .ops = &tm2_aif1_ops, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | @@ -390,6 +391,7 @@ static struct snd_soc_dai_link tm2_dai_links[] = { }, { .name = "WM5110 Voice", .stream_name = "Voice call", + .cpu_dai_name = SAMSUNG_I2S_DAI, .codec_dai_name = "wm5110-aif2", .ops = &tm2_aif2_ops, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | @@ -398,6 +400,7 @@ static struct snd_soc_dai_link tm2_dai_links[] = { }, { .name = "WM5110 BT", .stream_name = "Bluetooth", + .cpu_dai_name = SAMSUNG_I2S_DAI, .codec_dai_name = "wm5110-aif3", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, @@ -477,7 +480,6 @@ static int tm2_probe(struct platform_device *pdev) } for (i = 0; i < card->num_links; i++) { - card->dai_link[i].cpu_dai_name = NULL; card->dai_link[i].cpu_name = NULL; card->dai_link[i].platform_name = NULL; card->dai_link[i].codec_of_node = codec_dai_node;