From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751463AbdH1KBM (ORCPT ); Mon, 28 Aug 2017 06:01:12 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:15686 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751309AbdH1KBH (ORCPT ); Mon, 28 Aug 2017 06:01:07 -0400 X-AuditID: b6c32a46-f790d6d000003bf5-b3-59a3e9e1bb1c 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 2/3] ASoC: samsung: Use 'samsung-i2s' cpu_dai for dai_links Date: Mon, 28 Aug 2017 19:01:01 +0900 Message-id: <20170828100102.17591-3-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: H4sIAAAAAAAAAz1SfUhTURztvufeprR4zLKLRskDKQ2Xb875LJWikIUSg/xDk7CXXjbRffDe NI0Ki9DNrBUVmVlYSZZ9bE2z0jKZpFLptLTIPtQYfenqjzQrCHv7sP/O79xz7vndy5HgsglR pKTIYEacgS2hiLCQ9p5YVfzkl8u5CQ11NDMy7MKY05Megnk180nE9F2rxxnvoyM443Y7xMzP EQvGvOhoIJg6dxfGWDtsIqZnulrEDF+dwRjH3E2wUap2/DhEqO/XvxOrnS1WQt3lvUKoj7W1 ALW9bTRE/cO5UiPegVJ1iC1EXDQyFBgLiwzaNCpze/7m/CRVAh1PpzDJVLSB1aM0akuWJj6j qERYl4ouY0tKBUrD8jy1Lj2VM5aaUbTOyJvTqDyaVsjphGS5QqGQKxN3rlckCZJdSGftPmC6 RJZ7Z78RleCStAaESiCphL1j30UBHAGH3tuJGhAmkZH3AJxw1AeHOQBrHVZswVE7bBcFDjoB tM33Yv9Vw0eOAp+KIOOgranWb19KXsHgg46nwDfgZLOgmmrEfapwMhMeO3WY8OEQMga2fmv2 Z0jJDXD+5QweyFsFByfe+HEomQovOj1i30WQ7Cdgs9MZXH0L9Jz7QwRwOPza1yYO4Cj4seU2 CBiqAXS9ng0OFgC7RhqDjkT4pOagPxonl0BLz1/BLRF4KbRUyQISNeyb7g5utAn+unsBBB5t A/C23SM+DqIawaIWEIFMvF6LeIVJIedZPV9q0MoLjHon8LcrLuMeaBrMcgFSAqjF0v61l3Nl IraMr9C7AJTg1FLplEegpIVsxV7EGfO50hLEu0CS8Dsn8MhlBUahqwZzPq1MSVCqVIpkFSO0 Y7n0QPvLHBmpZc2oGCET4hZ8mCQ0shKkYqI9BzflHY49r+x4+3nNyayuQWpDXWTKvuzx+dWt VOV8zofRKcJRGJO4du66Lel3xhhdYWFXPN5vNbq7z9g0R2+4hupkyVhvOa+Kfe5dwg2cdZah AY9p5sWdW23fm4rTO7ln9q1lroKc3d7EbaM6bdXFxaZx7sTpTo27NvshFcLrWDoO53j2HynL d5JzAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCLMWRmVeSWpSXmKPExsVy+t9jAd2HLxdHGpybJW9x5eIhJoupD5+w WVz/8pzV4vjKWcwWb/d3M1ucP7+B3eLblQ4mi8u75rBZzDi/j8mic1c/q8XhN+2sFhdXfGGy 2PB9LaMDr8eGz01sHjtn3WX32LSqk81j39tlbB59W1YxeqzfcpXF4/MmuQD2KC6blNSczLLU In27BK6MzgN1BYsEKt5+fcfWwLiIt4uRk0NCwESi5+J61i5GLg4hgZ2MEqe3TmWCcL4zSnxY e5EFpIpNQEuif0kPG4gtIrCMSeL7xxyQImaB5YwSj44sZAVJCAt4S/RNaQErYhFQldj8bjkT iM0rYC3x/9oXZoh18hLnHtwGszkFbCQWbnrCDmILAdVsvraCfQIjzwJGhlWMkqkFxbnpucVG BUZ5qeV6xYm5xaV56XrJ+bmbGIFhue2wVv8OxsdL4g8xCnAwKvHwdtgtjhRiTSwrrsw9xCjB wawkwvv6CVCINyWxsiq1KD++qDQntfgQozQHi5I4b2bfjEghgfTEktTs1NSC1CKYLBMHp1QD Y8Nv+fc3flvO5OHabRLz75Z68OGwBd8ca2UaJ617+PqxcHzBJ16bdUJPp8wvynT/ZPWF1/DC Xos1Ost3FXs92271ckb3Pmb3DwXdsp5fxDeYPn/72knT3a5JXM7n3Tvxm3NMO65O1M2Y+Np4 j/7HWT3+xxyW3XwmcqNJZrnmZO/ZYeJmDx606imxFGckGmoxFxUnAgCWkIvNRwIAAA== X-CMS-MailID: 20170828100105epcas2p483d90d281f69aafa01d9acacc40c9da5 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: 20170828100105epcas2p483d90d281f69aafa01d9acacc40c9da5 X-RootMTR: 20170828100105epcas2p483d90d281f69aafa01d9acacc40c9da5 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 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 --- 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 24cc9d63ce87..f467ad06e827 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", .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", .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", .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; -- 2.14.1