From patchwork Thu May 18 05:46:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 684531 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DD69FC77B7D for ; Thu, 18 May 2023 05:48:26 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 7D4E21FC; Thu, 18 May 2023 07:47:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7D4E21FC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684388904; bh=XiBwgNldqNfPXA1xUaru4ezMKp6IHuzuXw7nG18iKYw=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=B7mRTqWNOBtVaLciLnKNTwB4JzX1kVmdf/DsUeWAhFfRrmBC+eZsWPex8dfB50EaE lpDLQe7Iz2iT+jqjn3oXclq9FF7mX0cGJDi1SIGMof0CgwDbpkPHk2rq8B9xs588F1 SQP0O/UrWq9wLzqiZ9YSzTOHRTENgyvlEXzpy5lU= Received: by alsa1.perex.cz (Postfix, from userid 50401) id DC774F80563; Thu, 18 May 2023 07:46:55 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 8DADFF80553; Thu, 18 May 2023 07:46:55 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A6456F80553; Thu, 18 May 2023 07:46:51 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071c.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 6CA31F8016A for ; Thu, 18 May 2023 07:46:46 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6CA31F8016A Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=nl0zKJaR ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N36CJx1AsDM7rDo2Uo3ps4rTTGGsUH4iB2vrtfmXbXfNFqsAMWkg06mmvloAm+q/pEJT+894Ci009E/Kx4cBsn5KAv00nb8FMRdG3PtMy/P3/1vISwoxG3QUyh+U7/CxuEn6PCNVf8uTDlLQcktKfgX+mhWZXYfLMTgkEDgnK3bc4kk28F58aH25ufFBTC9qmu4YfNbMtQKWRdVh8DKWb88f4ZCOMpXhiK8SvPzai/2WBmUvtP2I2NIqFXKi6yjz/zZv27/i0XdGDyqeQ6BGqaqFf3dGLge+Q5vZnhXO721j6NKg60dykIQfMVR9RqPkX22LhybjMJrqWI+G9gNPNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Q0yb6mqpLZyX1In82m/+o8LwaAmRuegmgEgVyvbsKso=; b=LUTl8/41ejLsNVRTU/wA5u5uXG4r+VxY4RxssFdjyIIa3lXJqOMXwYjc0UHR1ArECWONnFBwSSwodhtAgXsZm2WOtaOqV9/ElpHe0IQrikPSedCi3EHhOlLRjY/UrMZAtzeo0KWCCiKVBJRa5y0D3BRlPUFxxdfG5hKABl9cc7Rhb2Dt92FhHhVK4qrQ0edXrGmZSZoXZKsjyTlUcqJMJ7BCX/fmSBKzNMM0jBJDVnvQ1Bp4yNZ07ITskNs4LqMnf3cfHQYrLrl4PSkmGWBQqSqLQFocwVfwk6/Llx6s8lwe64CkSSrD0yQQ3KDQgLLxk1EOp6IQhLOcbcgDgQ36Lw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q0yb6mqpLZyX1In82m/+o8LwaAmRuegmgEgVyvbsKso=; b=nl0zKJaR1/sEf40X6n+e8uDyMaWumFxzQ0E/057L1CZg19xZNsPsgt2kCbF0zLlS+3CPgDlX4oQ302yhxei93ji3LH3twEjlpcz8w5om0FOdxhtMMRnQlkd0agHYHNeAJWqQgCNZxc/RG1XicWMVzP5tf6RiEjmgsxbgSVqmJC4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYWPR01MB10472.jpnprd01.prod.outlook.com (2603:1096:400:2f8::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:46:41 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:46:41 +0000 Message-ID: <871qjeqji7.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 01/20] ASoC: soc-pcm.c: indicate error if stream has no playback no capture User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:46:41 +0000 X-ClientProxiedBy: TY2PR06CA0029.apcprd06.prod.outlook.com (2603:1096:404:2e::17) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB10472:EE_ X-MS-Office365-Filtering-Correlation-Id: 80cdfc7c-9677-4550-8484-08db57634165 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /he/Pw5G4wzBBbnv8nYZzYNC8rwualGL89fBGrl0ijbzeiNnJ0pQ3fRqb8IiF2DONVJz9RGwIhw+Q7DwJ0Vssq/JnwgxdP6y8j4sp895bR/9Pnz7Nuy97q59rAaQ0BDwL8SJ9LnGmkUZcFEGzix359rK0iKB55/Fblfpv/jnhybyoGQPnljlKoJL2wUveIC8JiMQSQWyYQJ4HQYpJtznm9wWvn6tAkc3njNqq1gG5gvxsm4AJ4EDWTLF4zkWSZJH/E62VdpNIS0WU8mYrx2P0Q1CmSmA2KYH8/+TPIyGJKiWNYYCrWMdZgRMZmnjZj8zHa+/oxw7yZTksa1mpBSYTBfBaUMwADKvsvjzCnCykwxmiWiPY0m74PkVi5VshULXzrlhvEfrDv4987n1Lp7E2OwgkfwHYrAzxYChEcyPIHf0Vp+VMuRyngPGW6SMZouLgeL1LoqfepLJAg1c66ukkTCFhb8yY8HWF6UH095M8XMyhXrmlAlPTwHRhM7POtX3VwsmQ4V1EY/+qhiw5i68l3RQ36t6iGoT/LFcf0oYW99y+nUxnMEQh783cWswuVIZYcpu5z2hF0J7NclJmi8/t/5MjyedoH8uhUjRB8jb7/GHnQgxV5+8+CN9fNKxvl+b X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(376002)(346002)(396003)(136003)(39860400002)(366004)(451199021)(6486002)(52116002)(110136005)(66556008)(316002)(66476007)(4326008)(66946007)(478600001)(2616005)(36756003)(6506007)(26005)(186003)(6512007)(5660300002)(8676002)(8936002)(41300700001)(2906002)(38350700002)(38100700002)(86362001)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: u9Fuj/4YnnbQU9+rS73ois+qzfq3N+e+V5+Xjf9KFhrG1knWbua9KBo4Mo6DxSlie8JsJpcCvWmDkuvLMZnXMXeMgyGdq1ltOkBlMMYSUfPd8i6SeRblJfNGu5gJsNG76RFKhVi16mmekN+ZFiKF6fdUWV2c+ioFpOaiusf9t2aJwKSQHyjP/jKmd4mnT1U3nnozhJwD2iF9/Mjod5PgivflPpEtTLIBgzJHeMVdr5oZFzGAdC5u0CKrgrEQ9Wy1a4yxISxGNsM3oDT+vHYgzkIoZgNB6oOyhQUgGcf+A2v7skUSC+E+kBCt/1UyC6zbS47XS0mpkGB92dgN5IPtF2R1I35YZ820A85FodQAA2RL/bFvmRGbLZf2QmhBwbFwWWok4YVRXgFs+SLq0HEqgIDA5Bk0rmsta2BJH4TxkYkucxJugURsGpwWCI3DLGFKiIXIcr7RuwPNdfhQAApZXF5HOTQtVJyu/CocLd/gpwTs/Ef2xX3wR05vSqRHP4ptR+aGirXG0jpIsFsIDsAah2DyfnJ7cH4oQmZ9Rb4ExsBB5PtztHRThirSRJu1/bCVCTkAZqljcp1/NIPrq1g9FXtPhup7ONLNeyzilrqp6kuRtAjAmR/n3BPzk4538ZWtnCTN2qBRrtB9v7kD5DJFiuRdvAFjdduuHH95VyGpoFj1ypQQfoZpfmTor17pa44A3SdPhIKhGvNkb+0WluPi5ndmXTDTNvM/fK9xlaLr+y0SiadXCDp+/MxGfUDnE8DRL3rBc9biZt2GJH3e1rIJwC5twboBRwu0qeirVSuluMiZCwxmEG+nMD61TsCfYoj5nemIw4lq99a4ufj4Ybod5bCc7uKix1QuxXITA7r7BihWwbzOY0xvrRr8rApD0rESDMglHDP29ZI/3gXbMjmQiDgUpSyNeG8ZJbt/nOXtnfpKtvAAFYPPZhxH60iOHMmokNrAhsL/eTv6NRLHFFA/37dahJgm4QCh97PaKYR3A9r1Y3vgPFkhJ3ICjofvPk14MHxerNkZpkBzCYtDH8SphCxG3bg5ksxr+SrGTLiw4MNToCpQBJA8EdmncGQ023eIqPyoymkgs/GFMZZfi7fB3ER2lGB7a4QM/STiB0XEKAh/trRR0vHPEiqHAkUE8gkLn4HeKyEqyOf6xb/Obc3RDATePD/Oe0JBxdOc1XPUOMbi4XedB+7qp3bER714iXhnfbuW7JrTCTk3X99iEL1aMD5Wi/MQ+YwmymOMefNL5q4gknnYFhiw1BWgiSCfVJiudITbYUHDT3NBrvaupYDad7+G8fCJiQfHZ6b7uOG4c0z3gP3v1RTIoQ0Kvqk00Ipy3u8vBd+vnMlVO1tHLyMqOuyELzxY1nICDM7s+uvoJmcZQxa6NhOqL+psmR1YBX1lIBCc+I0H4sw5eAN4y8rrCCR+ahh6EPKKGox6OYzj/ZRZ3tzprO02lauSYeJpctkVk6/OoA3FFL62ads9h6xBxP+zU82n3F7UO7oo3idu9o+s5qBcZUMVIbOEY8GPuaIaCDaAXUyUirwHaRwe20Cvf8q9WmE3U/J5g2qo+B0cg2m+PWXhchbIpw76WqVpsR1mftWXqiqfVKYIkAHlfkP+kejRlGwUaqLbw4xFvfarFhQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80cdfc7c-9677-4550-8484-08db57634165 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:46:41.4945 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NUvHwp/d8UGtHHdSQ3k2OYn+OvoLr8HiFJmdd1+1WX8sRz6l+TTgnlWQOz35Mo71sIDQ/6D6cskVfFsd4I1aPP87C0Q2golfdGCsFz9MzA68C91T+5OL5+PnAWFOGRP2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10472 Message-ID-Hash: 4NDCAUEXV45YJ5463S63QUDOWR75M76K X-Message-ID-Hash: 4NDCAUEXV45YJ5463S63QUDOWR75M76K X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() (A) returns number of substreams for playback/capture (B). ASoC will probe the Sound Card and mapps CPU<->Codec pair. (A) static int soc_get_playback_capture(..., (B) int *playback, int *capture) { ... if (rtd->dai_link->playback_only) { *playback = 1; *capture = 0; } if (rtd->dai_link->capture_only) { *playback = 0; *capture = 1; } (C) return 0; } But it might be no playback no capture if it returns playback=0, capture=0. It is very difficult to notice about it. This patch indicates error at (C) then. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 7247f44faa1c..fe65994485f8 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2815,6 +2815,13 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, *capture = 1; } + if (!*playback && !*capture) { + dev_err(rtd->dev, "substream %s has no playback, no capture\n", + rtd->dai_link->stream_name); + + return -EINVAL; + } + return 0; } From patchwork Thu May 18 05:46:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 683427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C8BC4C77B7D for ; Thu, 18 May 2023 05:48:32 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 4BF7820C; Thu, 18 May 2023 07:47:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4BF7820C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684388910; bh=qNh+IXUGN2jhil3/InRMugvwg/UrW4/O/TQo9gJOSd0=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=PU8j07NBEl2nbbKN2UGVSkWPzzGLJSJpYSm7lDmz8KP8TzZtFJMxmJumNIC807STG Gvf+jWOlkLIVKbV5fEaTeMkO7Wf9gmIHJvbA8/3B+f9+TxOJ7araSbqgUZCUzSI1qE 11zbLJMNavLEUD1g2R0w0+lvJRdjOrmO/wXLTOtI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6093EF8057A; Thu, 18 May 2023 07:47:03 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 00BFAF80568; Thu, 18 May 2023 07:47:03 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1B403F80568; Thu, 18 May 2023 07:47:00 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::72f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id F2EB8F8055C for ; Thu, 18 May 2023 07:46:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz F2EB8F8055C Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=hdljML4o ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cHgvxrg4ucIWJv977zhN27A7qmBW+5Ln+NTndldd3JGGXnlSZHkdHJEk+lDmiwMl90dQksru2gH/Nrkjk+wjCUdcJ/ZZqIhYwdgZ2I7/1eXl8LmsLvBk4iGWoSjDKUT3a1eILMksbi27LhGJvXJ15W37+WYaeWcWCaYC2BxrGfSiSix4nMaJngeKtepBpuZZOMW1BmskLRC7aDFLb3TOr8M6rRV/Fn1gA9auTaA2ICzlC6QylWrI/OySsLxFufTKJzYJRqExgA1B1IRcVp4KFjMABIhQuLgDZK6nBkJHkvXkcpMXMIQtT6AiXSXW4tr2I3nm3jMEuZpqPqcsQzKzxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=s+RurxIIzOXr/pISTtjibgtwwDr1PTNeFrcaG3wA+6w=; b=H2ZnGrWUQmus1gsBLGiY2ih3MYp/4ndx8PrVLQF132aDGAauuF/ZLEka7ozrEPJGFgW1Q1+9mgMEGrsQ2dX9Kr0G/naU7JfBYX/kG70SJ2CMzPLEkpubzIf2qd0HJ1/cae1aomfOiLaF/EcMJVKBifTC5NCWVssLrdeFgN0hlbsBhDDTpEBZi3oyNeGJHJbfXN1It3dFTU9LJTem3X8coFXe5Q4LJ+9woppl9Xy2zrZpKDM/mOfv914RkQq+D4QcQAOrTMFZqnZf0XLbNJ2zJi3Xji31Df7lGWJPkayQswfSZSvSDYFKX7T/xM83O74ZtZwCAckPho1Lw+hSX3wY7A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=s+RurxIIzOXr/pISTtjibgtwwDr1PTNeFrcaG3wA+6w=; b=hdljML4opl4hHiH7o4eyFxx0YqkFTBZBHGpixo+GHhNiyyIPzegx1AWUud/myOhh5ePJm3lZ+l9Ybg0p3AzQP39K7g+ATjamJG5s/oiuzK6LTitYb/KcERw7EM6NRkItGsJiIZI2bKDBc2APsdfzvt5JNCk94xIwkY9c6u8tHuY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYWPR01MB10472.jpnprd01.prod.outlook.com (2603:1096:400:2f8::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:46:50 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:46:50 +0000 Message-ID: <87zg62p4xi.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 02/20] ASoC: soc-pcm.c: use dai_link on soc_get_playback_capture() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:46:49 +0000 X-ClientProxiedBy: TYCP286CA0019.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:263::13) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB10472:EE_ X-MS-Office365-Filtering-Correlation-Id: 8cb0312c-58c4-4591-9ae9-08db57634684 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vvr5VhO9i/Kbp8gKEguA2E3yUXsVZI2j6/WnLdYsZs7zBEFmNoEaAAnddae+P9DEkwW5to/KBgMphcfRMeLkkj0rb+TjoCdXxnbqzZdyceQVLNMGMHA783yNTftVIr6GJtULeWIlwS7RcEbsaw2qQurRpGMpq+7ZzlXcrEFZB8HtHbupp1rgPv1nEpqMAu6ROsXvQYOF/U4Rsxls/OpjObE5vhM9u4fnFYf6794d3P+YeScsJAXH0HTHdUtDApT1t7vlNv+K6VlZB3vyV5pbrxwyyYPjXveNKhjTnYdqe93r0sECZjd9AdN/LQTFVJVFpvfB5oz303IuPsXDC+2ul1aSCpauaTwyl2B6GwGXLJUwdxseTHZZsaQY5e/r5S2qDDP+xV9ZQeEWOdX/QVanAZ8TKB4G7bPp5O/cDAkJLAJfGyhSbF7PMZ6JBHsSVCUCTb3PgjWCm1/Y9KoDOPOhqxPB/xjp3tjgz66c/g+5FqTPuLnU65898nmnZiWi0WkKQ7mO1JEan0kNFzHUYurAed0sjOKvXsFpqgAhgFGo4oFJfnB3oseQoByTISbJ5bc7exzU9Df6KE5xfQfkdGhWmxwx9hCwUyNCeN2X9ElP0vEUOdln3voJ1wo6kRt0DiB2tiYHzMmcW8qILVPBsXelog== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(376002)(346002)(396003)(136003)(39860400002)(366004)(451199021)(6486002)(52116002)(110136005)(66556008)(316002)(66476007)(4326008)(66946007)(478600001)(2616005)(36756003)(6506007)(26005)(186003)(6512007)(5660300002)(8676002)(8936002)(41300700001)(2906002)(38350700002)(38100700002)(86362001)(83380400001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1AohM7OKgsxEUFi94rEyPVRCO8sh2w5d7xqVfIBDgfsBqDYUYUyQL5otxvFxs2ko4e769dYPBraKFvr79v/4CfM4aYrRoDTre4QQ3m9aKaOSp5Axw9oZuoLqT6hqo0u1DbMaywZj0D6/HkYkhCLhgi32vnSauccQzP/B3NHjuWWCA2GxvqW3+DkAd0yBWPci9MpwRPmusG850LI/qaTL8Mn2y19RNSlgQo54okmQUO+xjr88etS0cs2lCx8gGEGVL7hCUtImHcVh8sOiVesdJfiOf9MLb5PpFSmlOFIi//oOGNyq4/Aa4BLIv7p+zWN0Jac6vuafpTU12DZGy/IHBFNu32a5qPMYv4XErKaVTd9AZ2XZEdp8Z5od7yGaCQyAX+qyuNb7I673XZjuw+nVDP7Cut4i6YJEHRvA2ByUuAZ7OyR7ly6NFg0mK11oPemPHStzG0d7FJwOTA1pPVCHmPfTK6Gcluqgm6dfSh0Ll25bjg+px9rGFkjt3s6W8LDyVJ/2mTxIXwHkplAxwH39ngAoz78fBhB5YJhQkTqIQCaz+TNdnYsxoOIRM+6yXUPfxovhPq0L5dXioQ1Gn1Zk+NX2Nwz2aukxqjva3i+v42nmrhcRmAonOq5BUcGNl6kn5outOhijcSqHGcYcAGYbDws1CtBPWlI4zDpDYhvdx5VDUNCfNz6O61Aqmm61n+B0LEJJzJckzWgdw3cRAEpm+MdxrUIoJVHEc6V26LaDr5Ekx9jNEX6mOGNp2qdAjNieSartFROvdTP866rObHXwz9WoGnkvF1ONln80NdB9w51XE6gZOdUljb2WgvMgFgC7NBkKcmhWnLunHJBpCzg1Jyxh9MO1DVxq3Uf67XEwbq3XB2tID8VfWauli1Wj8mTt86YWf3srLcTDirn6j2zEST/5DO1wWs6AvmLsfIF1Exx/ICZdxyd7RgBvAWROcXGN2CU0JQoFjBMLXRn8ar0lu8zmh+O+PMdMh9lq+7PDcIUxJFaOnLzrTVUsQ/Z7Xx7RDxZ40XFV9l35HLM3QDRnCS1IoM1CP2f6A66i1jDbEjbiwrjtw5Md9e3k6ToiNsVYVFPfAB7IrLcBndXlxq2Y6718O12ZpQcUgZbEIU9/Rm/xN5WbXtC7nambFqijJa9j2lgUlMGm5H8sRy3VzblG9SZ/b+TBsSGJ4oG+hrW+aWQxDwQO89uc23MjPlha5qRznOheetW9ChHvJwmOEnhujDXMu+t3H5BPjf4j1BCuh3oBFX/VqsKkVvfjfnu+xkcLf3Tre0oK3DPmOXvwiXU4tFZ6xOlZSkfsWI41LbTfq8ly0Al5bNvqByyxASbvWzN6EXMfHK55EpwMW6rjtrCFBk9UBP9fIv52WaYOlOK6RhSG0g4JFOXYlxzj9H+8+g9PVE/iCgrmVsn9XtUTL2gNF2q91wYdTB6LidVw19STnN/y50Xd58L718tASW//N0495GnrcLMJLgrJFnngkLcICzWXMzhIbZ379cIsBJIrNuMheDJza7LlQKjfmr3zV9WT3NnEig5Hg7UfmqTyq7UDqYMlO6ovbaruVQwnDBPFKgKtFuWbrTLbrkjPOtCIKllB7ziBgRnQHBQfcddZbNY70NH03j1+7oEZrXKxoYzngyA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8cb0312c-58c4-4591-9ae9-08db57634684 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:46:50.1072 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: d6Jb6WK18IuNW+NID9WUxEvwzGQqHb9FnXrJsNMOtwZWCsVkpSCaA3ZNRvDbnf4mvT1EpS1Iei+RSY+XGrteNh6L6KNJu+gXd8Gdh6I4dIXHDCNlgDRX940LGiwluxU3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB10472 Message-ID-Hash: AW2BPXEWS56XG2NINRJ6OCE37UVW3GRT X-Message-ID-Hash: AW2BPXEWS56XG2NINRJ6OCE37UVW3GRT X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() (A) is using rtd->dai_link->xxx everywhere. Because of that, 1 line is unnecessarily long and not readable. (A) static int soc_get_playback_capture(...) { if (rtd->dai_link->dynamic ...) { ^^^^^^^^^^^^^ ... } else { int cpu_capture = rtd->dai_link->c2c_params ? ^^^^^^^^^^^^^ ... } if (rtd->dai_link->playback_only) { ^^^^^^^^^^^^^ ... } ... } This patch uses variable "dai_link" to be clear code. Nothing changes the meanings. Signed-off-by: Kuninori Morimoto Reviewed-by: Amadeusz Sławiński --- sound/soc/soc-pcm.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index fe65994485f8..db3fbe1af2ce 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2731,19 +2731,20 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream) static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, int *playback, int *capture) { + struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_dai *cpu_dai; int i; - if (rtd->dai_link->dynamic && rtd->dai_link->num_cpus > 1) { + if (dai_link->dynamic && dai_link->num_cpus > 1) { dev_err(rtd->dev, "DPCM doesn't support Multi CPU for Front-Ends yet\n"); return -EINVAL; } - if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) { + if (dai_link->dynamic || dai_link->no_pcm) { int stream; - if (rtd->dai_link->dpcm_playback) { + if (dai_link->dpcm_playback) { stream = SNDRV_PCM_STREAM_PLAYBACK; for_each_rtd_cpu_dais(rtd, i, cpu_dai) { @@ -2755,11 +2756,11 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, if (!*playback) { dev_err(rtd->card->dev, "No CPU DAIs support playback for stream %s\n", - rtd->dai_link->stream_name); + dai_link->stream_name); return -EINVAL; } } - if (rtd->dai_link->dpcm_capture) { + if (dai_link->dpcm_capture) { stream = SNDRV_PCM_STREAM_CAPTURE; for_each_rtd_cpu_dais(rtd, i, cpu_dai) { @@ -2772,7 +2773,7 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, if (!*capture) { dev_err(rtd->card->dev, "No CPU DAIs support capture for stream %s\n", - rtd->dai_link->stream_name); + dai_link->stream_name); return -EINVAL; } } @@ -2780,15 +2781,15 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *codec_dai; /* Adapt stream for codec2codec links */ - int cpu_capture = rtd->dai_link->c2c_params ? + int cpu_capture = dai_link->c2c_params ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE; - int cpu_playback = rtd->dai_link->c2c_params ? + int cpu_playback = dai_link->c2c_params ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK; for_each_rtd_codec_dais(rtd, i, codec_dai) { - if (rtd->dai_link->num_cpus == 1) { + if (dai_link->num_cpus == 1) { cpu_dai = asoc_rtd_to_cpu(rtd, 0); - } else if (rtd->dai_link->num_cpus == rtd->dai_link->num_codecs) { + } else if (dai_link->num_cpus == dai_link->num_codecs) { cpu_dai = asoc_rtd_to_cpu(rtd, i); } else { dev_err(rtd->card->dev, @@ -2805,19 +2806,19 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, } } - if (rtd->dai_link->playback_only) { + if (dai_link->playback_only) { *playback = 1; *capture = 0; } - if (rtd->dai_link->capture_only) { + if (dai_link->capture_only) { *playback = 0; *capture = 1; } if (!*playback && !*capture) { dev_err(rtd->dev, "substream %s has no playback, no capture\n", - rtd->dai_link->stream_name); + dai_link->stream_name); return -EINVAL; } From patchwork Thu May 18 05:46:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 684530 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9F127C77B7D for ; Thu, 18 May 2023 05:48:54 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 033A0825; Thu, 18 May 2023 07:48:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 033A0825 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684388932; bh=0XrP3QiNzZDlqWLURlTP/Qv4qUECjcZtmMcab3nr22c=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=dpyIs3yJf8qucihQf6YhhCTBf01SvskSjHbEjMoUSELjnaSrvDZZ3Yl0v5rX3uSIR cl3Dx1BVNhubhaXl0hIPk81AXZ3GKFtkdzmuKHFw25Mz+rg60mzHFPEkfbhZN/kLhV IrHeAF/qpT67Ahxv1EQmJK4pFjiuhpKsK1//O+aA= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 220B9F8058C; Thu, 18 May 2023 07:47:13 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 18250F8057D; Thu, 18 May 2023 07:47:11 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AEEBEF80567; Thu, 18 May 2023 07:47:06 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2070e.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::70e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3393FF8055A for ; Thu, 18 May 2023 07:47:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3393FF8055A Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=Ohd3zssM ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DHDQU5CDUtuOKMRSIiJ6vtiKGiyMKiY4N8b2xdV5Io3alFjldhBO+TuUak6qVXU9iTgB/S8jUR1FJfqvuQBRyYCS2NuuQweGTFQWGtU44CvwqQuSJBGqvFTZWFu4DLWXmxvqtuGKaIwdJ4o83cpGI+WqhQhVhreiG4us4EhwIuWT73M+ewoSMKpmRyB3mqDVApXmLn7gJLkw7B/txuNJk4unZym4FEjfu4hi3dtxgF95aXHCHRoocyG0qoel9X26TcdVm3GGxlimx/DQNL2UOhgCtXSbEL+ZK1Cx965pY0LLXID8Kp9WZ50no7cdUwZTLvBgHfgaO/aXVuZQSI6lCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kbC9J7u9asaBZu+6PuDp+82D9GXFg9a1UH4ql53Qz+8=; b=kT/sYJxZDfp9JaA06fHNonfEQPJlyoOGJTw/RqbqWSnhfwG45Lvmwp67ccoy3p816fEGXPAmqM2UYXKIUoQkcvffnawhyFZbJgKdBKBOqqnF0+JCwLVQ5aFqz5TJPLdz/mN+qkyVS6BIAQUIT9mRCqvEBCgQYLLm5faU1GZu3XTGxWc0QcjJYx7++texBp+SLGBaD/kJYZbj0lmsTWH68TZZj/KY+QDwa/lLTBD/vnF9CoBWzYVUIef8J8b+qaaKyZwVj90DJEr+pCLzV3DPjkQFiOqgnPSzDZWxbi5yOa4EXz6Hrfh36LWIQsaEZH69oNAo6eDc7QtOPYXexReJEg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kbC9J7u9asaBZu+6PuDp+82D9GXFg9a1UH4ql53Qz+8=; b=Ohd3zssMFjYnmiEhyg7QqKwwSxJF1gU03Q82Mksq5kC2e1p45dae20Cs2JcXhQumgTHd0Je4v495CrEuWz0NEtrZNmCvRU4jig4KQ47OJTTJZQgxNTAbq3NXdVm1Uqhvaw8OK6qQkVuoAvam2lE3/wv1qibMJSnogZySCVsVoPE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB5591.jpnprd01.prod.outlook.com (2603:1096:604:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:46:57 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:46:57 +0000 Message-ID: <87y1lmp4xb.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 03/20] ASoC: soc-pcm.c: cleanup soc_get_playback_capture() error User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:46:57 +0000 X-ClientProxiedBy: TY2PR04CA0007.apcprd04.prod.outlook.com (2603:1096:404:f6::19) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f88357f-58fb-4aff-4a80-08db57634af3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YbSmi1qfMmIP3NHpx72lj1I2hbCRhVMXNNyODKgUz4GgxkuELJAkTp5GqMNoj/NRt4FNfQpE6eKiEVtqIjK4zwASIjyF+uQcI2Pn7pHuAdWhlMwxPq/z6EOucINa9zSC2CYPzXVcaU88vz6XLr1ftfDSDE7JhHm0IdIyfpoGXhYLLe/fsI+4llCL0K6tjoMD62izG3QTMMWwhZlPEX0PRx8a/aAY3tD5GgBxnenQvmkhZVza9OGmh8+gL3AjJJj+xT43/iQmZzi6mO9lApcjbNoqZl2mxG6abKk+4EXFbJp7aQaGr+F/8yw/g7/FECrNIomvGJus1poPRCcVfnWFLG7aAASfvx+n0wlBQpwjmWr5PFgFSWavK6ZH3tDqGLnz/nop2iaA87UpeeD8anLa1bOVeWjCjHY558SbUm6CVrsjwP9pJAd/nVEjf2hyEjHJcOZJtxBT9hMdkjiPoFX6mla4yh2oPq8YKA9zvdfKFiPTAjsn3G2H63tJIrSd2rakoJNQQYiTvaKXEz3oMGXFoi1ZGB6f8wCG1Ip1grwOEmp+lSDKm19Ywi/x0y0hpyvfqwxQIDmkl/yvxHej1FZ18sJY49dpk9pFInIg+b8jblgtetdLxOsWFCzedfyZ7D4z X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(316002)(4326008)(66946007)(66556008)(478600001)(66476007)(52116002)(110136005)(86362001)(36756003)(83380400001)(6506007)(26005)(6512007)(186003)(2616005)(41300700001)(6486002)(5660300002)(8676002)(8936002)(2906002)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1hku1ie4eqdRbXq71dS8wP5jBeMYC7+wZ+eFfAqWR+GaERpWjhtw7sk0gWHSsuNYlLaDNwPeuj64hV7dYYEsPJK6k6o15ioqYmhEA5koUozMndJqhWk3qc2Jb2dXoDdGSJkHeineDM1EDnJo5TAzUXFdVA96Ruxtstt3hxnJYja7wDAKw/aqC++6aw9hWeHDyARyXZHoipKrzQuwZv+urPdow+NeV6EII+/UCmm3G3hlzhrV+hjBbLVSgRv1IP/Dh56qTb953QofKujKAQkdvqKA6cQnh2S3TghORMA4fCMPy1CKo2K2mgD1p0wPGGV0dhkXrfbIjPz9esBsrws2Qp3b1fkzublDKPrcf4B7XjGex7akEJu8bAwsljiRt804JmbGIWdhkDBEeHKyyomLUH26Kd0OPsKXPfhKxR6PZOiJ+ngxYmZ4omWAK7RkRroUIFLyEhi/hY/lZ1g95XZrgaQOyJ/hfFGOVulTUav8cjEpvQ7xPNdwQIcWG7gTZZhdok3NZdisQtysfgruar5bOP2sNrHH2A/8o2i+qs4DhPwGvJqTNRegRNnZFfxjTjN4eoTw6OzvCUpkFE+C4Dgv6TeAq/B1kkbYSm/35sZ12LeUZdJIWVmXiO571WMmJQQFH0hygLVS2ypNc2jw6QPC4wN5i2oX/viogq5S1Jhl97UamDZmfoUKjuZAiOOdmkrq0fP9byxs57hXsfeAVjusslG1kCpEXiU0bK/6kX+k+WPpBZ/4RL2SRW1DX4pzVhKJR4AGNamlqSKTMMTT/slhDPzxuiczIfKxug3VHDjOKSuL0Ev2zKoSLeKLLNpwN8eeWehnwREzUBQ+s8y6luPtfZC8rlsPLbhgh6yj5aF+Zr0wOBTyybGY2QYhED1xgAAHBS/Dn6D8cdKU6OfsfvlNbwEUa1ZPCv+MSW8+TnkrpRMywsBd5rNneuP9cL5RniQX+xl7RFfAmBDTUwQ1FHzBUslmH/fFg9ufGNPA5bmmac8+89M890fS1ZPgb1QOCXo00u/MQ+7xskLQ3IicOVhZlDWC+TPdgXjx6E8jGzPzx7cohYphqTURmtNL/KVPTpkmBPdV+yQ/UaPnRcl/JgmHUkzZnwnvt4vCAO8o5dHdXx/Mn7IUSBjMxoazBhodWMPmHPKnQAFfMueF/3hKNkPsQgaZNyR9DPCAO+yi+nsK/uBexaW9314M9s4Hnzc1Xhp9u8IAYYVIkSXmIQvd/k1qDGSZd1znFROV9Q7AgyXrLF4Ep+2W5oWpJ7+KGRRskaigQVu+oan6H9u9NaIkLKoSCNIaNPdap4K/gIKwjTuq8Rt/F/apEWkPkSkwPVzdiFFGRnaa0PoEZYGFW/dNnn87ABuqpQeENgXSohNN5UBlhlXRZkwCsLA9xBKUkEde4VqxZwClfOLlYX8LwIpP8LmZY0eiviPZ4hNUVccTlVZCDD5ZVB/zGqQ+4PkQdhGYJhZpcokpTXH+meBge7iLxpDHRnHqOXwfqaYj8MNOGrXJ/eAIepoOHyQDs0FhL0wr3xhKrSu5/kl9aMhWGQcQR7zG6GefJoBudf8c08vQAhBTGHnaMBkWVLAcgFaz/6I0o1kOhc2zqUYrwRa7U+0P78djGixh8cm2Bm9oQVJxziICrqc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f88357f-58fb-4aff-4a80-08db57634af3 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:46:57.4914 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UqT92bdgjlrsE4txBQbD4lS+XzQ+AewgA0WSH1T3WaEoHf4sojuvw57YWJ7271XrC9KegEG3U7UxgKTD7jniFHTyoyDGgITiR4vC6lnL72V5zr3ApUrv+ef4PWAXWQ77 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5591 Message-ID-Hash: MZWKUCOGUV34YDSPITK6DVPGI34L2KIN X-Message-ID-Hash: MZWKUCOGUV34YDSPITK6DVPGI34L2KIN X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() (A) checks dai_link status, and indicate error if it was not matching (B). (A) static int soc_get_playback_capture(...) { ... ^ if (dai_link->dynamic && dai_link->num_cpus > 1) { | dev_err(rtd->dev, (B) "DPCM doesn't support Multi CPU for Front-Ends yet\n"); | return -EINVAL; v } ... } We can use 100 char for 1 line today. This patch cleanup error code line. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index db3fbe1af2ce..47da3be0ff46 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2736,8 +2736,7 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, int i; if (dai_link->dynamic && dai_link->num_cpus > 1) { - dev_err(rtd->dev, - "DPCM doesn't support Multi CPU for Front-Ends yet\n"); + dev_err(rtd->dev, "DPCM doesn't support Multi CPU for Front-Ends yet\n"); return -EINVAL; } From patchwork Thu May 18 05:47:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 683426 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 85656C77B7A for ; Thu, 18 May 2023 05:49:16 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 09E581FE; Thu, 18 May 2023 07:48:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 09E581FE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684388954; bh=f9t7pQvIAvG5diIuB3H71jbef+GhX+JHpo5wnTz5Awg=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=U6ligBVdQ60ZEq+YBcFHW4IeB9lZP9MPnH0OdCpIHwcjogll3MSr2M6SP/x8CNSwp r2Nknw7ixDh+TM/9/eg4WxcRqbLi6bJkQWXRSV8V3VDH6ErmvgpZkO3CPr4FLtNp2T FcqffbQ3l+yPRFsqLE0YSk093RqEEo32SgyE5Ve0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E23F3F805AC; Thu, 18 May 2023 07:47:19 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 76E2EF80580; Thu, 18 May 2023 07:47:19 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E6416F805A8; Thu, 18 May 2023 07:47:16 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20708.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::708]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 61609F80568 for ; Thu, 18 May 2023 07:47:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 61609F80568 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=gagUnPBX ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G6mRZBkM9okLJsku2rA/dK4kmsOmZulpW03/y+Jma9g7w1ktiBreQGv/KZV1eIvt7ZiGZabCPWxneclerppD3CiNDHLao9ksaOb+UHzhBVaqM18TR767ZAmAEavG4AY9iiU0/Nxnrxo2zphwuZIEQvE69NlcGxMj2bvS2Z9hx2u/x5Kw6+HT+FAK9pz/9R22I6V4styPqNhTwCUuk9trGysbyViEytadj3VNowKKHgjLhqfBouuxCqkTPgSDUS1uHLEQQKvXb5MeSe19zz3Pb+VREF/1ox4waf6fw/Wuf6PoJM3AbmtOqZPh6niQmHwzDewHTrrMQ7dvz6WaASSGPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ULj13shoB+QHIfl0JEO9eMZ9W4jdjGLeAGLTOaLQuh0=; b=Hq9qJRUiuYwbaSK3EZJGPuYZIY0z9hExvbp0kuw1O3tgtvXBcU5YrQUwMBIFj48DQtmcAor5WkF21sSripUbub7zesmy28+ySh93H9bbnIcMnv60sTXpvaN4A3zx4yVANR3306CBsjo97ycz5EGLQsUV7Qs8POFCg5p8PCCMhdKZUZhasLmkYLBBVreyy3QnI1cf3ifdZneUftJdQ+HwZBCUp1BMgOlYh3Jw2I0qtJXRlxutD4Xy7W9wCCa3/lHe1mq4y0ozkPc96v2Ui1GEdC7vqJqJ13aWmG9VlJtHzOJrqBGGyM6HjX/WHG1yXiKcSqWT+dW9d7JSQbkFDL2lYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ULj13shoB+QHIfl0JEO9eMZ9W4jdjGLeAGLTOaLQuh0=; b=gagUnPBXGRv75QwrsCeXXlGcMaiUUoUTZIY9SOu6iSCV9HPOCJRy84eq7A2rI1+JQuatafcXpbuKBWBnri7Zjrw8li/bjKaFulYFtOOnE9yCTJr2AS3lltcQG8Q55TF08C/OZk9C+KV/pKMOlGaulFxE1ptEsWXtehdD1S9XLY8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB5591.jpnprd01.prod.outlook.com (2603:1096:604:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:47:04 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:47:04 +0000 Message-ID: <87wn16p4x4.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 04/20] ASoC: soc-pcm.c: use temporary variable at soc_get_playback_capture() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:47:03 +0000 X-ClientProxiedBy: TYCP286CA0176.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::8) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a334975-29e6-4f3d-4073-08db57634ee1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YAwRe0sAoiWKQA+TnAyAF2XRRjt5N2xWBX/66W786W7sE7aU1sSkNt/0/JraFjyE06xunGcLoXEYU+KnpZfXkbsrZFkNU3R7pibMyIG8dwswdTM6cjDqJnZKJ9Wcu759l7Lh2QT4vGodUADGq29hLt7djkdaBjx/WFvOz6d48+rgMf2rMz4NNI6Q1CoHrIL+5QBcsT90Tbk9aLc/bGwaVRKCM67LtSlmI4O/t17eYbb0dGUl43DLEOmvEsearrjPbb7dyq0cP7S5rzqJrCj8ifZU4tM/zwVmBw2ZM3KoyQHtpCkM6u5WdaWPSryVPz2YaaZUm+6QARetQk2FeJ4aMZHUNYQiUHN2yToXrW5CU+jG1rNa3cObfuPfQxzgnCSrgXSZmYQRNGv0qj65ITD1z1/ffN4ZKe5gHHB0J3DoRDNTb5j/1raXd+CHwX63ND9r2sjWIRTtqMTQxRIggt5UU0TtIKx+pH3NglOz1hwMAOXIQgebTjdNPNtfxX5Zx3bUu39g8Z/s0tdHZA4I+6cm1qEapCcskUaxve9F6SvrzbbxiHxxyTbbh1h3YxoXfOTM5dlhquAIW/QD2snUXtXlS2/EuG1OKmxJ+2qawc3Ez5j1Uk3VinHWNWsHy1wDx/ozY1FebXvaFcdENp1cGpn5aw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(316002)(4326008)(66946007)(66556008)(478600001)(66476007)(52116002)(110136005)(86362001)(36756003)(83380400001)(6506007)(26005)(6512007)(186003)(2616005)(41300700001)(6486002)(5660300002)(8676002)(8936002)(2906002)(38100700002)(38350700002)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YFj2KAQ2B7Y6Q4dj6uXWYTYUaMRr+lIWGy3m4GsKNEFDALSbs4HdDjMUApbbJ71mSfllZdzG4i27s9wSZFzwyvznHvmJlvjT1SNtyDwAvgSKjVzNIfw7O58ViO+hngDFNCz60kOsLNxqdLYIXbPi5WzwtAIyUmDKhpR5KAlaCJ4JOxuM8S5Knm40OUaBg2kiNrWwtRB7U+aiiH0aJemrxEw09BIRQDsigF0VDlb1lKsdH2iWFw1slMzOjJ/Ah2UtSjS8NXQOrCIdFSkhnryo4SR4nlF5omaPi8Qfa9p45L5vrA2aMcVprIPZo1BN00SrJv8ooWAzM0Zh0qN19yw9+0n6V9hDyAwrxVk4l6Q7TPBMJjpcqpj6zrqg1qiO6ytaFy8yGthcdvH2P3cAfcps+jz9Ig23BNUI5d4qkyuLEyQaN4+8M8Dtj6Hrk65rMPjlzcQ+8CGr4Q3EhYAbmtTyPJa+biUGljv/iLWQUggferjapfSrkn/bUuznsbD7bgz8G5GLFPVIl5KTGr31+3ofYTCRqQrDk/z9QeB1nAdhtrvSFyVkHxSHC43zlOqfrwBkh0Xwq+awMm5fTMpmziPVH8/oCQAV38t+h8QcZLMzsTS8RgeA/xoBmixXfn9Z6aXzYa5juYFvpLtlekZfOPGZZvKlV1j3JSVDZNatDYBKRGB++RiFrmvdaaeKt7v/TBt8ER44jU/f/nc11NFrpvly4uK49NzbZdD6+rZnsQ2TbSYms964PKQdpRdLRgG1e9WLGLdYrrAL+ylvr5TzH3cJ93TduZ+3ucFJuK1FBgtrSxZWc150qulV1rQClLYgWhImZdHLayvPj/DgFv94vuYcL0jGpkV7YU3z7amEg8j0vVHwJJ+KYGTy6FSVYKKwYcqDMRhdAy6RzSNnCWmdzBQ3bIDvWq+b0QO3Jp1yCezbMrpjQ8x6sIwELdVcqjoy85Kk0m0BXWEeP8GuwylmT0y9AtS1WxRWUaWYX+V4L2zbr7shs9iDup9pNhTbIdCzJ9XT9duTKKDQTFjetFkES82NCyKJLB0NLgZy+uDWRQTY9rOLwI1dPBSo0nsyOwQIhWuYkRdN4V8BTH6J+nfl2ePW6iXmy7qTqoAnvdAS1VmBtlW7eI6usKzHPbMjkD4A35JFnrhU7aKVj/QLA56N/BXHyxLlmaO5kJ2lZxMJEh31crsPER66x463UBbVI3p1o13JroEhBZr3pf3A1B10zqNKtFHJylXjOsTUARlWa+0UkPuaLN0lecmvzKclyvRpuRDluEklP88ZRt29kRlaM9ghE6QnOG1JspAehp1/bJfNVdnLKjTxd1xnOxd1BrlMnUphHLwbo/2c/y+rYzUDPnjnoLUpn2haGJWsuUp6MuSxpvNjM1FDq/PyKhU55EOXzXORivkqpwmkaOpOzA0KmC+3nclMCtqjMoMB5JbmUTeemG4B1nh8RjyeUiY5y/wO56sFRubYU6IxxWaPh1o21WGO1++brwdwOM0ljCAx+eeAm9ClhPKPz2y8XSYnvXwtdkvVv/QC3HSMaN+IDkh4UqaLkZqwtpVcrYfCq9D+cUPpVjxCvp9PNypoLswzPC+odS6Cs0Nz50R0TDdiLD8L4i3Wq87GTpGnyJWooqyl23ot6Xw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a334975-29e6-4f3d-4073-08db57634ee1 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:47:04.0787 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PzPL1pJyA4IYQFydHvDPOnxgMnFST7H2vK0gLVWHnHujGshiFnyuwJTwCBAy7lPTfMHhRNIU+oIm/Tv6+UMGlp3PTL0kzXx3A76tkUmGvSWDHOrNPu9s2dmxFmV9kOqm X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5591 Message-ID-Hash: SE2GNXLSI3PDD74P7SKXNP7WNYJZ5XJC X-Message-ID-Hash: SE2GNXLSI3PDD74P7SKXNP7WNYJZ5XJC X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() (A) returns number of substreams for playback/capture (B). (A) static int soc_get_playback_capture(..., (B) int *playback, int *capture) { ... for_each_xxx(...) { if (xxx) return -EINVAL; => *playback = 1; ... => *capture = 1; ... } ... } But, it is directly updating playback/capture which is the result of this function even though it might be error. It should be updated in case of succeed only. This patch updates it. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 47da3be0ff46..c127ab9de61f 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2733,6 +2733,8 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, { struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_dai *cpu_dai; + int tmp_playback = 0; + int tmp_capture = 0; int i; if (dai_link->dynamic && dai_link->num_cpus > 1) { @@ -2748,11 +2750,11 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, for_each_rtd_cpu_dais(rtd, i, cpu_dai) { if (snd_soc_dai_stream_valid(cpu_dai, stream)) { - *playback = 1; + tmp_playback = 1; break; } } - if (!*playback) { + if (!tmp_playback) { dev_err(rtd->card->dev, "No CPU DAIs support playback for stream %s\n", dai_link->stream_name); @@ -2764,12 +2766,12 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, for_each_rtd_cpu_dais(rtd, i, cpu_dai) { if (snd_soc_dai_stream_valid(cpu_dai, stream)) { - *capture = 1; + tmp_capture = 1; break; } } - if (!*capture) { + if (!tmp_capture) { dev_err(rtd->card->dev, "No CPU DAIs support capture for stream %s\n", dai_link->stream_name); @@ -2798,30 +2800,33 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) && snd_soc_dai_stream_valid(cpu_dai, cpu_playback)) - *playback = 1; + tmp_playback = 1; if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) && snd_soc_dai_stream_valid(cpu_dai, cpu_capture)) - *capture = 1; + tmp_capture = 1; } } if (dai_link->playback_only) { - *playback = 1; - *capture = 0; + tmp_playback = 1; + tmp_capture = 0; } if (dai_link->capture_only) { - *playback = 0; - *capture = 1; + tmp_playback = 0; + tmp_capture = 1; } - if (!*playback && !*capture) { + if (!tmp_playback && !tmp_capture) { dev_err(rtd->dev, "substream %s has no playback, no capture\n", dai_link->stream_name); return -EINVAL; } + *playback = tmp_playback; + *capture = tmp_capture; + return 0; } From patchwork Thu May 18 05:47:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 684529 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 24216C77B7D for ; Thu, 18 May 2023 05:49:25 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 24021741; Thu, 18 May 2023 07:48:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 24021741 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684388963; bh=MNhuZK0iNKGVkmtNQShhu8WMqtBQCgOI1M1H2nXNLvA=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=qX9UPWYi8dyyQKeXcEN4DP7l7p7AbUr95cRQ72ZYqLkircW0JveIV3d8PLOY7D6WT cW1TnuXt8DYYCSTVfFG930e4lkyIPuvJBiPFk6Fi2B1sirYlsrcK4i2oLdIguajEV7 sEzg4xKVX+JScNpZsZOeBU4QYuELsIGyrsJXXVJg= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 69EBBF805B0; Thu, 18 May 2023 07:47:22 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id C82E8F805B0; Thu, 18 May 2023 07:47:21 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 73F4BF8057D; Thu, 18 May 2023 07:47:18 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20731.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::731]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 4CEA2F80580 for ; Thu, 18 May 2023 07:47:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4CEA2F80580 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=MET3RUjp ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KH/kVrnVd+MXE8KyOLrEuRGhxpHSlcizZvCv8hvZKf0iPc5ZbMK4CNJNsJnMTwiorTQF2ze2AAviF3yRfAUFL4EDeeqv+ACG+Ekz7JEAavyBH8Xpv7po1nZbQ7UM0bx2tMIqhnZyGF3Mr7mx19sKWAEfBg+fE85nUUnfU7x/04xdyRczdjW3p1kHcbTSdhKEmbrbc7wTDsEL+OsiUvlg4hWOs7NQSbJ9tXtEire9wOZamafrsTChDbGdwtm5WGAl8Lxlp64jFF6qvfZunuqDZJb5vMLg+TVETnOk3mNjibqQ3dlhKJtpV3Q+4xVZHlfJL/vAo+dRMqX5J+LhkCakkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PayZ0K5c3awKsZGIHI74qO75JWMp3PlYmTuDQ8ndc7M=; b=c/TUHSSEzQQnFOyuaCH+Adhm1mDx1ouWkLsAz8FESD3e2dYpFtzSGgkQ38kBTk6XKSxpc13NYefIG2SxwbFYwpdKtJlnSJGLO1oAQdYqxhJ2JGqk2wvOuFdO+f/XDbbazR/Lb/Zwk7WvZ1rr77Ipz4+EUGD+7hGcSCupSdo0F8lNOwJHJrZWBUt9hcXtBRKtyoOpvln6kEtfaIXGhMH74X3JyBES5DswzdCeB8mMEWuvWGdyNSMSseCIDha0/xcbLUDSX98hokEMTTrD6jeAxKA5V7x8sa7iBjfr7Sxib3QRn/TPBaClb22AHVkbpYhzyRLnVkSpnRB9fif9mssvsw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PayZ0K5c3awKsZGIHI74qO75JWMp3PlYmTuDQ8ndc7M=; b=MET3RUjpg5MT+dPphmtF42IijywykvXjo3uYmZJyvsD09/prtMGlTdmEEdzppjXw0vj7400KY0Khd96UTjSAj/2+e5c710BHQzkKLF+X7m3+oWiDFdersbAeLberDMM6rpPtbmtmMvV80pWagMbBVVdsRoGcbQS0gSzULhvH6H4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB5591.jpnprd01.prod.outlook.com (2603:1096:604:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:47:12 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:47:12 +0000 Message-ID: <87v8gqp4ww.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 05/20] ASoC: soc-pcm.c: tidyup playback/capture_only at soc_get_playback_capture() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:47:11 +0000 X-ClientProxiedBy: TYCP286CA0169.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::12) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: 280f764e-7316-4d59-c098-08db576353a5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UQKrjXuj1PwziWk6n/qrhP+PdsOal2d8GbaFzR81XaeW51MxZIHKZdiH6WhqCWMLIEHGtQgfZsDiHmBTICjlIHTEwei0tdUu/Fi8FBn+A1oR4MA0EszX5qh581oaSQPwwAFdZlETHJk/YIWN6NmOKKo22HkX8na3Jzxx9v+Ep3Ff01DbLhcRBq18kNuRzpjfc8q8Qzcjhud1UWO5dw40I/AmOCtRcKeasR6wTCK0fdmodFnTmKVxT3VWmdBmyTeY3goiJ19/8N9pP9TwC2SVkyswgWFLNWrikQVTvYKvd8FD55u/IFBXNTYmWB1c3ejp+eazJcHRWKjCDkMB9+0Nld/WCA9Cpe1F0INs2re/gow+omdULWoBXY2qWX+bK71p+4c6WJ7lbm2D1J5pfp5CRrb/as9Fqb0N9ymoECkIIEIAxk+/qxP123ygQVq641vB7W/N53nVLAJZIiSKlWRWEIPJzFR+qEvekbOHxvpetaY2f4FygSTy3hf5ogUIPwzC23hJodOqG3ql8piFYhebVLY8BYxv+/TXNfWzifVXPokATn0A0wBBeEDzpZ2gVxwyz2EFXYA69iqUTX1fv2AemCH43+4VpJS+Lz+V+vg3GXYBgl5nsVXBpd9ODRleSl94 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(316002)(4326008)(66946007)(66556008)(478600001)(66476007)(52116002)(110136005)(86362001)(36756003)(83380400001)(6506007)(26005)(6512007)(186003)(2616005)(41300700001)(6486002)(5660300002)(8676002)(8936002)(2906002)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NQfg6J01rQnWGqOjmpwbsNs/jtYUwdBOL3ZPrxQQAy9hqbDx13TY72iWmmspzcWozxRPytLZ5cVFGSbG1P9SE/SBJJgsjqlbHwj7M7luNjxUDJ6vBD0eXsMWehD5+SnPdzF3fgjl0y/8FbqpnJSpaBmtAh1oVQ2wzBUAxwZ/EglZnkIoNN3ilMkGQsIXcM31dE3QfpfV34h6N2s4i6CNaICS8wgcWQ1KZvUDk1zBWURU51hhNN28AeiNwZ7+sLvcqgoEny/2nVtzh6tlAXfqvPo+cTc+fZ1hwvMX+NAgmWfEH+3e5WsSY0owp3NTgsXa3HCM91pmtZpCUfnDWILyzgYHOXXEvj6yEcaDdUCOILYWInOwd3uXYCBsF+6lKmbJcNFX1UI5kvfuu+wK1TE7DuLp/yxEPLaGrTNkVQABTWGUxrVlLRQDPA1SsHcy7MbsBZnTW/bW1wzKo+8lD9hWaN03fDFP2yCUN0o6qUekwzN4wvxYVo4TjAjHD+Wcp2I3+eGqC7d0SK6qB2S2vFVvrVxQCojJK/EzsYc/mK8AH0QCWw69nfxOADJ/ZQVIo0aqKjmgd8G5AYZI2J8kkkRVi3tTpq2Z1QCy/a6R5NSMfGOnVvHSo/o/Nn6QmAlLAUnqlgvAmzHCAwdI1d4yKeP4QK7w1AlWB/cndyHjOMyR2NBkR9pSB2JTfjT/p6zaIWrnlmD8MD41rknyvEXIt7IeN9KQVMEl212pnfNxp+0/955qklpTRUK5qsDLet03kjQgOZarXlxc1bOwZbe2np7hsIKkBzubVlUaSyst43PdjhBJNz8FOPFyQhUd2TyDUoGblY/LvZ8urunMAasXtpo8LeuR8cBSxDKN7PHRKmQvE8OX+ovWYmB6AwXvRCTKVS0kp1OtWKuBJjKCcMZAI71l3wlejiJ21ncA8/W0FSIZYcdRQknhIb6w5WqxSa3C0T24pxcenSvnGH1iYKVgG+O+9duQZH9B821HrN6YInGTroOeNy3FxO5+jd9LvG65XfDYdDYcqfPjgORogAXFSxYwOs+CAdpRFBhb6NgFtXEBhwozIoYdOqgV2YDZawoV3fqNHDrRBNzidFBNSFMnBEXjd+/a6NUrSAWrlmkB6UGzKN084xR/AMtmcC2ozo5TFRTNZYOswxsf635OfemDwyV8ofPfL6SXRucs4d3A6UmEJg3wS6gAwV7lbHiTOJtrRBPjQYAErf5IfYR6wuSPacALq3erOHLCAyp1nNxhDgR49I1E0gEJDPZfFJ6mZviCqUwZSjigOvSjLtOLUKJk2kNubJ9DJ7O0jykeQ9K6qivSHhWB2BNMg/TvCm7BTKigqCSGuDk/5YOmiSzpEht7/qldtSTYXN1813wjprg2LmnZSnDYIFraxiuk7Zd+1/8JHT3iDlvCFianTDN7HOP5E6zvYKY+dOQtFTE5d2KILVg9U9CRossQQzvUPigMcDz7vRlsqGRx916H9BRj8Z6PDlfqVCycAPxou9DcVtg8kMLMtfkosKm7m1BFrhBMS1jx+st5CcEgNZZzfsBUp8KbnPxq5+vGIjdUemXVNy6iM6pwjU6ocIWrnwFh0q1lpPTXRRS7cizSwOpHXKQq29Tm0/CjCRS0Yja/zbryMQduZMZJWaY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 280f764e-7316-4d59-c098-08db576353a5 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:47:12.0736 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5cUaNM2ZqV/MKeeG21/nElk/GDf9j/HwT1IMRJa28woiOzxhqLykM1UVLZk4j9lU9JissMx/T7dPkM4nn2pzmhx24XznlvTPHsbN7yUPCceRbAIlQTAIqxsChGeZfZqD X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5591 Message-ID-Hash: WZRSKYVICZUO4MURW7FXVCVQVA3RYA2I X-Message-ID-Hash: WZRSKYVICZUO4MURW7FXVCVQVA3RYA2I X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() (A) returns number of substreams for playback/capture, and then, we can use playback/capture_only flag (X)(Y). (A) static int soc_get_playback_capture(...) { ... (X) if (dai_link->playback_only) { (*) *playback = 1; *capture = 0; } (Y) if (dai_link->capture_only) { *playback = 0; (*) *capture = 1; } ... } But this flag should not have effect to opposite side stream (*). This patch tidyup it. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index c127ab9de61f..89416c127dca 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2807,15 +2807,11 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, } } - if (dai_link->playback_only) { - tmp_playback = 1; + if (dai_link->playback_only) tmp_capture = 0; - } - if (dai_link->capture_only) { + if (dai_link->capture_only) tmp_playback = 0; - tmp_capture = 1; - } if (!tmp_playback && !tmp_capture) { dev_err(rtd->dev, "substream %s has no playback, no capture\n", From patchwork Thu May 18 05:47:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 683425 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D53AEC77B7D for ; Thu, 18 May 2023 05:49:44 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A29B36C0; Thu, 18 May 2023 07:48:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A29B36C0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684388982; bh=aZhVSlW5vaNhTdjxgE1cYRsocL5Zegvk+2FGM26OhnY=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=XcyjrSG8u9UBBSW5Zu3Z7+mLq2shijXTjyG6dZO7el4WkCUR1GSvuW4afvJq7qtSa KrywWTNZO2ml5h7TxWVzHQ9LEU67b4YgLtZMMxoywP3zwfaIJVxAmTN8/0F9VzckZH +2M4o++FwNuiuxmFutfNQFraqviRFanxwRr27OwE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B6758F8057D; Thu, 18 May 2023 07:47:30 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 2DFAFF805BD; Thu, 18 May 2023 07:47:30 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 38260F805BD; Thu, 18 May 2023 07:47:27 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20714.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::714]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 1844CF805BA for ; Thu, 18 May 2023 07:47:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1844CF805BA Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=odBJpZ7e ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FSo5V3DgTgAZaFWoN/MaMwjh92xAfCar4Fi9NsXtpNJZS6PNolLLrJX3E7DHhKjjCUrJUsJ3dR/P/puhRMmW+KDMjeY+MbX2pBFy6BAOjIYf0WgWi5NupAEFmgCsLIC82XRYVhqMD6++1p+WYRRcXRWBusXDdJdoy4s0eISHvwtKkJc2Iv6IE9Do/zZti6HxXYddEPZP0NQpJZdkdiorvIfBhi6qDfK4tbbkcp1LklMglBz+F3qFsXNzTU+1cUh7RNRiEXcrlOy2/lfWkaZbLBpNnorHwNqfEA1D5PjU0jeksgJZ1IrqqlUwNgvbP10QviRoSbOuodxxbsCjAMQLqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IGCJaxWIPC4J/R+zspNaOJMCWQcOhLH4B7EMXHV3pgY=; b=L2qrW+J325c2H1pT5NOwcEoPxTnQMqZfSLcDx2J2Eoyf85rCeRJbl5yufQ1IC5oa0gUPKzUiEhGrqoiyDHoszIP+MCpIRz0tQuIqfMcTUZPW5ENnorqbfeYPO+dhChHKMjcW7G7b/xM+bsXVHR0h1R8bBY9hl7dyaXyJiyeLPcQJjmpgzcfO29ebTeuYarii+cPj1SOq9CodZnxXj5XQrsH/MwOtV/WehAmwLncjmbSrnj5XA/U5YTGAAvsM2XtQQ91zQYZdiPcMoClDtZikkMpTPZd+7mkPCtxrdABaemGj6em/hg74Tw4SkSNMhqPMZkmfN2SdgASdKyW1wwAv4A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IGCJaxWIPC4J/R+zspNaOJMCWQcOhLH4B7EMXHV3pgY=; b=odBJpZ7eLq2sqIuvnpA9bqCLHINTvrnQphN5b+YzSsAbFoTq4ceEvJy0CxLrl91myeYj/sJ7x0OnqJBkyXtLzMsCZgRFSo4reQTVLSxLFAL25OvRsUSNEleR5MAPOvxn1cP0Afl6e7qba9nBiDJBqOrHqXFj5N1O1OH2y3tkdWg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB5591.jpnprd01.prod.outlook.com (2603:1096:604:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:47:18 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:47:18 +0000 Message-ID: <87ttwap4wq.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 06/20] ASoC: soc-pcm.c: cleanup normal connection loop at soc_get_playback_capture() part1 User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:47:18 +0000 X-ClientProxiedBy: TYCPR01CA0134.jpnprd01.prod.outlook.com (2603:1096:400:26d::13) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ae4901d-a1e4-44a1-81e4-08db5763575a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3L6p+ybiM46AgtGMsS/yV066p06qIHnJHfkfigpDTVJt+ALeNr0NuLnGCFKxcL/6f0eouvCh06euuqnHj3XUxrdaipUCKkafddxmzk2GOWXNo06N/WL8nByq76lBjDjk7Z5bD66cgZiqR1pqtnsbZ1L2WcGgZn+WETEqKZcfqYlSDRhhtKYy0pKhzwaZVp1Vi/RZU6jBl8FZ5jaEhxzXfl5YRrIsDTbtsREaX1RatgWYV3EYI+wMn+ZEvDyMSHwOgAlyxjyHg2DwDgF5Zzg6jX+45CC8UNOaEJlYy/bSuOhIqE47i8RSkbb3IrrK1jL8dPB6E8QrUSTBeuD/QUSgiw+WtRTkrw1hxsz7mpPiHNlrUw1Gbw6oL43jplEr0CT36dF7yx8EEi4QSAKPJQ+g3gWpxbEj4Z8GRr78KpbCZdQRb8RIQu6KO2bP+0LzM6J8wL18Ov1ndvddaOy1RGCnlk5Vesgv9hQ6HfB3Au62Y9A0ZEMnKvZ0DBOSqEzD1Q+UzNvuh4GRBfSE8PzvAD0VOcmOfCe+m0rNhSD417zZE+NH/paNVBKV9FQUg9IlYAap4eqmLU6CPJJL78R41B5ni1xqeNra7mTI434LVnxOwvlCogpeOVmKbkN7WZR3RHtf9JmvPh7wZ8Krq5I8SmdujQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(316002)(4326008)(66946007)(66556008)(478600001)(66476007)(52116002)(110136005)(86362001)(36756003)(83380400001)(6506007)(26005)(6512007)(186003)(2616005)(41300700001)(6486002)(5660300002)(8676002)(8936002)(2906002)(38100700002)(38350700002)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DdcjWwOGt7ztAXsTF1gIfaUfQuc6poGrsKgvdxY37NQYcvAz+ft1fkn5kKBYtDwitE0/eb6x6iN0hkF1s2kEs26vhcrEctGLuPL8PFNzh6flUdqLcMcWIiobS7v5oSbeTpkJOeWK5QIkw1h3fk1RAjYbzrghuS/qfOVnBcEkxeV0UvvXfr+3YIv2talqgjFDk2GJi/Ww2SAALoh5BK9ZF72UcQuUZYSael9hqVoMdK4VCig1qZisl7fbmvc+FBMlS/R2yBlU3b/M+KwJ/0WwFp9XAyS7cZ6kT86BXeCVr+Gv8uT6aHZn00MND2xrcXwJob3VxJ/y1KIOW7O7TyzeVuYdfKpIkBAgokVJ+yLD7NFhwH2X7CyECcZBkwIayqvsRjRdPQfKQ5SIgciDXQc2FbbpIxyzDAVwsymG1mY40pybB7r67xgkjXTja01VhjvBa6tvWMupZmNYxBICmMVvXiXY3s9h3XiWJUqzjjgZrui4y0AFSnBMdIR5OdV1SBVr4mGjxLdd1wSrZTiGTNfCnYQQXTg2a7VSBqkLCLwESztJB7jNTzPg4WOe0bb4uBZ3GBRUMzjjmzYVH6Ek+l489Fdu8PDC3WufE5MC0y3oZO7HhyBu364cDmtEqrhKWI8hSedwEJ8YUVehrhgh1szsm7UmmcpyXdnDWpKQjZhImETVaJklineDZTcLuFp4KQOlKrgJ2yoMj32HHIbn33NbD03bgCzYc4WmMvoduhuhpewB14nctWcbAMfc9TizQ3TqAFzDxB58ra43Kf2IBMflmd/sdv4SAh1dlgR7NS+swqoh9tshU7dAO/F6kSZxZ+xE/Y9fvvvRQdaVrMQBBsLHnew9gsqtRYBP7ShvgwGzlL/hZZlrOhjLXqI/NaJ4N6iGl5Fd8azQSGeg2kXM7taufuHTde6ZDWzf2PO51EerHe5iiBieltr5JJpE2VKhFY1SSqr+IbIoSlHeW4DtQh9khyGz7jCfUd7LKvwZGteEXmz5rCI9v+cBpzgKnKGhmIH0wGnrzhHGnmoBgxCPqMbeDglAjPhTT8Z4LBfXwVmr06hG2wkVXIBg78ubT0lxqxc+g9SfhtVyFbZOIK/+kTmbLwwYYHdlqE3nhUqPPJXTlXhMMPXveNBID3jn4CEzw6SvyRoxWaFebFWwL1C+5t5j4zhhxXPN9eX1N1jpw2B57I4y2ZOae866oOn2L+4qrhZae0bl9v2dHo0Z7nYA1+4QCX3NKFTA6pEAjVx6+6OkNigyzlG3oi9dJeuMex9j9WAzfyVprxtmrmvKwNggWnkkS0ESb5c+LugMumEO84zpLHihSbZ2mYHnq1NMWQUlFt/7gPxfkX93OKJQn4jpgSPKVpjoVNnfXEaAiqH0fpjb8HpmwudjFaMnXBtvG1RqSPY/VqDLYprpSYdPbhxYH3bL3NUECypb3CPYyppgCI2Z/JgudlN0gzILXk6ks2qGFsr7pciPpxV+L1tdz+QIOteS53ryCPl3CiOpJZlnIB563p8p07OqR4vspd7K4LXHW13vwNHeLivwyghi2vNWJKgw0yNJfRL6a1aN6+Xf6Je83WHXeu30JsTWkRHocisrsq3JQuHXoBuJ0OLxDPEiGgL/XUdpIx3mDjI7Ipg9Cxq+bvk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ae4901d-a1e4-44a1-81e4-08db5763575a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:47:18.2991 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 47dgldjIZBqMl2Fb3Cy5Ku6JEkrF6UeQI9qvE52g62X1aa1Uuu6Z8pMvCuohSo9ZpAIVaTymg0KIGKfJ+9nDCXBsP05YK1XXcmSrjNyzHP5ArmznHMskXkISz5jAqd9Y X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5591 Message-ID-Hash: BNYUO3BDMU4J6B2D2PEDZE6QER4VJAWB X-Message-ID-Hash: BNYUO3BDMU4J6B2D2PEDZE6QER4VJAWB X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() (A) is handling both DPCM (X) / Normal (Y) connection. (A) static int soc_get_playback_capture(...) { ... ^ if (dai_link->dynamic || dai_link->no_pcm) { (X) ... v ^ } else { | ... |(@) for_each_rtd_codec_dais(rtd, i, codec_dai) { | if (dai_link->num_cpus == 1) { |(a) cpu_dai = ... (Y) } else if (dai_link->num_cpus == dai_link->num_codecs) { |(b) cpu_dai = ... | } else { |(c) dev_err(...); | } | ... | } | ... v } ... } In Normal connection case (Y), it is checking number of CPU / Codec. (a) is for Single CPU case (b) is for Multi CPU case (c) is for other case (error) Because this loop (@) is not related to dai_link->num_xxx, we can judge (c) before entering this loop. And it is needed not only for Normal connection case (Y), but DPCM connection case (X) too. This patch moves (c) to top side. Signed-off-by: Kuninori Morimoto Reviewed-by: Amadeusz Sławiński --- sound/soc/soc-pcm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 89416c127dca..8ce6dbf37014 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2742,6 +2742,12 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, return -EINVAL; } + if (dai_link->num_cpus != dai_link->num_codecs) { + dev_err(rtd->dev, "%s: %d cpus to %d codecs link is not supported yet\n", + dai_link->name, dai_link->num_cpus, dai_link->num_codecs); + return -EINVAL; + } + if (dai_link->dynamic || dai_link->no_pcm) { int stream; @@ -2792,10 +2798,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, cpu_dai = asoc_rtd_to_cpu(rtd, 0); } else if (dai_link->num_cpus == dai_link->num_codecs) { cpu_dai = asoc_rtd_to_cpu(rtd, i); - } else { - dev_err(rtd->card->dev, - "N cpus to M codecs link is not supported yet\n"); - return -EINVAL; } if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) && From patchwork Thu May 18 05:47:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 684528 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 07969C77B7D for ; Thu, 18 May 2023 05:49:59 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 10B7A74C; Thu, 18 May 2023 07:49:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 10B7A74C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684388997; bh=tLWJxeljsYw+aZMT8cSV4Np4BgyZo7De7xu8y+ZIeQc=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Vr/AnxYkDFv2hU5MX68iu8GNXVI49CoWq6f9aijRNMmyBXAm6v2r6dGC1/WWhzq4q 5BjWuLhXpiPMWkij507luIb3LMu4g4xeAMDfYhLPZ5kjjCouF7P5CpH8DFGLEFBL58 1B+VlDlSjbgPz5rcwjkxEejvrZQDoaKvQdsGJ1os= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2E68AF805C7; Thu, 18 May 2023 07:47:34 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 863C0F805C6; Thu, 18 May 2023 07:47:33 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6FAD9F805BD; Thu, 18 May 2023 07:47:29 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20714.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::714]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 54A39F8057D for ; Thu, 18 May 2023 07:47:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 54A39F8057D Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=AqwzDvxS ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AYDUUvdRcNQ1ICyjtsRZWCQ7ApN0FlEKzit9hGU+B0wyochLo+S5uMl/Eg+aiE09lfQ4B8NU2kBBPUU3lR1jHMYUvT9YANwVI2KUljI/eZ6Soptc9PySJVHmBMK20GHXWaGjdt/ziZHU9l5Nbx5ArJ2FETI8Ma37oZzaF9U3VA6NvxAIncuc/IHVkYq63JKtRYPfTmeVZg7dcB+NZfr67FHOa49nSEzMRCOeW5wdFjhfzvo0lwow84jeuAXF9YkHhyub1OoBy00lGcSqzvucM5xL9MAjjZw4/gywiPggBN5Dpg+W502X6ihum/oz8Fs3xtEwR8UPjdXJGRm/Y8BWNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CVemXtGCpPNo8rvZwUVhfAUDNWrE2nXFJtfKlx4/91Y=; b=MZ96+rYAs0y8JmNNoFevhnGKpLg+MrBDvcfJ1c2LbjM0KQ1R1kUUC5vCnWoOeAqH5OXoxHeu/Wukdbxnnixi7ew7SmwruQB0CagfEpimI/iKW3IPM4tWMAqMBFXRvQmZElD9u/JcHbrsJNLXRBpJxKvYl80nx+21zVLiWXF1ehqv7laqWFkFbti46K3mGwc1dDF3zfHxC8VPzotRV0bVKqrRrvHWylzkwlKgHe4WsLCbmAVo/7Z4LuPdJvD5dF/kD0yqpdLCmk10PpW9qaa8B1IU3JFUkQiiALxsA1czhaXI19zJtwgAsZFiAtZXd3noTXl2MhRmYKBGpsH0SIAzTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CVemXtGCpPNo8rvZwUVhfAUDNWrE2nXFJtfKlx4/91Y=; b=AqwzDvxSgbNCIU7Q9XVeTOIYI4NWqaj0nxH5Uf0VidIB+7lYsTWbM6gaM8qPCKsDzbah/bDZf4LhvVWBDQJ/YrsHHl86tyt4QTnthMhD1KDDDERAFlKyiz0nB+7Qn7FvxrWHECk1d8c2oRCE/UJZWttnhZN5jQ+tQCdAYs0Bhjw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB5591.jpnprd01.prod.outlook.com (2603:1096:604:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:47:24 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:47:24 +0000 Message-ID: <87sfbup4wj.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 07/20] ASoC: soc-pcm.c: cleanup normal connection loop at soc_get_playback_capture() part2 User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:47:24 +0000 X-ClientProxiedBy: TYCP286CA0145.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31b::9) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: e7367a5e-8e47-4a10-8866-08db57635b29 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 50cNkQogYdJtP/YIVZL25tvxs1+ihF2KCPMZNpJPam3DzNzJ/7gLI4F5DE4dhUhoXdWSTG9xJjBgzvnvOUYacIFG/PoVXAFlfSnFh3QbprbLdzSCgeU7HBL/SciQ13QA6943bjkRPejHrWmn1QHNDYAVKXoF+GNFsWPLCQHDQoYvIeEdEwAMul4Nb+cgjjCbIYAi7kx0RvnwlSwaYUIRfnZmrmjuw9+rrMXdDTIdLM4rfKplaiDyakv3PRaj0sdGjISWaOm0C6f5KK8SS9xSQS4rTtqHGNhJ5vaImu9IU4Qugq42v66fqXqkfgVZQ8w64W3Gsx1wB5XfpuCMU9DPDD5vkTg+JWmRZfLJy3A3FxBlAXXgnEEchDceESpgvFsJC/Fr2mXvuHKvOvelFxD8DLOW6uwPKIljrfWvsbg2CHlsrc405vzrl4BLQ3w5VQ2cc9Ncblgu3x9AWC65X+gbrYgOezy9GZXHm78gnAa48ptd+CM+r5K2suTVPbTYCH01cRiA5M7JUPPNNakKK45zm0GMEE1c3FA1nZDhdu/8nUP38exS58p/HZG5TjvUAeELbrRuhHEEV2iRHSUHOjnTnmG3RUIenVf5V+vpIYznOT+N9UfMWV4spsL8LINCT6Ev X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(316002)(4326008)(66946007)(66556008)(478600001)(66476007)(52116002)(110136005)(86362001)(36756003)(83380400001)(6506007)(26005)(6512007)(186003)(2616005)(41300700001)(6486002)(5660300002)(8676002)(8936002)(2906002)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zEsgnhknKs3+lLFda20nj9iBBBZlnArDICnHAefwq5EQsR44AoNJc562baswFwT0uZie0bIrfCG6P8RmQvdPXFzxHULN7aLRv2VWxm8tvSOzKdNIpPex9FP89burLlAAmSoZtoSkv68BJB4+ywLglZjteEEaEiPSj/Xf33lkcxtdx8WWwTP5Y95hiekk7I/FB0XuoXWUuUz214Tig45sIwizNCXzwxCyfrS7kpBRClbIHgkXesV1ETRfONeoOeMpNHWBcKjXjxPE5wudXJeIq8UYyVZa/PPuWhY02VHt3kkPrADs3lUg1UbhKKdcNWMOU5g7u7KPCeBIAMK9aUiMEGExkn9ril7oNZ74Udiu997Nmu90qVLJJQjP8S26Dg+XXaMJZLYFGee2BnSLNsekyXKUIpWEq3XStYafLb33rYTeC2GBNK2qnx9R35cq9BiRu9eYYs1QDXugbMqkjrf7DKK2TSbg7iBm4rqHRIR9YxKg+EhhqsS4M5ddbXwHe+KhgAbJ19MFyCpFBZ58JaByetlVxz7IcY3e6qB6pcUb91Yu6a/EZG0cXCoFt7oMDOWSehcj8dx4OOl9TDxD8y7QSzVIm2jhsaYb8VYmDQiKrd0bVNJjpqNm/bQaAFyPIbUBb4+TjMTQG6ZLTLKKCXv8B8MWQtrt/FZo0ki7Afpi71kNsaAsUZEDn8+VvJVHzIcFeMiu0gMSSVxVgnhv+Fzins6D0O4puKIjVVaNDVP87tNgSb4H0WVsp8i8LBeAUaqkKSUS+fudFF0mplgUzXDuroBGSrmDJPHHAq5IPmm7R25DD/gKezvQlTOFe7cMBno3kO2KSNG4nKC4ScofdVd2IO/PI9JRADoGAVNKkgUvZEP5ATZX/8UAewnt6k5EkqKr1tcjdSk+Ec3Nw+zD8E/0TspMcsSqmZAg0AGhCpSE+h85PRd5cuBQsQ1cwSNn9knSOXxXqzxkoWl9nBL3+AVlzulwurvvokAkQxt6xSj7DIXzJ0qhOxZBbpwyUpjqt0vDnlU6LdvBXUNnjyCpiMRFYCg+cIMdGb9egUXz4FZqCjCDTN3PEof0S+UvRbJFlfGMplNiSf2PdBugqhJK9N9rHdhrwQwzbl/COPq+Xn+c5w84cfoQSWNoLsxksxa5tH4UNgXsFOsUKoeyW6boulEgByMMEMUjGDtsW3ZJQQf/UsC+2pwpQ+cLGriJVFau8ci0fkyT4VPmZEFQI0lJDDkAdcqsLtI3i6DLdlS1OdwEss83eIC4ZjxQ5HoP7Pvg0aosA71R9I4aQs1z80YUtgsXxDPkkcuWAdU5LCQNcng6oiqEiuiW9iteitUAPR6XLqcl4Ude4hbr3/l9yPDHwIIaFQAqsjQDwHlbeY8FJ203kMSJqD17nqJYYDQy7GNDLdLF+tsoX6VKj1V9JUnAojA+LsUSJsACbc2zDJC33IS/K+MC68tRRsC11xA/rpCQsOS2C4+43sx7srsRgX7dl1S4v8b+ggtCZzsGhqy7u4n3Z6RdBFebNb4UJDJMByRY19hhdHlxMPx4CXY94mmMzLOg6ZwjsGx4EudSCm1qPmdcKgGyRbNs9iWzD/wwpfxPJLbRkNKstvhH3UmEDpYCIqTroY/lW9a74q+37/0YKepQ1LY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7367a5e-8e47-4a10-8866-08db57635b29 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:47:24.6653 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iPYmm3mWXhPKH4ttzhbpm8o7TqA7sq1gAjsBsd7KGaG/rUUyr5jK1u9v7IKUPATs+s23yC4OBT86AYVJqB7chNAIcYZNmvks2+ilPEQhR98jl3aDbg1KoJaIGlYfQ80F X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5591 Message-ID-Hash: 3SKWDDVZZAPKANXA6AWQZPCDW5PTQZLQ X-Message-ID-Hash: 3SKWDDVZZAPKANXA6AWQZPCDW5PTQZLQ X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() (A) is handling both DPCM (X) / Normal (Y) connection. (A) static int soc_get_playback_capture(...) { ... ^ if (dai_link->dynamic || dai_link->no_pcm) { (X) ... v ^ } else { | ... | for_each_rtd_codec_dais(rtd, i, codec_dai) { | if (dai_link->num_cpus == 1) { |(a) cpu_dai = ... (Y) } else if (dai_link->num_cpus == dai_link->num_codecs) { |(b) cpu_dai = ... | } | ... | } | ... v } ... } In Normal connection case (Y), it is checking number of CPU / Codec. (a) is for Single CPU case (b) is for Multi CPU case We can simply merge (a) and (b). Because it is doing same judgement, same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 8ce6dbf37014..af5d4e1effdf 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2794,11 +2794,7 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK; for_each_rtd_codec_dais(rtd, i, codec_dai) { - if (dai_link->num_cpus == 1) { - cpu_dai = asoc_rtd_to_cpu(rtd, 0); - } else if (dai_link->num_cpus == dai_link->num_codecs) { - cpu_dai = asoc_rtd_to_cpu(rtd, i); - } + cpu_dai = asoc_rtd_to_cpu(rtd, i); if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) && snd_soc_dai_stream_valid(cpu_dai, cpu_playback)) From patchwork Thu May 18 05:47:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 683424 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0802BC77B7D for ; Thu, 18 May 2023 05:50:17 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id EDE04820; Thu, 18 May 2023 07:49:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz EDE04820 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684389010; bh=2jtDmaDl6KtbEYmFxhZmFmeOcN8HO+8tYSfkplOAz88=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=uvEollLoL98iAuDjVZb9px2DZx8BlepeiPuE+Jau9twGRLa6W5PYB8gsW7wkzH0NX dWFyT88+/MsT4Mrp5Wn0g1urdzOfwtlytlJOXl+pkRbSmQJu0yiYGbP0oT/O6ZlIK6 mP9UVcWxKgz/+7ueBUB8AVOPWN7Vt1bN7skLz00Q= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 59018F80548; Thu, 18 May 2023 07:47:42 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id EA32CF80548; Thu, 18 May 2023 07:47:41 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 33C5FF805C6; Thu, 18 May 2023 07:47:39 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20719.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::719]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 065C6F80549 for ; Thu, 18 May 2023 07:47:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 065C6F80549 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=GHie+ss4 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cLcY1bkDYG0H4n00Lr6VKRGa+lhydhPc4MEpY1XK4JD+KbvXgmCa2ULAaXyK7p9GMLk+nybUh/OqXJQpoVjhCnap8LZmHK9iR+dx43DTPz4g6ks2oLeLwh6cynrdz3eqqOaK6GljlYjwfx9vBZ6AGjM2B8m5D2psMdBYSJomXs7U4RPr9WoiWhYcxI7LLNGodGPA0eEaS+noZFiVxtE2kYI/dP/uqeAXPJcl3A4Tylc9DVvbvLf+kU8rbJ9F/3T6FncYukBXSwn+XJUtwkVw98t4okD+wqnu+zSJ4AKGR8S8dDqJpgMLU9B82n8+PLWCdp0KoxI3iMGt8cpHnP7fxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=F9+jAkZZwTLW4RCPhHGy3V60PYRmm/pJsYTfZKnJpA8=; b=axXfoVhLvNXH03iHR6LJqRRSG8lRMyWITao141Ih4bIBn/MmLQyHYEHEAH2Fr5W0QQ4LLcjRVwjCderRLJOv7q2EdKq9Fp0Foyjhm78fZYeMSIf3yv1h3Gg5UxuUSe5KgfE871aj2+Zr9loCyaMguOh0VRBbbBTZBcj6yfL/wuLjS0XTip4KK2VEoRRyqLtZJfWMNtYSf0S/Pn6aK/HIFQpLL7gOWZ285w6yF7mekQdb7/rNCY5x89hsWXuRxgUEKDPASjLiXBqNQQQyaj9Hwt/+Ck1IUODzZsacc91FLnpYDt+oP/yt2RmSZHzQiB2PjQwX+H2h1aF5ye+S5kKBZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F9+jAkZZwTLW4RCPhHGy3V60PYRmm/pJsYTfZKnJpA8=; b=GHie+ss4+5/MgYLLoWY63a6mY8aymdrHIReZkk5vHW66QUS5G4j/GyTYNORjyF2Rddh+peu1NL99McqqVLR3xp/vq287ykLuYbMFCfEmWSWX+Sd3jfifCgvxpr8s4aeux6vB/ow6NZHZAhudaSGhP+BJap+/+4eTh6X3vH7Rbu8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB5591.jpnprd01.prod.outlook.com (2603:1096:604:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:47:30 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:47:30 +0000 Message-ID: <87r0rep4we.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 08/20] ASoC: soc-pcm.c: cleanup soc_get_playback_capture() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:47:30 +0000 X-ClientProxiedBy: TYBP286CA0025.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::13) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e0d18d9-e24a-43e6-c8c3-08db57635e8a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: logaJIwwWaywXFsL2XyTpS5uoZ2pxjm+cSD0Dejt7onxBuClahro01h0ZTXYcy4BlpDM1RJPbT/9RCHsBtcYp6HJirlJ1aXOy7FRvLMPrxmNh8QvD16JEMFzmSpNuW4/Nn4rgt+kQK3E9svqX1xqhF3ibZa7crrYRgwabZ0qMg8DOy/VIPTreMnlzn801eVfl6MqqsFcaMuDinu/fBOAdcmsS5FwDTLwbbgneuIfPvah/2RsfVPOdFFn9st7l6KErj+xDt4Hrp3rmC9b0ymb+uz8dfixk7mIue+XMbqe+OvSWy4JXJYqdIniY8rrfVtyAS42n7MSeU10JICLU+86Fedxjyg5NtYNS/hBRtDk4wUa1Nvy3D5siFmi1P6Y9LVYWd8AtF230fZZ9wOph41GzGG/YWEOx7EgqXHXaNuQcGmKhaKRv6iYV8J59+BlpkjGCXz+1LpuV32HZsoTXBMF807WyxGI6NNZIZqb/MedI12CqMishRDHquEdNImGRgiVDUbOSjcDOq76NdHGGLDSEZaBoov5ZQ0yXlN3luX/nhXRmZrfPODNPnNgd+C27Y0y4+r6X6fan4EXx1ALUonUytwvZW6M+3YF1yn8qOEaRNzMnj7esEFl5L1Jq1VMDRyV X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(316002)(4326008)(66946007)(66556008)(478600001)(66476007)(52116002)(110136005)(86362001)(36756003)(83380400001)(6506007)(26005)(6512007)(186003)(2616005)(41300700001)(6486002)(5660300002)(8676002)(8936002)(2906002)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8CIbmkjS9IQugk0viqQDjY2lzcpcvaDu0PORLuzHJ3tch84giHC8pQxlw5byljxojN+7CyM9I5143OSbjQJ3pYdCjtXGHDsh592U5UHpqGfC50couGbSYDk/d+1BZkUsGNeApeVRpjiA3YQzvALcwrbwSpBobhIffAq4CSOe8w72nFNXqep4oQUDDUOzvqhBSbrM3+v5kI/ErS1Vv40jwL/osg+nRM0u6TMOLwzHXa8ZhBSJJNu6pMak9vV3vEztw6rzdiuxmO837x/ti/qAojA3wfzwkV+cMh0KfwPUI80veDA6VoInK/M+xMUFLJZrK056XtrUO2c5Ski36u0bAzlVulMcoFxIt49ldHHTwc/3jrf/usFmxkJUz/CwOs1+2kVKeT5eB4tQOYhEzm2aB0wvXvANaX5oY/RWH2HGAKlhJ+p7E7FrqYKx+Iq9bYbzOVf+B8yrysmv6WWVvus0Hi0PnAzgKzbrfZRlD4a9i/JjbXTTv2G9SylSLcTd5JOTRL677rpIUSJ7+NNd1/XIUBa/MxkUk68+dcKy+PnENhtqlDb1+l9zrMPQHqWHFYegO/84BVRhtiOx4BlA+wcJGYj92zNXomjDZ8qQsgIKRmvS0Eg1YV93/1DylKboVfwZ/OR7FOS+WWzRlbs1gBorF+b7J9IG0VQil0TZsdz2LJKppBK7jys+N2+zhhvMo3TYJk95Q0qpYee7234TIaQhBl1UBI7+ty/nus0rehX4RrNshYbYtTcUKC4fGAzZyJ2XWc1LQzyIBq3GegzcmU6AXWd6sFEbxuojhVzyEWroTWRRPKAyRpThlRYahqqcvl5uRYhIIO0gq0NvYV0TaAI9y7kpsTzlaeSrz4J2xUkznjO9QzNXMUd4VyiPbU9efHnDWTf1nJxRkbofdsp1lB/MjlGBUq459HV8oXh01eA8PRj45kyoD6Pz5lZabvaV5Y0VxFelZMSoSSoovd096bySMpBVm+5XcwFRlBO7ot7mV8uVjbTrinM7bCPBKA+HG3ky3KD7aZp+nRuddChbHaWp6OetDHMOTG8A1H9MlYO/jnDqNq1gJuu7zev9F4b2S9+C6r99hvTbPrA2qzsDi10tnwdfjf4FHC+Yvb35P4jv/Wc4SLH+FGns+Niu0h9LbEZyd/XR+wtTivWV/cZYEAo/BYZjNnqb9tFOXEBud7MgRUxa7GGhOUgMdBSja3BFm9MTUtfr+DLuEdP2xMbBcl8cF7E5Weap9lttLXBenraGrf0jIsQCbO2wMOV36DhjiMSlLuAHbv/EWWRPXJTZI571hlZeqvMHtngC/00LVNIBNIhICaCuuCVrhszAkEhgH0Ky1HDzSARif7LuwHyulcRLlinAgHysXLCVwvGSZlWnMZVP5yxPac0WCWAGKkTCfSfAiZnqZ3nzQ8a/0yXin8TOn6oWzLzDVn4Qy/mT+JMbp8D1jEFcJfX9cC0f1OSItCgf3N1UbhQsptbI43JKfdqczc/ghZ6eESJR8+qWkdgv1KSH7Wgw+zf02Ss9Pm2p1obSRHEgo3BFvdQi6E5Zf9ioKCiBKlYeHPp4OMhPIJTG8ZQ5bJEI2OtfxG6nKRNJcEAeQmbOdjZpaMZ+R5UV9Bt8ZuT5rb9xpIH/nCjo987YXHQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e0d18d9-e24a-43e6-c8c3-08db57635e8a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:47:30.3697 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hk8zI8xbT/8UBzodrMdRFFaBQo/rHRPwJDr8uU89B3hPYZJCQEUs0Mio+9ThSLk0kupjuppu5Bo1D8do8CySWGjtv02RxXjGucz6LMZCdFPQh6f8HA7ZWik2d1THoj2q X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5591 Message-ID-Hash: J2GJDSOPMIAJSIUDVQOVCO33ZQLSEN2C X-Message-ID-Hash: J2GJDSOPMIAJSIUDVQOVCO33ZQLSEN2C X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Current soc_get_playback_capture() (A) is checking playback/capture availability for DPCM (X) / Normal (Y) / Codec2Codec (Z) connections. (A) static int soc_get_playback_capture(...) { ... ^ if (dai_link->dynamic || dai_link->no_pcm) { | ... |(a) if (dai_link->dpcm_playback) { | ... | ^ for_each_rtd_cpu_dais(rtd, i, cpu_dai) { |(*) ... | v } | ... (X) } |(b) if (dai_link->dpcm_capture) { | ... | ^ for_each_rtd_cpu_dais(rtd, i, cpu_dai) { |(*) ... | v } | ... v } } else { ^ ^ /* Adapt stream for codec2codec links */ |(Z) int cpu_capture = ... | v int cpu_playback = ... (Y) | ^ for_each_rtd_codec_dais(rtd, i, codec_dai) { |(*) ... v v } } ... } (*) part is checking each DAI's availability. At first, (X) part is for DPCM, and it checks playback/capture availability if dai_link has dpcm_playback/capture flag (a)(b). But we are already using playback/capture_only flag. for Normal (Y) and Codec2Codec (Z). We can use this flags for DPCM too. Before After dpcm_playback = 1; => /* no flags */ dpcm_capture = 1; dpcm_playback = 1; => playback_only = 1; dpcm_capture = 1; => capture_only = 1; This patch enables both flags case, but dpcm_playback/capture flags will be removed if all driver were switched to new playback/capture_only flags. Here, CPU <-> Codec relationship is like this DPCM [CPU/dummy]-[dummy/Codec] ^^^^^^^^^^^ Normal [CPU/Codec] ^^^^^^^^^^^ (X) part is checking only CPU DAI, and (Y) part is checking both CPU/Codec DAI This means (X)/(Y) are checking same position. Because dammy DAI is always available, we can share same code for all cases (= X/Y/Z). This patch merge these. Signed-off-by: Kuninori Morimoto Reviewed-by: Amadeusz Sławiński --- sound/soc/soc-pcm.c | 75 +++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 53 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index af5d4e1effdf..f47ddf660c57 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2732,7 +2732,10 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, int *playback, int *capture) { struct snd_soc_dai_link *dai_link = rtd->dai_link; + struct snd_soc_dai *codec_dai; struct snd_soc_dai *cpu_dai; + int cpu_capture = SNDRV_PCM_STREAM_CAPTURE; + int cpu_playback = SNDRV_PCM_STREAM_PLAYBACK; int tmp_playback = 0; int tmp_capture = 0; int i; @@ -2748,61 +2751,27 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, return -EINVAL; } - if (dai_link->dynamic || dai_link->no_pcm) { - int stream; - - if (dai_link->dpcm_playback) { - stream = SNDRV_PCM_STREAM_PLAYBACK; + /* Adapt stream for codec2codec links */ + if (dai_link->c2c_params) { + cpu_capture = SNDRV_PCM_STREAM_PLAYBACK; + cpu_playback = SNDRV_PCM_STREAM_CAPTURE; + } - for_each_rtd_cpu_dais(rtd, i, cpu_dai) { - if (snd_soc_dai_stream_valid(cpu_dai, stream)) { - tmp_playback = 1; - break; - } - } - if (!tmp_playback) { - dev_err(rtd->card->dev, - "No CPU DAIs support playback for stream %s\n", - dai_link->stream_name); - return -EINVAL; - } - } - if (dai_link->dpcm_capture) { - stream = SNDRV_PCM_STREAM_CAPTURE; + /* REMOVE ME */ + if (dai_link->dpcm_playback && !dai_link->dpcm_capture) + dai_link->playback_only = 1; + if (!dai_link->dpcm_playback && dai_link->dpcm_capture) + dai_link->capture_only = 1; - for_each_rtd_cpu_dais(rtd, i, cpu_dai) { - if (snd_soc_dai_stream_valid(cpu_dai, stream)) { - tmp_capture = 1; - break; - } - } - - if (!tmp_capture) { - dev_err(rtd->card->dev, - "No CPU DAIs support capture for stream %s\n", - dai_link->stream_name); - return -EINVAL; - } - } - } else { - struct snd_soc_dai *codec_dai; - - /* Adapt stream for codec2codec links */ - int cpu_capture = dai_link->c2c_params ? - SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE; - int cpu_playback = dai_link->c2c_params ? - SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK; - - for_each_rtd_codec_dais(rtd, i, codec_dai) { - cpu_dai = asoc_rtd_to_cpu(rtd, i); - - if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) && - snd_soc_dai_stream_valid(cpu_dai, cpu_playback)) - tmp_playback = 1; - if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) && - snd_soc_dai_stream_valid(cpu_dai, cpu_capture)) - tmp_capture = 1; - } + for_each_rtd_cpu_dais(rtd, i, cpu_dai) { + codec_dai = asoc_rtd_to_codec(rtd, i); /* get paired codec */ + + if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) && + snd_soc_dai_stream_valid(cpu_dai, cpu_playback)) + tmp_playback = 1; + if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) && + snd_soc_dai_stream_valid(cpu_dai, cpu_capture)) + tmp_capture = 1; } if (dai_link->playback_only) From patchwork Thu May 18 05:47:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 684527 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1940BC77B7D for ; Thu, 18 May 2023 05:50:26 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 95BB31F7; Thu, 18 May 2023 07:49:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 95BB31F7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684389023; bh=8jMztwyRwd+lRhOw/Ajg1Tivj5TkIUZMFJ41RlmjPLE=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=pVpsRxES+XOrHVbpLBEjZPQIzzG1dQwTECFM6mvZ0Lkl7MI8layf4gKZ4H4TVo8V6 PE6XnUUgNRrXRRHznoCO4O+mP+S8bZzSXixy7EpSyT02cf8H9DmJXjNOAWVl1cLtg1 LQhMSCxZsUMc7ZQHUoIk+moALO6xdKUvwrNMaio8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C6043F80551; Thu, 18 May 2023 07:48:00 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 65057F80553; Thu, 18 May 2023 07:48:00 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DCF63F805D8; Thu, 18 May 2023 07:47:56 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2072e.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::72e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 56DEAF805C6 for ; Thu, 18 May 2023 07:47:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 56DEAF805C6 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=gptSLUes ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JLAspwHG9a9U+dx22LqxzIGYvza09TXWRoM/yc3kh744kxf4DZBrehb/X5HziA9Ep236eA4/ozXqKXV4FfNAsIBp7DQmx/B4/PwTpD7+EcUZ1LvwmQHO3PXAlEBo7oRvJo+hqc4WOmyjayZhKxDgvI/kzDdOSOyGeDcxFA29+8wvvmweCg0Od52I3VztivMizrP+3wHrxrPYKwa09DcRwgfHbmzmu7y+1YInKT2CwlB5E5MJdxNAAcit/AgfMkkP1/mOGGG9mkqPHl+sUKi0/Tne3Wj05xwMpJROAZTzAEG4cEfAf4C3WVqjGaSTn0vDfSHGqoHMDJhKhMTjsyOAdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=md0Fm1eajLDgX1+Cl2L1J8rabgMiGhtyYADTrQZisW8=; b=cFHU27/2AgaAvahLz6p9QIZkXrrCLQYg+zTyiV+4nyotNkVgtncW1m4ETtzyL95h/t0ygPc2p0umqN3PtwERkZrmahsus2qM0ThRezwcNayVxbf0W/6LkWJod6bjUfEWPmWN+M3ttaXNcrl5HdoSROGxlWuj0KIPCh4x+pEAkdcJohcGkumUBYyKzmYo1PW9RhtskNb/L6yG2IfFOy2ZdmSwToISTcfk8poqcROW3VO4G6yrP8lb62JsATfGtKfH6JE9gTVNEZCV2mSijQvUayA+YjKnp+1iRJwgMpWOKu5PiEmql6MqFuAOPGfJ9qy4d0XlArGWdCSaIx3GSMWR0Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=md0Fm1eajLDgX1+Cl2L1J8rabgMiGhtyYADTrQZisW8=; b=gptSLUesQWoAeoOBxsWxtr8Z4KIu36q/1WqFAkQPiy6EThxFGXARCreYIKkkcxuwsm+atRR0Iq38PzFTs3sZ2mPRP8T1k7e9MsiusFUEZyDCppflFRXrQjEP8GaF48X5YPKFbrZhVF9GR2shOqhBr6dN3DEtFvT+dGd9xI/xeFc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB5591.jpnprd01.prod.outlook.com (2603:1096:604:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:47:44 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:47:44 +0000 Message-ID: <87pm6yp4w0.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Lucas Tanure , Mark Brown , Takashi Iwai , Vijendar Mukunda Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 09/20] ASoC: amd: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:47:44 +0000 X-ClientProxiedBy: TYCP286CA0315.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:38b::9) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: c4fbd35d-753b-4454-1c27-08db576366f8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VjcgUxWxoj5UOGX0+fukEDHHvXStENiIeYHPIyYvzMTdWVWVfKF94tzBtJUweWh7Fm9PIrs3DrN6XHcdAEr72BOTbX6OaVhA1x6hZ8uumeYBMiEyEjQysurvk4sPrTIg4tccrEBFBUrEgzEbzrIJvse0sFHzCfPMufneqb5S+10vtuvvkWEH6QHsCqje4leIFMiPS5parXZcNI93zz6pcL6m0xFDoLBCZTf9xGZenIwFmne+xy911DXOuYp3O5v3Zt1FGWiEffD9R4BzwwtNo72k453u0nuFd37rsXocIJNdWQi04DrOehuvQ7pMetkiQ9In9CjNDVLYRoSLmzlGrXrXGPTSQ6qhdl5TPVtjZHehb6GiQQ+zFDOzIwL5EPGFZo1/Ek8Rfxg9ZDo7rPCIaJl51ggzuvqSuspCpjPmORsZQlRrTW5eFZlmNl2SN3/eFCXyqU+0KVydg9jpkTclTuq9FZLmO55WAcNpdsFzZrFCnt6ftmvGEmd642k0JSbUSYpLY0dQk2hVfKUV7tqrEZyhVnikgwcPyFH7Q0O0Jh2/MoQtsQD4tigTefybqlwhsfnaQje8+wZQOKFNP8IGfHuCg3/0BqrW8QfqxVLSU53KCuX7J/JW0YhraAbClSI/ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(316002)(4326008)(66946007)(66556008)(478600001)(66476007)(52116002)(110136005)(86362001)(36756003)(83380400001)(6506007)(26005)(6512007)(186003)(2616005)(41300700001)(6486002)(30864003)(5660300002)(8676002)(8936002)(2906002)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0SExEbb1dpr0SlL4AxgPuAzhR9zH2rZIYLg70i5alkQHsYiMkLki9TzKXM8o2nSK2885L8D2/Ih2I8KNg+fmCiO/wPTDDv8Ob6DfLuK8NpmOvuXcUGLhLD7zk7dvMNp3Iy2wl6VpTe6mS5LWgpGyXAhlFCA6UOvH72Xfr7Q2+eLsFEmPlpiUrtpE3+i7wYoYavBjlg/mfaFvlnXbnK6+wc8csO0OUH/evoS+WFa0dIZv4I88XGO+DXERtZu84EymhXrCTRBJnaZI+NwcQGqburoKNnygQk2ZHpKUGcMi5W/2EXWF3tfPnRW+RN8ntO71qVF/ncX0+NtdsqICT2Y9s6TIGF5xgMY7Kl8ZmFmqsjQSzqzECA9ADUPUuJ6RWByc++iSuoVedEFhU9QgXyTxmDob0Vh9VLA/3wkJjb0qO34OKHPetyVT00s1NXQ8f7TnENup2EVel0cj4eKLE0omAyNohaZYh/6cCNG2hoeqY0J4bBt1Eijytt/8ZXPlkyM84/9qdyLDXDmVIrwt8/fklr0Br5nHkjFW4E4BgH0Pcu9U0dTBvx5wGkfRD5OCkCOQYIfrM8WyrHB/vpFMnBo5gYekb+DY6szzty1kz7F0PPD8AGjyLe/w+iBreOegYpSQEnwBfzCL5DEmf1RVv3nZkphCMV3eW+FN0zoqIe/IXPtCnPc6RHDYb+UX027csJLrPclCTtyOs/CwHM2JTLui88D4jh7VHqtn9vZP64uDD24VpjBGa/6rttkTZU5AIQ1BXKcPL9njGC2toVCmc2ZClsvhJKHM7P7ln3F91sHZMTTgV1GHnx8hB6pCMWnZLc9da5AG9hbrCkiM8gTFcb39VX8TaUQFFVpi69TJ5aaY0GwM981nM3Lkc0hl9hMvphm68Iqihp3yyjlYP12FcDBKyMw9R3QNiExTkCUs7schiQhCw35wyB57aR9fJSqEqC2NRLIHFFbC7nhPLmVq/owd5YInbO6o6SI3x5t/rOK7bJWH5r0eMcHS7P3iYgxQTfALM2R9+MT4rXUg1vZ/xvGfACzJQKYbnpaMgRrOso41cLgyGpXgE7vb5mgjC2Dt2zmGYHtfXmednrttaiIFmRNlPViO3c+Orxa7f2+AAVBw3QOJBWdRFtrWX+mLLGy8XxkcEvpoR4fN1YsmGdAmHVeTfk5DSCpj/PLnVauaTVGcH7XvEipwBENAzSIqCWx04SNLgZMvRd1sO+Tz3hLHneOIMlSKpPJJWW/5SjadZyceHaL0faSxGTv6FyRsjB0/1S9tljVFO0kAb3OE7RU5xf5rcho/lRNc+Nmo1tF/la4oTJXuhGlp+HNlOTey9pS785l7UQJpiHlqnjZ85NmjKrxwR1HDcm1+I21v9AxKB401HPasj9Qztr4DRy/L9Ic8woEFOZJICBH6rDPXilvud8g7BeTeSubiNacua5hWycmCcOU5hoP58k0J09WJeSPiwNSLeGFURQOWQzk2ZJbpkdYfoY1IFFQyAxwyOdUAkzJGIqaJ5vA979jLuoybwqSebU8WzXUZ1jrmwQjOAVeyiYlsI7YJPAntrmV3Tmm4Jsa3X07alT5ignjRxDt6PRvz+3yhmj5sMV0pePWX272SnuZIO9+25Q7pIcQTdzDcv459NOQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4fbd35d-753b-4454-1c27-08db576366f8 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:47:44.5077 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mWokAfuLDDXYs2clXIQxk1Ot6V9iqCXHKrMytn5JZGUhDq9LAdFJQ/W9aSQg9ParLyKYwNjiugbalBxfdmkbk5w6lNFoBHAuJpDLe/3X01T/MiNlkd7C/xhhEXj0EEeE X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5591 Message-ID-Hash: 44RMWSHCTDXYYZ6KUMI2ILAF7M5KXU4H X-Message-ID-Hash: 44RMWSHCTDXYYZ6KUMI2ILAF7M5KXU4H X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. Signed-off-by: Kuninori Morimoto --- sound/soc/amd/acp-da7219-max98357a.c | 20 ++++++++++---------- sound/soc/amd/acp-es8336.c | 2 -- sound/soc/amd/acp/acp-mach-common.c | 20 ++++++-------------- sound/soc/amd/acp3x-rt5682-max9836.c | 6 ++---- sound/soc/amd/vangogh/acp5x-mach.c | 3 --- 5 files changed, 18 insertions(+), 33 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index 375417bd7d6e..7b20c25388ac 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -523,7 +523,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = cz_da7219_init, - .dpcm_playback = 1, + .playback_only = 1, .stop_dma_first = 1, .ops = &cz_da7219_play_ops, SND_SOC_DAILINK_REG(designware1, dlgs, platform), @@ -533,7 +533,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .stop_dma_first = 1, .ops = &cz_da7219_cap_ops, SND_SOC_DAILINK_REG(designware2, dlgs, platform), @@ -543,7 +543,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "HiFi Playback", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_playback = 1, + .playback_only = 1, .stop_dma_first = 1, .ops = &cz_max_play_ops, SND_SOC_DAILINK_REG(designware3, mx, platform), @@ -554,7 +554,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "DMIC0 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .stop_dma_first = 1, .ops = &cz_dmic0_cap_ops, SND_SOC_DAILINK_REG(designware3, adau, platform), @@ -565,7 +565,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "DMIC1 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .stop_dma_first = 1, .ops = &cz_dmic1_cap_ops, SND_SOC_DAILINK_REG(designware2, adau, platform), @@ -579,7 +579,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = cz_rt5682_init, - .dpcm_playback = 1, + .playback_only = 1, .stop_dma_first = 1, .ops = &cz_rt5682_play_ops, SND_SOC_DAILINK_REG(designware1, rt5682, platform), @@ -589,7 +589,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .stop_dma_first = 1, .ops = &cz_rt5682_cap_ops, SND_SOC_DAILINK_REG(designware2, rt5682, platform), @@ -599,7 +599,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "HiFi Playback", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_playback = 1, + .playback_only = 1, .stop_dma_first = 1, .ops = &cz_rt5682_max_play_ops, SND_SOC_DAILINK_REG(designware3, mx, platform), @@ -610,7 +610,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "DMIC0 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .stop_dma_first = 1, .ops = &cz_rt5682_dmic0_cap_ops, SND_SOC_DAILINK_REG(designware3, adau, platform), @@ -621,7 +621,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "DMIC1 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .stop_dma_first = 1, .ops = &cz_rt5682_dmic1_cap_ops, SND_SOC_DAILINK_REG(designware2, adau, platform), diff --git a/sound/soc/amd/acp-es8336.c b/sound/soc/amd/acp-es8336.c index 89499542c803..982db7d9cd17 100644 --- a/sound/soc/amd/acp-es8336.c +++ b/sound/soc/amd/acp-es8336.c @@ -150,8 +150,6 @@ static struct snd_soc_dai_link st_dai_es8336[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .stop_dma_first = 1, - .dpcm_capture = 1, - .dpcm_playback = 1, .init = st_es8336_init, .ops = &st_es8336_ops, SND_SOC_DAILINK_REG(designware1, codec, platform), diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index 6da17140beea..3df2f7733b32 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -899,8 +899,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_sp); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { @@ -930,8 +928,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_hs); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { @@ -961,7 +957,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_sp_virtual); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; + links[i].playback_only = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { @@ -993,7 +989,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_hs_virtual); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; + links[i].playback_only = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { @@ -1027,7 +1023,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_dmic); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_capture = 1; + links[i].capture_only = 1; links[i].nonatomic = true; links[i].no_pcm = 1; } @@ -1065,8 +1061,6 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(i2s_sp); links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &asoc_dummy_dlc; @@ -1099,8 +1093,6 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); } - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &asoc_dummy_dlc; @@ -1128,7 +1120,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(i2s_sp); links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); - links[i].dpcm_playback = 1; + links[i].playback_only = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &asoc_dummy_dlc; @@ -1163,7 +1155,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); } - links[i].dpcm_playback = 1; + links[i].playback_only = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &asoc_dummy_dlc; @@ -1207,7 +1199,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_platforms = ARRAY_SIZE(platform_component); } links[i].ops = &acp_card_dmic_ops; - links[i].dpcm_capture = 1; + links[i].capture_only = 1; } card->dai_link = links; diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index 0543dda75b99..154170f353ec 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -304,8 +304,6 @@ static struct snd_soc_dai_link acp3x_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = acp3x_5682_init, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &acp3x_5682_ops, SND_SOC_DAILINK_REG(acp3x_i2s, rt5682, platform), }, @@ -314,7 +312,7 @@ static struct snd_soc_dai_link acp3x_dai[] = { .stream_name = "HiFi Playback", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, .ops = &acp3x_max_play_ops, .cpus = acp3x_bt, .num_cpus = ARRAY_SIZE(acp3x_bt), @@ -326,7 +324,7 @@ static struct snd_soc_dai_link acp3x_dai[] = { .stream_name = "Capture DMIC0", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_capture = 1, + .capture_only = 1, .ops = &acp3x_ec_cap0_ops, SND_SOC_DAILINK_REG(acp3x_bt, cros_ec, platform), }, diff --git a/sound/soc/amd/vangogh/acp5x-mach.c b/sound/soc/amd/vangogh/acp5x-mach.c index e5bcd1e6eb73..9d8bb9c0efe5 100644 --- a/sound/soc/amd/vangogh/acp5x-mach.c +++ b/sound/soc/amd/vangogh/acp5x-mach.c @@ -273,8 +273,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &acp5x_8821_ops, .init = acp5x_8821_init, SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform), @@ -285,7 +283,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, .playback_only = 1, .ops = &acp5x_cs35l41_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, cs35l41, platform), From patchwork Thu May 18 05:48:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 683423 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1FD87C77B7A for ; Thu, 18 May 2023 05:50:41 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 1924F1F9; Thu, 18 May 2023 07:49:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1924F1F9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684389039; bh=gjEtTOuwdHygB00M0mSD28h7HCIjauQDLvcJrmQxA18=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=eH8pIis0CaKlrkc1mIrNoxvCnwhJcGshuXRQILihadTTi6kFBgMW9BnhXJolBdXV4 3E7vZlq/3YOAR8sLvG23Jg5zkcaQVHbjbot07+fG3OivfHBUSbR6cJFuDZDLktVJmB JZ8uHqQnJqmP3QFNLKo1RZpgjeK6sYnUfQQjjio0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3B731F8055A; Thu, 18 May 2023 07:48:22 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id D3290F8055A; Thu, 18 May 2023 07:48:21 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 97CE8F80431; Thu, 18 May 2023 07:48:18 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20724.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::724]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2683AF8025A for ; Thu, 18 May 2023 07:48:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2683AF8025A Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=VluKqYfP ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jNQc/s/6opq0tWKvoPb6Ep0SxatKvnqi3ijrsyai9J9mw8Qj9KCh/jI8pjYdNhuUKvUb37Ibo2FL+gLahQkPfTYDN5T2PpcBf0Pa5Fzk5GEhzHoV118k7XoL7+EDA2kCoqk5QMnM727ntXewbHXY6a85K1RD/f7a92w/Bys495R1GoCIMtdp7uQsgSpd1SEqe89mDGAXbRl15sMIRPQEH5qaszkLeXcav5n7y6PE0NLImci0Yuo+XPHEl8Qs1XD5fnephrzH0Gnbq3F+SEyFMnRLHpPbKIY6+EhHvvmmvSWlPay1dNFm7cEm5Krct3SuuXtsd5/sk6LsBuM5Kg58FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZHDmF0ep9pmzKKDyiOJ8g9YRx3vltGoaH3tV5Fj4OYA=; b=iKSLCQ/fTdEGV0lH1uSHeOpmTJBpq2z81LoaJMhoom1KxIAF8TIL90feHjx6bS3xmscF3QocTFed5Sdsd2A77cw9fars/yxPRFNxO+mN1gbtu4BwAbYkkozGHXWk50jPTlCs1O4LOg9fUAyZ69RMBxQjDKGpFsZOWRH6v2S9f6BZht4cY6f4YRIQCxWisCTVtM2PAeh2vpgVwISkbwcd2H61ITKYoOinC9CyjwGyQH7MdyYGYpENq5uJ2unzvDzUnebjRSIHY4sxSNSPNLHeOQQPrnT4qWu+cl972m6DIKwyO4ZeynjHDDf3M5hnC/vl4rS1veQU0FQueqPPeXtJJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZHDmF0ep9pmzKKDyiOJ8g9YRx3vltGoaH3tV5Fj4OYA=; b=VluKqYfPyNNDN3J11775lPsQdCsq+MptmergqC5bR61Ztf0DppUgss0ddej22wyveo3yq6nGKLiXI4Q3dVdcHrucMUNhKw2XXNfLJRFlCr3/4uJ2wlDhgc76Gg5A84N/+oLsoPJwLVDWBaOZu1uhGVT2VfMD1NbU2ndl5S+2kRE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB5591.jpnprd01.prod.outlook.com (2603:1096:604:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:48:08 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:48:08 +0000 Message-ID: <87o7mip4vc.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Sascha Hauer , Shawn Guo , Shengjiu Wang , Takashi Iwai , Xiubo Li Cc: Fabio Estevam , NXP Linux Team , Nicolin Chen , Pengutronix Kernel Team , Shengjiu Wang , alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 10/20] ASoC: fsl: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:48:08 +0000 X-ClientProxiedBy: TYAPR01CA0215.jpnprd01.prod.outlook.com (2603:1096:404:29::35) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: 586d1b1c-6703-4d1b-1045-08db5763753c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EYRh+6n1zB1PUVqnxx+Tapt/RDnZAxg+fo31Nj+ejLxnm2cOSfkD74Y6Yl70pJYyiYqnZD8KyiU3HkeFUWO3xb9TiwmxcvlyfCFa1t7dhB3/qtMjviLUBgPKbxiCXO9XtQ4tBOyrHr2pDf5uSIHtbOmjIRmU06dVp8IrZycye/CX9/BHVTQP6PeloeQv+Xp7KW7bP8xBQRJvF/9kxDE/r++k6auRmrj0cKZQxOlGBVdzU0QO7VQVQVU+F7/RtveCbVIHncQdEMcmDvDasBu3bhUh/E1Ni7MflkorNiAASHSMSrtGCOFl69FKm5jc7W8UgnGv2Hd5gDqXGBAk5iAe45igeAkg66l9+7H7bHpLfQnYQujWTA/ZiaHZW7/CAiI7J/dzMDTfpz/4kH53HMGZ2eL09A8S0gh/BSN+Md0FSoOaB4g1jN1tH1MyuUDOOe3RO3I4+qRX9OVdasis577WcRE7pJS94XOOMNKhPhXA8aQigBsSzzcF+/kwjm12IpzE9Eh/pPIaRolnOXzb2UUoRjp4EEr/IjbhNzjLJIPQiRnPmWm1KvOIBvkl5JDygIgtFu1OPBqaOmJ0WPmyEToxGLuN69Fs3osuo99lgk7tsqIfz/eu82frVqZBrDdHEWT6 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(316002)(4326008)(66946007)(66556008)(478600001)(66476007)(52116002)(54906003)(110136005)(86362001)(36756003)(83380400001)(6506007)(26005)(6512007)(186003)(2616005)(41300700001)(6486002)(5660300002)(7416002)(8676002)(8936002)(2906002)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CshsrsGL9p9jaTxfCXbEwm9h3XvbTxz+B8KiXiQNxto1ftgtnQ7261XbCJjA+6BflGXCR1lZeVPZp8spRzU9OjdvgFdzXqbXtVRXWIHqa6YQlcoM2TiCOojZTfBwhK4RRgSbLi2caWMjpO1I0Aw6j57RTtlIsxrzERGFa/bWHota2b/1qMezpDm1hlA3sI2QxCeWtFExNOglzSQDoygvVr2ul5d8d3Zxr9ReWK7I9kCV7AjqOnBYt6hLMROz0CrMeKPrSm1xBBudDXZvd0we479UVPm7LCjBUotwClx30u9oRZcFcrFHyja+8QTwierO+87JhV3yJvTcm/q1jtboj4pKxyOOZ8LRo9WFmuiVcHIUaaz3/WtHLCrE5Y/CyvCo7+Oatf866Y7S/wDyOY7qwS+hSUsl9EasBFH38Z6lda8t3yvITryHYOs4sPBfvPjMmF4CUmr++hqoDLT5QQFnwDEXEvw8mZJjIulVwfU4iav+gLYdSI0R85wnqkKnBhUWhWICjtb09Km+GT1HU2LjnAXxVyeEGamwq4ruOiJf2hf49gQ/u1F3DwQaw2lQtZoaC1ySGFt2NZQw2DCDjsZJOEawg3+MP4SUlh0AK8DExREJgZK6FmU5K1AnWMRUqCYHqf/YVlRmKlE2v3GcH1e3UZoT2Vle7uSu0Zh80wIRzVBWPMfxBWubn1SdpUr9jk+/DzyGCAoQegSjJhxnrqbTyWNQ3ZIUcaRL1P+0ZT2fgPmOJML1FIc+eKepDUgiG/J6JgimFQAjyY4bXdfpA6NKbwoU1/XTc6Thb3kFzRI71z4S9J6Cxtat6D1bOTWyNQc9p6nNqHVARcbob8S6UBUKIXVxAyJCHBaqP+/UEc0tp2aKF7yEZrZHegsTAIhjuYed3hvb2baKAxuWJoBwfYkAJunK0Vz00LHFGUN1PcUpmmk92eaNWhJI7m41+yBnbvBsgp8ViHEGv+Nz3wSCEewdHubw1QdnSYl1BVtRjdy7w/QscWcBq0l15TeT1fMMGCV5fyV+16gqI+D5MRlDupyiD5T2xCnWCr3vZ5akBgxwjqow6YmnUbUm3wrqM/akcbH8UfOyrdT1CZA1U871qG3L8fKOOqyz2n4tgzRBnUEyugurRoUaaGcnt4XB9c+DnnovtRENdh4HCtx7fR208fNqwc3T4JYbq/YyqzbCpX32OGlfvlyem06pc7is7xtyYJ2u/phILAiuz4D3p/6g2G6wLVeV1QfAxlJNZT3FYMaITsYGO3I8N5fD/JcpoBaNwmUUKsSj+tzjfKKmmRtaJ3mDmcETqxLMWMllRKrid/N5Ht2gvafLOdJFIcEEF2w0czCIaDh0fk800iN4vR5NbbiUUYWudVNxNTVBlHX9B+GLnOmEMqqK/cal/821Bstpcuc35vb7XLWeOyZmkyd7wr+txyVqOLlJhpu+kxpfRxDzJbk360dru1pZu0r51hRdqZfjXvYD7y+lVHooKpIfJVFfBs9lFIzNEQORa18foemS8/8uxxRhnqqZGNHPFR1UveyvGw0QuGkM1YMnwHRuwYRVwzsg7krsEATCAWBEV5wRzkLtlffcVlDfQ2iphoEbjELT1kkVHyEc+YD05Sez8D/rS2F7VSSS9KdqbAUU/go+wcU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 586d1b1c-6703-4d1b-1045-08db5763753c X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:48:08.4418 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DtCNlumH+B1y2Ch8vOVyihuZ5NGA/Zx1tzd/fEUkz231h9G9pAnKFGYuT3fhgMHMWilAaaYnALUGrNlNWDVPJVBJrldTYmV5ztLgqgB40zA1wV6jXcPSlhMpEYQjDwY/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5591 Message-ID-Hash: NLXKUIXKF4X7KFVES4S3T6MBIAKZKXT2 X-Message-ID-Hash: NLXKUIXKF4X7KFVES4S3T6MBIAKZKXT2 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. Signed-off-by: Kuninori Morimoto --- sound/soc/fsl/fsl-asoc-card.c | 16 ++++++---------- sound/soc/fsl/imx-audmix.c | 6 ++---- sound/soc/fsl/imx-card.c | 4 ++-- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 40870668ee24..917d9da5c57f 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -311,8 +311,6 @@ static const struct snd_soc_dai_link fsl_asoc_card_dai[] = { { .name = "HiFi-ASRC-FE", .stream_name = "HiFi-ASRC-FE", - .dpcm_playback = 1, - .dpcm_capture = 1, .dynamic = 1, SND_SOC_DAILINK_REG(hifi_fe), }, @@ -321,8 +319,6 @@ static const struct snd_soc_dai_link fsl_asoc_card_dai[] = { .stream_name = "HiFi-ASRC-BE", .be_hw_params_fixup = be_hw_params_fixup, .ops = &fsl_asoc_card_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(hifi_be), }, @@ -633,8 +629,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) } else if (of_device_is_compatible(np, "fsl,imx-audio-tlv320aic31xx")) { codec_dai_name = "tlv320dac31xx-hifi"; priv->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS; - priv->dai_link[1].dpcm_capture = 0; - priv->dai_link[2].dpcm_capture = 0; + priv->dai_link[1].playback_only = 1; + priv->dai_link[2].playback_only = 1; priv->cpu_priv.sysclk_dir[TX] = SND_SOC_CLOCK_OUT; priv->cpu_priv.sysclk_dir[RX] = SND_SOC_CLOCK_OUT; priv->card.dapm_routes = audio_map_tx; @@ -660,15 +656,15 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) priv->dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBC_CFC | SND_SOC_DAIFMT_NB_NF; - priv->dai_link[1].dpcm_capture = 0; - priv->dai_link[2].dpcm_capture = 0; + priv->dai_link[1].playback_only = 1; + priv->dai_link[2].playback_only = 1; priv->card.dapm_routes = audio_map_tx; priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_tx); } else if (of_device_is_compatible(np, "fsl,imx-audio-wm8524")) { codec_dai_name = "wm8524-hifi"; priv->dai_fmt |= SND_SOC_DAIFMT_CBC_CFC; - priv->dai_link[1].dpcm_capture = 0; - priv->dai_link[2].dpcm_capture = 0; + priv->dai_link[1].playback_only = 1; + priv->dai_link[2].playback_only = 1; priv->cpu_priv.slot_width = 32; priv->card.dapm_routes = audio_map_tx; priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_tx); diff --git a/sound/soc/fsl/imx-audmix.c b/sound/soc/fsl/imx-audmix.c index efbcd4a65ca8..5cf7bb861698 100644 --- a/sound/soc/fsl/imx-audmix.c +++ b/sound/soc/fsl/imx-audmix.c @@ -255,10 +255,10 @@ static int imx_audmix_probe(struct platform_device *pdev) priv->dai[i].cpus->of_node = args.np; priv->dai[i].cpus->dai_name = dev_name(&cpu_pdev->dev); priv->dai[i].dynamic = 1; - priv->dai[i].dpcm_playback = 1; - priv->dai[i].dpcm_capture = (i == 0 ? 1 : 0); priv->dai[i].ignore_pmdown_time = 1; priv->dai[i].ops = &imx_audmix_fe_ops; + if (i) + priv->dai[i].playback_only = 1; /* Add AUDMIX Backend */ be_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, @@ -278,8 +278,6 @@ static int imx_audmix_probe(struct platform_device *pdev) priv->dai[num_dai + i].cpus->of_node = audmix_np; priv->dai[num_dai + i].cpus->dai_name = be_name; priv->dai[num_dai + i].no_pcm = 1; - priv->dai[num_dai + i].dpcm_playback = 1; - priv->dai[num_dai + i].dpcm_capture = 1; priv->dai[num_dai + i].ignore_pmdown_time = 1; priv->dai[num_dai + i].ops = &imx_audmix_be_ops; diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c index 78e2e3932ba5..6e3ce0817478 100644 --- a/sound/soc/fsl/imx-card.c +++ b/sound/soc/fsl/imx-card.c @@ -826,8 +826,8 @@ static int imx_card_probe(struct platform_device *pdev) } for_each_card_prelinks(&data->card, i, link) { if (link->dynamic == 1 && link_be) { - link->dpcm_playback = link_be->dpcm_playback; - link->dpcm_capture = link_be->dpcm_capture; + link->playback_only = link_be->playback_only; + link->capture_only = link_be->capture_only; } } } From patchwork Thu May 18 05:48:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 684526 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B7136C77B7A for ; Thu, 18 May 2023 05:51:12 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 99A03828; Thu, 18 May 2023 07:50:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 99A03828 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684389065; bh=/gGvoWNPIXjOCug9Dlvk31kLtLZT+m9PcFiEzCiHFes=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=mDCRS5vefEfmGmiWMqtHpMkIXKZK3IRtbax2+ddH/sszIMecccLzZfg5JlTeUH+KH uzHyTmrSuLvXo1UIuXtl1pWK9wDBr+XRtB/Fz9YTKfPvhcpn8r2UfoDp9QnGdTa4Db XCitFdaRhbJmeaAhkozIQ4L3yzfem+v6siVNjrGc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7BCAAF80571; Thu, 18 May 2023 07:48:27 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 3C4FCF80571; Thu, 18 May 2023 07:48:27 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9166FF80580; Thu, 18 May 2023 07:48:24 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20701.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::701]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 6D7BCF80567 for ; Thu, 18 May 2023 07:48:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6D7BCF80567 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=hEYvPqpO ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HT9NadRXUXvK2iDHX9HRN8M7AoSe3QnToChmm5BI4Hj/ivtnzKb5NUcHDDd1bVgPL4aX171WoMrGnExbPDpmzgS6APwsIDe98jcrZtAs69YZO7m87Adztt8K+r+auwtDTdllsRx+y3ezOFharkY/Az1CRu7l+Xbr+8hTE8zd25b2ps5SwiQ3R4cPHcU3cEPxav2LTfFwEpAHCkMwsMRID+4DZoQP283fpHqRC58LCfQK6Z0vZoPWqWF3w385VELxuljCYl2sjJOv8obWBgg2Ps5nGHZnAWTKcHRyb2js6/jBcO95TJ6m74Djz9RqmrPuV57aDij8h7lGlHJxGrDc2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EKh20u7Mb5lE9ujkhgksEQ9tTPv+/CEs1v2IJf2fFM8=; b=GFk9tVAKcKpivWO4uMh/fp8fbni3DPPIUPPAVdQoA73FVjhpBKNoVdlcPV4JR2VsoIUJw6rVk0lFWE7NQwJviJG326uAztRtVw3ifM9d5epwkSs/L1TUXD4118R5FsETPKVCel02Y6NiWSnLwwo7Tkh6MiEB70N6tE+8lbeZgIHePG5WTn0dsSYk2QIoQtJdPH6qlqA5PGU+QFhLrYlL1m24Nh2o5U0PGC6RoqUnBXUB4ZfXEzpBnEHbycsv8+dsS+JboVIhB7k0Hv6oQErr6Si5TiAEk0ezog0S1ko+c5e2Z/Hg7sweJ20IDdJzDb9Q8zusjwr78F8ahDkC0NHJjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EKh20u7Mb5lE9ujkhgksEQ9tTPv+/CEs1v2IJf2fFM8=; b=hEYvPqpO3+EYabkbBvEN+DmWOu6rviCxWnXXmU/MKVif8yPJVKDHdBIQYCXcndW5MfMUL4oNTdsgswpDc1cNsB1pUWAO0HGNAGhahDPHYJnKybdTilltNC6+nwCiXfFTZyi69RPQzNLA58xp7bR0x8TQyAXVUZF4IIH5dP+qqZI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB5591.jpnprd01.prod.outlook.com (2603:1096:604:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:48:17 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:48:17 +0000 Message-ID: <87mt22p4v3.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Bard Liao , Daniel Baluta , Jaroslav Kysela , Liam Girdwood , Mark Brown , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Takashi Iwai Cc: Kai Vehmanen , alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 11/20] ASoC: sof: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:48:16 +0000 X-ClientProxiedBy: TYCP301CA0007.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:386::18) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: 32dd694c-a01c-4989-367a-08db57637a6e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gJn+JdHxBR7px9+qB6wTU7ef/YXWaf0OR2yFnJrfSWlLQ8aRpc/ogxqF3OAZq7Vf3U68AKAis+f/QKPMoVtVXnN9cWgrXYMIdHs+ZWuw8cVa9emYvvi2hXGAQ42TnsgBMm2ziCLod2McaB0D4cawXznk2Mhd2MC49tyIHqiC99hqWZSbclGM7vqWMnyE9/KwTH/A6PGt4nlBC34TirtvnA7BeIjvFPcbbv4HyRe2h5peyuPyl4MjPoYyUbgxN75aRjvmDlbgj5QT/BJWM2+XD5ThX1oGGBMWTLrLz3Xsi/QDEHMgIH/ry7Fb7RrhLq+OXW8E8V+gfTXgmz+ctem20s5By+G+pK6+42XUBOdNZa7TGXGBm7cKt4z3vzc5f7TaI7W2FkmEx95lyG8+vUXleotDXA+NE3/dLI6QIg74mFMp8ZOU46XOjPms5Dcqt8jwTOI5W9C6eOi6C4h3W3SPS9yrXPZycF/CSWgv59QyMaR1ZYiipjqpA/RKw5WOexp8VxrHDuiJ9B3OOOwLT5to9QqwNYij29es59Ysfbe/khEvRtmUy8/Gz8MMmLBIIfTRPHjSP+e5F2CuA5ONJFIbwOu92EVJMgW20/+09g0+q2rtzoUk6xU7+azCiNVPHztj X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(316002)(4326008)(66946007)(66556008)(478600001)(66476007)(52116002)(110136005)(86362001)(36756003)(83380400001)(6506007)(26005)(6512007)(186003)(2616005)(41300700001)(6486002)(5660300002)(7416002)(8676002)(8936002)(4744005)(2906002)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h0zc4h+QfTILaW9LTOtK8rBreI8zS5c5gSkuz1yq+2N3OPlp7FdYnbScyapNiE67EU2jZSZx9HS3hTUfhM2PJnlnNbuI9bgjIoGbleKX7xr9m+7GeVrpid9sCXZTPOSjSDAgMqTthhBfCdDJLloRJfQeyFpoV5eWufDWGqKo1YA2I+kFh97e24RTwDtI0zQRLUdVyt+P9aYZrxAluCGnDBTbxnxnFEs2pMudTftBS8e3ikmDSa7/CN+vEpIAFpgA2G0riZ0xDEBwngUY9ppG3AjC638Fkf1UuDjP4cz+iFhBJXSVQNmOKc742PgwiMXk8a4UbGJwhU+dXD+U9ErKfHUAdG4Dp7Apnsv+RKlGiB233OVGMx/zOMoQtik1nRR/pjQkKR51kb0GPkXsh8PsLvahmXsr49rrU+Mn/geJ0850vVnrC0ORzkJ0vWu/zh/G8fnoBTa4pH+LxhJEQUEN638s18Wkk3rWkhfJwP0202OzASNxgdb1UtO0gkWFFxBef9/khF5441TKL2E7RYRyDhhZfcjoA3Q/rbzuRSzjG9FLtPaZjR4m1nCfvBRFoXRlDoWvBQRcz97sbYOCSdXIRSnFLe25NR069c2ECfyune8oFljvIc7I6u1lVpsJWGAv6B6jRbKFjpOdjwbgOWBRVD8fgWXD4bIECHO4+1sebScGJ/QscMqMdqZ/I9gBUO1gjzGw89lWmYtpDUJfrsB8Mu0soT61WvzD4JOYw7bOjZTI6mNAGUmQSWJ4Hje8nUUllisuQkvpgYb8souMYo/LeM7HNzEmkW3Rps1f5Dm/eRg+0Dw9l+WTAit6nUcmlHE31EbKSm6wvIPrvFrL1CnY+GG6Lq+7NjvLFOyjBKhWdIYUm1xn6YaLSOSsmzr0MufA5BloJGqz0vrZcY+1SNvfSyiZ5mYU8EUx1TYFOq4uQ94I2tJvtyRnvDKZrPwp5qmqhNZvM3e0Gr7J3FCVI6DzaOaFGjrmFcrBITkBYmjCisKMPLp8PSo/i/4vwgIf0ZGNqiXh18doBZURUQk4HDbTHIAH+m13rHVwsNMN6XEKcIBnZ0DZr0UVi1Ayp+r6x6KS/TOaW8CSU9+T5jrdZmu9S+1aOHLz9V5dkgFomF0hU4xCPWFmsJoC4JRTDKwMBKA7FyXVvIguemzqqr6LijZYmsOAjqnwhK96ph9GycETsOV8pDopNBiDkPimwt5Q1+byhQ1+h4Y0AjY9VDE21txuD8S5QtDNuVkJvLe97D6nVe/6+krZsWlmtiHef01cAtbRvQkkgETd/C4JPuyvvtwsLjTVgBDD53x4zdd1fHjTPKb0mydYXmkAxf50hgmp5rI/vFgBMzYQ9Tzm/58F3u2cddQc8FnXLi3bjBDIM2ZmU8ttX1kpmsEiGF58u9CcqQOXnsTSPLMepY0hU0cs3Vm4W5RvG+11VOwkSTYD5+ThLe7mFp894TH89Xhuqp6oBaCI5RI/qcC/55VZ/2B3sq7PEMTp0pOjWOVOzYxuvq2gnzCfMLwqHx5uHdTAhHmBBtUTySSWvN0aVGK+b031UQx9uLLLZSwg1UlwsmTUcYWX0vsqxvzzBUp9TjeutqfvsxboXLaN0o9sug4/7F7WXSsZSMVTDOZPcledjXXqgSTOmpw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32dd694c-a01c-4989-367a-08db57637a6e X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:48:17.1397 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jO77RuoMBtuh6d/k5B6NRfSp6jQdaLG2UIvpT2/pzuJODYKuGwDMainN78/aPJZF3oZ1Q24c/eB75pajuHI2k4IQ1+aeEcfioYNhojxp6y5GSQGd4ccsTJqX1/9vkDqz X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5591 Message-ID-Hash: 5PWXZMPVHATRPWWACJA6B3MT4NTXBRQ3 X-Message-ID-Hash: 5PWXZMPVHATRPWWACJA6B3MT4NTXBRQ3 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. Signed-off-by: Kuninori Morimoto --- sound/soc/sof/nocodec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/soc/sof/nocodec.c b/sound/soc/sof/nocodec.c index 7c5bb9badb6c..51a51a26a74f 100644 --- a/sound/soc/sof/nocodec.c +++ b/sound/soc/sof/nocodec.c @@ -55,10 +55,6 @@ static int sof_nocodec_bes_setup(struct device *dev, links[i].no_pcm = 1; links[i].cpus->dai_name = drv[i].name; links[i].platforms->name = dev_name(dev->parent); - if (drv[i].playback.channels_min) - links[i].dpcm_playback = 1; - if (drv[i].capture.channels_min) - links[i].dpcm_capture = 1; links[i].be_hw_params_fixup = sof_pcm_dai_link_fixup; } From patchwork Thu May 18 05:48:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 683422 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CBBB6C77B7A for ; Thu, 18 May 2023 05:51:16 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 71DD41F2; Thu, 18 May 2023 07:50:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 71DD41F2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684389074; bh=B3ftONP+YkmSQ3x01Xzt1nD+kxFPj9Y8w2brHu/tG4w=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=la9vOBJwNzg3k3+Hv8PmzpW5YK29ZIG34cpHLi6BuoVE44xnQveNYdstHQdIP0ueD 10duCWQXrmb+KGtzI7LcbviY5lRcnNPVXuTQtk1+64eTIYH36G2/IgIOMt7kTnNRhb edQQNe5Q42ChMqi2UlFCRFFdlRkcAtbOf2xqyDqc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D5A17F805AF; Thu, 18 May 2023 07:48:39 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id A5EA0F805DA; Thu, 18 May 2023 07:48:39 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 063C2F8057C; Thu, 18 May 2023 07:48:37 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2072e.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::72e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 6FC9AF8056F for ; Thu, 18 May 2023 07:48:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6FC9AF8056F Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=jynZT38D ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MWpuCc89kUyELIcl1ZcpIeOX/Gj8DgY4wpJpuycFJKnh51fpet1KJfbIydPgoXX5qk06zS33lfIIOtzo+K3m6BKEELQhco1oSz3oVktAj3dW0cFjftzI8IFREmxwF/JDul8ae5ZGqEqltF0fo7PJ5RXq2MmzzB+jmu7Pcb30fxHRAoyEEQQadQRb1j6Xbq2wCgLDEy5ING0HPreWpBE6hh7pT4VWEftP05l8T+kLyxUCflz00Bj/xRIHOJRHN42Xmh9XnMHXZ0oatuMsb1zWc6mGS0vfo3Kv9WzIgkvqMBJbCNNKNbGeZkIQCL4mCdlJ6//1M4eqidOect+Gm6U3nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+9H9iKZmrQL9EcgiIFBJwF3X4RSUHdBusJ2Ue1tVZU4=; b=hiHU8HwXGBvkSwgqQQhML6VkKq+gekTx+P1CIlllkRlO+ls4JupSPboashx1DgK6GR9fQkSDIRK89R5Wi6w/uJ/BddAgexEtt3/w2C1uzUmSO3u22wdKUatMvzr+qmdtEnJ5RTbJcxqhw3O+NX0NWd/191FGV8CyM3SBjY0f4D3Q1pDaQQB7wf4vZeTvJQZnfXP38ID/hLPA6A3TqH0R/wNdy08Y3cxdBSP4b67+ZTu4ekIg3+fgJ+/VYAL67VyPqgjRG5aChU3UxRSZFEJdh97RtHvJmNNhBuU7N2liP0qNdoYXKHW5m1diRfnfTJrkKfXkkdnz2S8buKARhgdT6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+9H9iKZmrQL9EcgiIFBJwF3X4RSUHdBusJ2Ue1tVZU4=; b=jynZT38Dh1UgWdAHW4i8NP6+FkzbtWEP7J3Q8Pdin9KdCqeK7dodjR50gJTchxSPHgM2wLOsHCwfvdCtN4jJfy6ED2WNgimPn4AKj56KziTehJYQaxdCoYnsuJfDiutlp5d9Chw5PlREXg4dZLkDa0QlQMUSzzBv8ExDnMyEDtE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB5591.jpnprd01.prod.outlook.com (2603:1096:604:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:48:29 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:48:29 +0000 Message-ID: <87lehmp4ur.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Jerome Brunet , Kevin Hilman , Liam Girdwood , Mark Brown , Neil Armstrong , Takashi Iwai Cc: Martin Blumenstingl , alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 12/20] ASoC: meson: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:48:29 +0000 X-ClientProxiedBy: TY2PR06CA0040.apcprd06.prod.outlook.com (2603:1096:404:2e::28) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: dcd49926-0e01-43a5-659d-08db576381c9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kbA8Db95CQCqU8RgrKsB9aDCz8AN0R2KkOa5WB26Ny4NqTCMr34vbHXK4ok4LO94ANLTbbPhT518z5V/Xp8gniykc4WSExNwOoc2aq3vpqe67ppUxu7bMAs41iZpUYphgUWWGKU6iNzvfubhMgfJF6U3R+bfiy99Fx8P6x2DXg7OhfMxlZ+j/TYlYauPS29Q2UN+Jp5/xkdT7bTemPZhX0im0Tc1BXZ8aSlQMmzDr/K2yvb0aJTRL5kjQ0WbsMF5Cqj9+4/GUz3Oo41X3vjqEoRYgvJB6+AROB1d2M5JXoGabH1pGPM9U1d3mtNU38g8N6gpZcJELWxngLsHld4W2QuxfAKTAZXkpPumnl3v9x7JZCJVf/tF31G4G6H7qXlDHs17vGtmzfW9I9RjL/yk8/0SsKadqybL0tMJdGmxW2s227iXVivmWFcXJ78zobOe4BfeT3I/Aa5SIS+m7j9qvBVEikcLw2O1ewAHlDkjX+nBIC8EtR1yqyHfgmT1Sh+xNWUEeceDdVEH6H//zwMqE8/puAb/7mu3VOWNrlwxN6fbgPj5blwV6wKRgYGgdvt0gnh0muhz6tK60ceIRwdAVAxdaD6DmZi1uU0GD8kkqpPob2ABC866WNhQZ7U4mI6F X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(316002)(4326008)(66946007)(66556008)(478600001)(66476007)(52116002)(110136005)(86362001)(36756003)(83380400001)(6506007)(26005)(6512007)(186003)(2616005)(41300700001)(6486002)(5660300002)(8676002)(8936002)(2906002)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 99cXu/BqPXbrJ+gaSswfgwzx9q7NRAtWAnqWaMV17K3RC293GNNh/0vxNCpAHt21RXzyxa8NNBswuBiUMguERQYzqgQHMHIn5iq/wYeXKsJ6MGOryqZelchx3Jt/3KyP2f0oMP73RZC3lIeWh0lz1CPqLaJRwz4bIbi846GDPqFn8zJSUy1wENPzAPtoeZInuMQXuYFjOwCs4nA8cAwvlL2RNiz2hdEMQgLG4SE9FVNjvVQ+xcsluy6lFo1AHlbME++syI1fpy2N405XLLrR362se5Mt+c+DlDPQJ1HBccedMf9kiaG3po/UC8/gOJzHMZ6tZRLwUVRYat+kbLYBEVU+9Jq5Cr9MGYtb+9KarBd29SFz3nXlTR8s3Mfpn7/C9w8vvwyi1HJo5BIcLJZ1+AfztMesQ5ka55S+l/TaQc6BjqNNZNgVEKyYynl0GO9gv3+4dvMEFIK/uPtvccUKu3qVSpJMlP8OoPoel0wGqVvth0hn9L7ZnZBGrNTRvsUy5aL5x50PI9cVKuRyOLWTydGNiaTqBv+eFsdQsy+5aq1kCYQOcRzEBDruA0Aq0nJuD2T+B2n005gb1eJAZdKOC/RMNg5DqbDml0jvJGPWdMY3FIc5mdyiC9SlTIPI+qRi9X7xMkBc8wBFrTo3QfzKuIqwUPdi3kkKXa3Y39e2jGTc9ZC/ygrT3loS39NrI4tcuXZhZE++QdJoMYVJBj3SD8/JB4jZ+c4ggOIZ30awISwTRlv8U+JOkmq0Hr/ADunNJqbglsKmeywt7GffYxRA73hWYQxiqUkebUP0LXGhzSkUHM9rV8gSW24z25+6rcGSDlvPZ/g6YLmTRB4cGXj7l9yy5W/AOxm/ICVONzB4BxRwhx0vTCbTUNet4fA+Gp3E/EVOdQ375++txrIu27bObpcMWTk1iTFwVIhVz35ZH2GNa9v8mvJYTsHoSXRCEuyi397CpeEKn44n9ukyGM/bmFiT9V9kRny9Bcc9yDoiBY6MqthluscyIR8iHk6+Wpi4qmm/CYYabbC2jiq7RqJI5Xxki+CbcPEsoL6GdNcPLWWhRb2FxYth+1tXI/yBl9kcFNIFp2p7pLRiAcIAND1LVYJOxW4oUhlPBSItixGcgfJPfX70yjm1Tga979IUbB3Zt/7/co2xcbBiGslqpHIvMQWVu/imohDRKN1btVI9DiUNz4fbNUXHc2Nk/UPBJunRWE4Cg21jgZMgpCLSisqwtPFTShj5hn2wHsvXJFJK2DQ5iHwBqfr7ahkJQy7Op7Nm113cNZDH4M9XcKUye83qyP7/kdATjA+bzJcTUc9TZrzwDCj7nIoED0lCe8VF7qPk/y8H994HrcMzA27zaekXHfIKxm6W0rU7fRHPjh/wj9NfygdKraVOcWuzSNJHDQqywjPImr5GocEmKXupkdNrSCVF3AF1331Hqlz6pZC2pTBf0zt1hxqPBlgj9dkRZGMNFgfOeDoyMkRDGbCm06NH/a2rZUw0M3Q5HeLsKaaQER2niJ0gZUrzxNseoc9NqCpEOhyJUV1D9p73vZs0tHTL9sNH9bn5SMIDMWWRxJaY8r1g6J8V0lR63dua3k/iZNVYTfQFz+z4Cs9eMNlV1dgrJ21NVer5XCSwVMSHyFlCj3k= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: dcd49926-0e01-43a5-659d-08db576381c9 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:48:29.4993 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uxRPed06hEUvSujEk55Z0oekT2iTYlOWRc0zDBFBKD26UkLIImUs6HTwRl3yk43dVLcY8a4Pr6H/s0zzVHxl1GslYGuduThGAozpB6w4lFMIvLdCn6+/+bLgp1er+S/4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5591 Message-ID-Hash: 2ZAIJKAS27IIFZAK4AEA2LHVMKRPRCBK X-Message-ID-Hash: 2ZAIJKAS27IIFZAK4AEA2LHVMKRPRCBK X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. Signed-off-by: Kuninori Morimoto --- sound/soc/meson/axg-card.c | 8 ++++---- sound/soc/meson/meson-card-utils.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 74e7cf0ef8d5..2d62e1ae7425 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -132,7 +132,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card, lb->stream_name = lb->name; lb->cpus->of_node = pad->cpus->of_node; lb->cpus->dai_name = "TDM Loopback"; - lb->dpcm_capture = 1; + lb->capture_only = 1; lb->no_pcm = 1; lb->ops = &axg_card_tdm_be_ops; lb->init = axg_card_tdm_dai_lb_init; @@ -176,7 +176,7 @@ static int axg_card_parse_cpu_tdm_slots(struct snd_soc_card *card, /* Disable playback is the interface has no tx slots */ if (!tx) - link->dpcm_playback = 0; + link->capture_only = 1; for (i = 0, rx = 0; i < AXG_TDM_NUM_LANES; i++) { snprintf(propname, 32, "dai-tdm-slot-rx-mask-%d", i); @@ -186,7 +186,7 @@ static int axg_card_parse_cpu_tdm_slots(struct snd_soc_card *card, /* Disable capture is the interface has no rx slots */ if (!rx) - link->dpcm_capture = 0; + link->playback_only = 1; /* ... but the interface should at least have one of them */ if (!tx && !rx) { @@ -275,7 +275,7 @@ static int axg_card_parse_tdm(struct snd_soc_card *card, return ret; /* Add loopback if the pad dai has playback */ - if (link->dpcm_playback) { + if (!link->capture_only) { ret = axg_card_add_tdm_loopback(card, index); if (ret) return ret; diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c index ffc5111f9e3c..8a531ec8fad4 100644 --- a/sound/soc/meson/meson-card-utils.c +++ b/sound/soc/meson/meson-card-utils.c @@ -192,9 +192,9 @@ int meson_card_set_fe_link(struct snd_soc_card *card, link->dpcm_merged_rate = 1; if (is_playback) - link->dpcm_playback = 1; + link->playback_only = 1; else - link->dpcm_capture = 1; + link->capture_only = 1; return meson_card_set_link_name(card, link, node, "fe"); } From patchwork Thu May 18 05:48:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 684525 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B9FD6C77B7D for ; Thu, 18 May 2023 05:51:37 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 7EAF782C; Thu, 18 May 2023 07:50:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7EAF782C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684389095; bh=ouWYJv+e/29tIaUc54RNLiWRGef5KTVSiU2b0Rke+cg=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=dMkSx3Hjy9aopLBCt/cKFM7vZ2uw5ivWmC43SmiAKTw103XURdRdZEjAQYXx6r/ia irQGaHFBiZHO5rWx7oIrMSaaOGBZnGaVv++CqUw7GwFur+0y2CkPCq/xP+0SdMPZP3 8pSo4Cw4abACsAjkt0l2sfN4xHxTEmJDAHZ8YZ8U= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9B660F805B6; Thu, 18 May 2023 07:49:26 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 2D674F805AA; Thu, 18 May 2023 07:49:26 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D86A2F805AC; Thu, 18 May 2023 07:49:21 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20727.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::727]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E162BF80272 for ; Thu, 18 May 2023 07:49:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E162BF80272 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=V9p+nfGu ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lO8dtbTU2+CsoGYV1yeYc7W4cwSUHwC1fgTqhS96fh5V9/oaHuCB7//7api2bN7DflYhO387KjxOwQGRzsg7t6CitQfYneTwUFTsoKffKaAI+MwpPXMBlJixd3t9mM4SIs0b9mvTZurrL6diO9vpokN+j3gFYZw2Zb/35pIEb6K3cwv46URBqX263Jwx5bwSrQ4gF62KWBBuTY9sqEsOCcvFZvYXHHBgU4ghMjr0zlZDfKCrQLRisfpIDHmFU3Lmb8zQquKVDjAj9tcKIxh0AH/D+xpgivozi7DyemhR/V6plWPw29K03Q6p7OcnPSpS9yV8BHg3A5SY/j8fcXldvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BCtGcscEWbQbHXcRjpiB/CdOpMEVTE5zJjjDua6bx2w=; b=QI2z8Xa9YsCJnoniodL4k5pKnoG/QYq/uo+r5SBr2EXFEFbk0isWe2Ih3qYyH1GS0z9dy09OBpUjGaZjrKG5R6kypUc/ohJZ+2HglQtanmx338oxMy4mySPGsuvFM1Q5q1atqT2cb1gL+1OpUGrUeF5XEQvGJDpaeaOJxfKBPQceaV18UgDVMxBcSbTZ4cLrQI+karl8yq+SMmkZc4wcZ/f/umtLbzXVNji5mvNYEyVOknHMZRgCP+LvX8oibpMO/+6ws0hlFxyOu9N3M/sJiMLKfXd4yLsXpPBARWUrGbCw4OuFSNk4m59c3iHff+vbCNIH5zxKh1U61P6kUJeHfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BCtGcscEWbQbHXcRjpiB/CdOpMEVTE5zJjjDua6bx2w=; b=V9p+nfGuVVODn6/NqefJMyTo7usL/Vgbg30p60P8TBZhzTuq+osNy9Jz7Y4817GT+vQbkVk+OEKBFhEssSz1v+tOYUYRVIdayBHOsUI/5XHUfTGcOjNitIETlRt9noIA4Ni6nszbNLOcXW8H6yPTgmMFpV5ZItdIYTQIpnwt5vg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB5591.jpnprd01.prod.outlook.com (2603:1096:604:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:48:52 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:48:52 +0000 Message-ID: <87jzx6p4u4.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?unknown-8bit?q?=22Amadeusz_S=C3=85=82awi=C3=85=84ski=22_=3Camadeuszx?= =?unknown-8bit?q?=2Eslawinski=40linux=2Eintel=2Ecom=3E=2C_Bard_Liao_=3Cyung?= =?unknown-8bit?q?-chuan=2Eliao=40linux=2Eintel=2Ecom=3E=2C_Brent_Lu_=3Cbren?= =?unknown-8bit?q?t=2Elu=40intel=2Ecom=3E=2C_Cezary_Rojewski_=3Ccezary=2Eroj?= =?unknown-8bit?q?ewski=40intel=2Ecom=3E=2C_Hans_de_Goede_=3Chdegoede=40redh?= =?unknown-8bit?q?at=2Ecom=3E=2C_Jaroslav_Kysela_=3Cperex=40perex=2Ecz=3E=2C?= =?unknown-8bit?q?_Kai_Vehmanen_=3Ckai=2Evehmanen=40linux=2Eintel=2Ecom=3E?= =?unknown-8bit?q?=2C_Liam_Girdwood_=3Cliam=2Er=2Egirdwood=40linux=2Eintel?= =?unknown-8bit?q?=2Ecom=3E=2C_Mark_Brown_=3Cbroonie=40kernel=2Eorg=3E=2C_Pe?= =?unknown-8bit?q?ter_Ujfalusi_=3Cpeter=2Eujfalusi=40linux=2Eintel=2Ecom=3E?= =?unknown-8bit?q?=2C_Pierre-Louis_Bossart_=3Cpierre-louis=2Ebossart=40linux?= =?unknown-8bit?q?=2Eintel=2Ecom=3E=2C_Ranjani_Sridharan_=3Cranjani=2Esridha?= =?unknown-8bit?q?ran=40linux=2Eintel=2Ecom=3E=2C_Takashi_Iwai_=3Ctiwai=40su?= =?unknown-8bit?q?se=2Ecom=3E?= Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 13/20] ASoC: Intel: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:48:52 +0000 X-ClientProxiedBy: TY2PR02CA0010.apcprd02.prod.outlook.com (2603:1096:404:56::22) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: 94385bd2-8b83-456c-26e5-08db57638f96 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ynDwI9QMwO3yJhM+IFIC6OugWKlTKMyWmnzp/ZCNLRDXGO0WegHOlTtrrEs2Tz8dUFTfgLqAN6jEqZcG8HUSeeS/lrht9Azlwl4DjB2Lt91MODAWpTNpVYMNjfeMT9eiZeXEKkOnshdWvHVwarinopJnz2ldGz6nIIdCdQbxf2Kwkfl4UsCcRLRtqWvIcQo43eRZ5drTMjy5z20UuvyRp1/MPATUQE2oi5Xv64qRHD0Rts6UKfiUt5iSeAnvLkoW3/+AISIwGjg/+Bh92jlNmMKmQXxp0m6+NOPhEfKvSNhbcG4bbnjQYIk8PGckPktmm/WXBKHpzX2wtOS4SU9g7fpI4RdkitcBV4Yc8uda23q5bF73pw5hk04kzzygexYmRzRHyW9oCmH7cTZQexBa+dmlHnI08hrnAZR1ilGlKZuC6yRy577ONphwncTvKKgvQozK4xtzLkMN6XgGQoNl6NHQ2uxe3fg+eldMtFUkZFIaypEsDJrBgM1IfIznG8GAKCDhOXVu4Gqxy/H8b0ObZX9/osJw4tALkftD/92rPh8TGW4niTLBd+E4olEPV2IDFxv+XNqN1xNgm2GoO9x4MbPifoJNhBaheMtWmqYTyJmtScKO7vdubj6RGVhMy6k/RIhnAF4U9hUdJzxlZPkWPw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(316002)(4326008)(66946007)(66556008)(478600001)(66476007)(52116002)(110136005)(86362001)(36756003)(83380400001)(6506007)(26005)(6512007)(186003)(2616005)(41300700001)(6486002)(30864003)(5660300002)(7416002)(8676002)(8936002)(2906002)(921005)(38100700002)(38350700002)(559001)(579004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AKpQ513YPJhBhA/0LfIU2Nt6pzcxJJO2ijZTTcK8PLbo3lHkwLCk6mevg16CQP9SI6v/4qxz0X9JJ1tRjeITvE2mtXxiuRKsCB7iHQoI0n//CPLDHnUqhwVBX9+VYBQSvgW16spZUxe46wGF/s/e8sm1DzQ0Ju1M7CNqpHN02zWyDbwArxnyJGCEP5xWoyYMp2qYCMwJRKo6KF3OEYIfMbSzD1zsf6fYBdAeqtou3yAFR2TRBBsx+PJy3FlyMwse6JcQuvQO/FFZDKnHXQ1qJCkbEEa4pJanguLWO+ifdmWEfBZTxucpqYGE82XgboQUyT7cf8A155r5AcTGVnmh/x8tzHWMKdMWlXif7S8ejd1D+9BFqOBD9jIWv1MGaT3J+JgdwmE6XYHQkAQk+c1gEi3xPubSk/K5qDEBfCSGC1NjItHRQesSau3+Fr3y592T1VgLk7ilgSsl55NkGSzRv23sZAfkK5GLEvC5d4ebYOBP4qox3qJ57zZ1purT48Nmsz33aW8FlUNtmlP/AHtuk/tzP55kQMv9Dd+5nYFqO4X1owCdztcWc9uiz+NdXSp+t/zmvoROEzjwY5MNkyvvObrGnKjJIaMQs3vbzzsF+EPbz0wIQT1CVLeq2sfxf4QTeELiOASVMMbrlaBbf7WMDggtrRkW84lO2bHlkjA0lpoR9ivv/+/rKI5f8Kog/24RfkpgcVXE6uJ59YpF+0Kdig7F9KRhT6nmukzvG4RGQ5mxYmKEef+ZGdWl3FxWvKqEiX62hZcC/51Quza3Rax3vk7vQd1CBj147ym9V/kJZCPncictq8MNxp0WyUjdkBlJH8GcRnzbuuPZyJ0sUATgnleARood3xVYUxFdy+W6/aog/LE5fgqZo0k3TJtjD/sbXZ5G0QE9k+YBsgaocBXE4bQJ2OcvZ/wKOnJNtjb6kR5PSCVfcEEQrg+PA5O5lYRo42CddcHUmyK1IhfaHRcFyiiV2Qt7sabuA5U+Zd2RxDFj+m2RYumJkbksk+SQBeT0oGE8vtOXeXTZvDkDz0f0t1FJazJYPYg8jZqSf8UDsW/iuPdcheK++xPpU0zChjBxhDslkvErVIMxou9MasoumIcTV+PVongLEa75ulhMc4MfTg5/HRVgTWyM1jLCvCDKErnW7oIL3zwM1mxXellhGEQRZskSYLvwYLAjn/oHlshoFoR2tu4OeKXDrGVkXNgP0ZSDnsNMlo2qZ0FllpxtDprB2vbk5HdFlnGX6mF+AaQ4+NEX2MPQbJ8tgzX2/srR2ANkZnWor2qO1avoLfkh/cv7GVOogDd/s8Zbb+AtsH+UIJtEIP2kUavjuOr/OMkLdz7Tjp6eAkHZGzS38nSNehD+PEZYONCYuEOjUMMM82V5yAXu6ekqQee3t10QDe2InsYSFoQJXdJrxVDMnEggEs1oIEOM/t8W4y5XK/fEvvP8LO6R1SJZJfsxzPZIYWASfr4cNhaGBi0saD4WmEh2yMd9f2ghVY69fVutb7ddi//VkpmNFUryUlN8dJ43pih241S5EejAMbGtEYabrXdNDMinT2P2f9D67w8ldM1fSiik/SzvuHLCA38BkxomxV1U2NPnb9wZYt+uWsVuMd849g0FNMCO78MX2l5F16CsVi0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94385bd2-8b83-456c-26e5-08db57638f96 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:48:52.6789 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DxRsgi8VcwrWQWnIZcdOyPwZ3DDBE0pEPEFBOyBWobw/jn1Z0r1/5q0sNBMGWVQ90fwB6c1YZAo5wzCk76qnNz4kzlkQ/ejFyOHF2Vvdr25zVINWHqri3HytnRiJ0j2W X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5591 Message-ID-Hash: SX53HQX22BHDCUFODK4PBO73CRIYKAT7 X-Message-ID-Hash: SX53HQX22BHDCUFODK4PBO73CRIYKAT7 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. NOTE Some Intel code was complex. Please check this patch deeply. Signed-off-by: Kuninori Morimoto --- sound/soc/intel/avs/boards/da7219.c | 2 - sound/soc/intel/avs/boards/dmic.c | 4 +- sound/soc/intel/avs/boards/hdaudio.c | 4 -- sound/soc/intel/avs/boards/i2s_test.c | 2 - sound/soc/intel/avs/boards/max98357a.c | 2 +- sound/soc/intel/avs/boards/max98373.c | 2 - sound/soc/intel/avs/boards/max98927.c | 2 - sound/soc/intel/avs/boards/nau8825.c | 2 - sound/soc/intel/avs/boards/rt274.c | 2 - sound/soc/intel/avs/boards/rt286.c | 2 - sound/soc/intel/avs/boards/rt298.c | 2 - sound/soc/intel/avs/boards/rt5682.c | 2 - sound/soc/intel/avs/boards/ssm4567.c | 2 - sound/soc/intel/boards/bdw-rt5650.c | 4 -- sound/soc/intel/boards/bdw-rt5677.c | 4 -- sound/soc/intel/boards/bdw_rt286.c | 10 ++-- sound/soc/intel/boards/bxt_da7219_max98357a.c | 32 ++++++----- sound/soc/intel/boards/bxt_rt298.c | 26 +++++---- sound/soc/intel/boards/bytcht_cx2072x.c | 6 +-- sound/soc/intel/boards/bytcht_da7213.c | 6 +-- sound/soc/intel/boards/bytcht_es8316.c | 6 +-- sound/soc/intel/boards/bytcht_nocodec.c | 6 +-- sound/soc/intel/boards/bytcr_rt5640.c | 6 +-- sound/soc/intel/boards/bytcr_rt5651.c | 6 +-- sound/soc/intel/boards/bytcr_wm5102.c | 6 +-- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 6 +-- sound/soc/intel/boards/cht_bsw_nau8824.c | 6 +-- sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +-- sound/soc/intel/boards/cht_bsw_rt5672.c | 6 +-- sound/soc/intel/boards/cml_rt1011_rt5682.c | 14 ++--- sound/soc/intel/boards/ehl_rt5660.c | 14 +++-- sound/soc/intel/boards/glk_rt5682_max98357a.c | 30 +++++------ sound/soc/intel/boards/hsw_rt5640.c | 10 ++-- sound/soc/intel/boards/kbl_da7219_max98357a.c | 26 +++++---- sound/soc/intel/boards/kbl_da7219_max98927.c | 54 +++++++++---------- sound/soc/intel/boards/kbl_rt5660.c | 18 +++---- sound/soc/intel/boards/kbl_rt5663_max98927.c | 44 +++++++-------- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 22 ++++---- sound/soc/intel/boards/skl_hda_dsp_common.c | 14 ++--- .../soc/intel/boards/skl_nau88l25_max98357a.c | 26 +++++---- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 26 ++++----- sound/soc/intel/boards/skl_rt286.c | 26 +++++---- sound/soc/intel/boards/sof_cs42l42.c | 12 +---- sound/soc/intel/boards/sof_da7219_max98373.c | 16 +++--- sound/soc/intel/boards/sof_es8336.c | 8 ++- sound/soc/intel/boards/sof_nau8825.c | 12 +---- sound/soc/intel/boards/sof_pcm512x.c | 8 +-- sound/soc/intel/boards/sof_rt5682.c | 12 +---- sound/soc/intel/boards/sof_sdw.c | 4 +- sound/soc/intel/boards/sof_ssp_amp.c | 11 ++-- sound/soc/intel/boards/sof_wm8804.c | 2 - 51 files changed, 209 insertions(+), 372 deletions(-) diff --git a/sound/soc/intel/avs/boards/da7219.c b/sound/soc/intel/avs/boards/da7219.c index 1a1d572cc1d0..435b3a4f7a54 100644 --- a/sound/soc/intel/avs/boards/da7219.c +++ b/sound/soc/intel/avs/boards/da7219.c @@ -173,8 +173,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->exit = avs_da7219_codec_exit; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/dmic.c b/sound/soc/intel/avs/boards/dmic.c index 90a921638572..620ac4f07206 100644 --- a/sound/soc/intel/avs/boards/dmic.c +++ b/sound/soc/intel/avs/boards/dmic.c @@ -22,7 +22,7 @@ static struct snd_soc_dai_link card_dai_links[] = { { .name = "DMIC", .id = 0, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), @@ -30,7 +30,7 @@ static struct snd_soc_dai_link card_dai_links[] = { { .name = "DMIC WoV", .id = 1, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .no_pcm = 1, .ignore_suspend = 1, diff --git a/sound/soc/intel/avs/boards/hdaudio.c b/sound/soc/intel/avs/boards/hdaudio.c index a542a67e21d0..b2680296440e 100644 --- a/sound/soc/intel/avs/boards/hdaudio.c +++ b/sound/soc/intel/avs/boards/hdaudio.c @@ -39,8 +39,6 @@ static int avs_create_dai_links(struct device *dev, struct hda_codec *codec, int dl[i].id = i; dl[i].nonatomic = 1; dl[i].no_pcm = 1; - dl[i].dpcm_playback = 1; - dl[i].dpcm_capture = 1; dl[i].platforms = platform; dl[i].num_platforms = 1; dl[i].ignore_pmdown_time = 1; @@ -222,8 +220,6 @@ static struct snd_soc_dai_link probing_link = { .id = -1, .nonatomic = 1, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .cpus = dummy, .num_cpus = ARRAY_SIZE(dummy), .init = avs_probing_link_init, diff --git a/sound/soc/intel/avs/boards/i2s_test.c b/sound/soc/intel/avs/boards/i2s_test.c index bc3065c6ceda..e89bc6ccbeaf 100644 --- a/sound/soc/intel/avs/boards/i2s_test.c +++ b/sound/soc/intel/avs/boards/i2s_test.c @@ -43,8 +43,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->id = 0; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/max98357a.c b/sound/soc/intel/avs/boards/max98357a.c index 183123d08c5a..2e5ef281e222 100644 --- a/sound/soc/intel/avs/boards/max98357a.c +++ b/sound/soc/intel/avs/boards/max98357a.c @@ -79,7 +79,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_max98357a_be_fixup; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_playback = 1; + dl->playback_only = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/max98373.c b/sound/soc/intel/avs/boards/max98373.c index 8e221ecd34b0..d728a171a571 100644 --- a/sound/soc/intel/avs/boards/max98373.c +++ b/sound/soc/intel/avs/boards/max98373.c @@ -131,8 +131,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_max98373_be_fixup; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; dl->ignore_pmdown_time = 1; dl->ops = &avs_max98373_ops; diff --git a/sound/soc/intel/avs/boards/max98927.c b/sound/soc/intel/avs/boards/max98927.c index 7cccce99f92e..21d8957c7498 100644 --- a/sound/soc/intel/avs/boards/max98927.c +++ b/sound/soc/intel/avs/boards/max98927.c @@ -128,8 +128,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_max98927_be_fixup; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; dl->ignore_pmdown_time = 1; dl->ops = &avs_max98927_ops; diff --git a/sound/soc/intel/avs/boards/nau8825.c b/sound/soc/intel/avs/boards/nau8825.c index b69fc5567135..9b983dbacd95 100644 --- a/sound/soc/intel/avs/boards/nau8825.c +++ b/sound/soc/intel/avs/boards/nau8825.c @@ -207,8 +207,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->ops = &avs_nau8825_ops; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt274.c b/sound/soc/intel/avs/boards/rt274.c index 6a1e121f082f..7b7251a0bb07 100644 --- a/sound/soc/intel/avs/boards/rt274.c +++ b/sound/soc/intel/avs/boards/rt274.c @@ -180,8 +180,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_rt274_be_fixup; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt286.c b/sound/soc/intel/avs/boards/rt286.c index 3551a05bd599..a6e1395d62a4 100644 --- a/sound/soc/intel/avs/boards/rt286.c +++ b/sound/soc/intel/avs/boards/rt286.c @@ -150,8 +150,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->ops = &avs_rt286_ops; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c index 2923f3805bbe..e13d2a5d5976 100644 --- a/sound/soc/intel/avs/boards/rt298.c +++ b/sound/soc/intel/avs/boards/rt298.c @@ -170,8 +170,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->ops = &avs_rt298_ops; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt5682.c b/sound/soc/intel/avs/boards/rt5682.c index b2c2ba93dcb5..5e42e2b1b82e 100644 --- a/sound/soc/intel/avs/boards/rt5682.c +++ b/sound/soc/intel/avs/boards/rt5682.c @@ -226,8 +226,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->ops = &avs_rt5682_ops; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/ssm4567.c b/sound/soc/intel/avs/boards/ssm4567.c index 2b7f5ad92aca..f9f6aaf957f2 100644 --- a/sound/soc/intel/avs/boards/ssm4567.c +++ b/sound/soc/intel/avs/boards/ssm4567.c @@ -120,8 +120,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_ssm4567_be_fixup; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; dl->ignore_pmdown_time = 1; *dai_link = dl; diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c index d0682bc543c9..38bc48e64086 100644 --- a/sound/soc/intel/boards/bdw-rt5650.c +++ b/sound/soc/intel/boards/bdw-rt5650.c @@ -239,8 +239,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST }, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(fe, dummy, platform), }, @@ -256,8 +254,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = broadwell_ssp0_fixup, .ops = &bdw_rt5650_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, .init = bdw_rt5650_init, SND_SOC_DAILINK_REG(ssp0_port, be, platform), }, diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c index f3e08d258ac1..04beee7f7865 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -329,8 +329,6 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST }, - .dpcm_capture = 1, - .dpcm_playback = 1, .ops = &bdw_rt5677_fe_ops, SND_SOC_DAILINK_REG(fe, dummy, platform), }, @@ -356,8 +354,6 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = broadwell_ssp0_fixup, .ops = &bdw_rt5677_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, .init = bdw_rt5677_init, .exit = bdw_rt5677_exit, SND_SOC_DAILINK_REG(ssp0_port, be, platform), diff --git a/sound/soc/intel/boards/bdw_rt286.c b/sound/soc/intel/boards/bdw_rt286.c index b7687a93a923..5cc2f1e6992b 100644 --- a/sound/soc/intel/boards/bdw_rt286.c +++ b/sound/soc/intel/boards/bdw_rt286.c @@ -133,8 +133,6 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(system, dummy, platform), }, { @@ -143,7 +141,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(offload0, dummy, platform), }, { @@ -152,7 +150,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(offload1, dummy, platform), }, { @@ -161,7 +159,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(loopback, dummy, platform), }, /* Back End DAI links */ @@ -177,8 +175,6 @@ static struct snd_soc_dai_link card_dai_links[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = codec_link_hw_params_fixup, .ops = &codec_link_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp0_port, codec, platform), }, }; diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c index c593995facaa..23f85d3ff728 100644 --- a/sound/soc/intel/boards/bxt_da7219_max98357a.c +++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c @@ -497,7 +497,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .init = broxton_da7219_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &broxton_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -509,7 +509,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, .ops = &broxton_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -520,7 +520,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &broxton_da7219_fe_ops, SND_SOC_DAILINK_REG(system2, dummy, platform), }, @@ -529,7 +529,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "Bxt Audio Reference cap", .stream_name = "Refcap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &broxton_refcap_ops, @@ -540,7 +540,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "Bxt Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &broxton_dmic_ops, @@ -550,7 +550,7 @@ static struct snd_soc_dai_link broxton_dais[] = { { .name = "Bxt HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -560,7 +560,7 @@ static struct snd_soc_dai_link broxton_dais[] = { { .name = "Bxt HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -570,7 +570,7 @@ static struct snd_soc_dai_link broxton_dais[] = { { .name = "Bxt HDMI Port3", .stream_name = "Hdmi3", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -587,7 +587,7 @@ static struct snd_soc_dai_link broxton_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = broxton_ssp_fixup, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform), }, { @@ -600,8 +600,6 @@ static struct snd_soc_dai_link broxton_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = broxton_ssp_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -609,7 +607,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .id = 2, .ignore_suspend = 1, .be_hw_params_fixup = broxton_dmic_fixup, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, @@ -617,7 +615,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "iDisp1", .id = 3, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), }, @@ -625,7 +623,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "iDisp2", .id = 4, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -633,7 +631,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "iDisp3", .id = 5, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, @@ -641,7 +639,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "dmic16k", .id = 6, .be_hw_params_fixup = broxton_dmic_fixup, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic16k_pin, dmic_codec, platform), }, @@ -824,7 +822,7 @@ static int broxton_audio_probe(struct platform_device *pdev) if (ctx->spkamp == SPKAMP_MAX98390) { broxton_dais[i].codecs = max98390_codec; broxton_dais[i].num_codecs = ARRAY_SIZE(max98390_codec); - broxton_dais[i].dpcm_capture = 1; + broxton_dais[i].playback_only = 0; } } /* DIALOG_CODEC is connected to SSP0 */ diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c index bf89fe80423d..4e306b95918e 100644 --- a/sound/soc/intel/boards/bxt_rt298.c +++ b/sound/soc/intel/boards/bxt_rt298.c @@ -394,7 +394,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .dynamic = 1, .init = broxton_rt298_fe_init, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &broxton_rt286_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -405,7 +405,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, .ops = &broxton_rt286_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -414,7 +414,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .name = "Bxt Audio Reference cap", .stream_name = "refcap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, SND_SOC_DAILINK_REG(reference, dummy, platform), @@ -424,7 +424,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .name = "Bxt Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &broxton_dmic_ops, @@ -434,7 +434,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { { .name = "Bxt HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -444,7 +444,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { { .name = "Bxt HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -454,7 +454,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { { .name = "Bxt HDMI Port3", .stream_name = "Hdmi3", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -472,8 +472,6 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = broxton_ssp5_fixup, .ops = &broxton_rt298_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform), }, { @@ -481,7 +479,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .id = 1, .be_hw_params_fixup = broxton_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, @@ -490,7 +488,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .id = 2, .be_hw_params_fixup = broxton_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform), }, @@ -498,7 +496,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .name = "iDisp1", .id = 3, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), }, @@ -506,7 +504,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .name = "iDisp2", .id = 4, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -514,7 +512,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .name = "iDisp3", .id = 5, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/bytcht_cx2072x.c b/sound/soc/intel/boards/bytcht_cx2072x.c index 9942a2de6f7a..3f54f01e599c 100644 --- a/sound/soc/intel/boards/bytcht_cx2072x.c +++ b/sound/soc/intel/boards/bytcht_cx2072x.c @@ -175,8 +175,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_cht_cx2072x_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -185,7 +183,7 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_cht_cx2072x_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -198,8 +196,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { | SND_SOC_DAIFMT_CBC_CFC, .init = byt_cht_cx2072x_init, .be_hw_params_fixup = byt_cht_cx2072x_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp2, cx2072x, platform), }, }; diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c index a3b0cfab17b0..47344a5fb553 100644 --- a/sound/soc/intel/boards/bytcht_da7213.c +++ b/sound/soc/intel/boards/bytcht_da7213.c @@ -174,8 +174,6 @@ static struct snd_soc_dai_link dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -184,7 +182,7 @@ static struct snd_soc_dai_link dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -197,8 +195,6 @@ static struct snd_soc_dai_link dailink[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), }, diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 7a30d2d36f19..9b39420ff3b8 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -314,8 +314,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_cht_es8316_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -325,7 +323,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_cht_es8316_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -338,8 +336,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = byt_cht_es8316_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .init = byt_cht_es8316_init, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), }, diff --git a/sound/soc/intel/boards/bytcht_nocodec.c b/sound/soc/intel/boards/bytcht_nocodec.c index 7fc03f2efd35..94a7c022d181 100644 --- a/sound/soc/intel/boards/bytcht_nocodec.c +++ b/sound/soc/intel/boards/bytcht_nocodec.c @@ -119,8 +119,6 @@ static struct snd_soc_dai_link dais[] = { .ignore_suspend = 1, .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -130,7 +128,7 @@ static struct snd_soc_dai_link dais[] = { .ignore_suspend = 1, .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -144,8 +142,6 @@ static struct snd_soc_dai_link dais[] = { | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = codec_fixup, .ignore_suspend = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp2_port, dummy, platform), }, }; diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 630784b6cb6d..d2019f82d9e8 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -1505,8 +1505,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .stream_name = "Baytrail Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_rt5640_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -1515,7 +1513,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_rt5640_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -1527,8 +1525,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = byt_rt5640_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .init = byt_rt5640_init, .exit = byt_rt5640_exit, .ops = &byt_rt5640_be_ssp2_ops, diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 805afaf47b29..43985721777d 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -770,8 +770,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_rt5651_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -780,7 +778,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_rt5651_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -793,8 +791,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = byt_rt5651_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .init = byt_rt5651_init, .ops = &byt_rt5651_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), diff --git a/sound/soc/intel/boards/bytcr_wm5102.c b/sound/soc/intel/boards/bytcr_wm5102.c index f2382d4cb76f..571ec2586bcc 100644 --- a/sound/soc/intel/boards/bytcr_wm5102.c +++ b/sound/soc/intel/boards/bytcr_wm5102.c @@ -320,8 +320,6 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = { .stream_name = "Baytrail Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_wm5102_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), @@ -331,7 +329,7 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_wm5102_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -351,8 +349,6 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = byt_wm5102_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .init = byt_wm5102_init, SND_SOC_DAILINK_REG(ssp0_port, ssp0_codec, platform), }, diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c index 850310de774b..e0fb44f6cab4 100644 --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c @@ -351,8 +351,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -361,7 +359,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -374,8 +372,6 @@ static struct snd_soc_dai_link cht_dailink[] = { | SND_SOC_DAIFMT_CBC_CFC, .init = cht_codec_init, .be_hw_params_fixup = cht_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), }, diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c index af2d9a78465d..2515ca7d75e0 100644 --- a/sound/soc/intel/boards/cht_bsw_nau8824.c +++ b/sound/soc/intel/boards/cht_bsw_nau8824.c @@ -193,8 +193,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -203,7 +201,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -217,8 +215,6 @@ static struct snd_soc_dai_link cht_dailink[] = { | SND_SOC_DAIFMT_CBC_CFC, .init = cht_codec_init, .be_hw_params_fixup = cht_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), }, diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index 875bc0b3d85d..e15cfff3f6f3 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -449,8 +449,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -459,7 +457,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -471,8 +469,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .no_pcm = 1, .init = cht_codec_init, .be_hw_params_fixup = cht_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), }, diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c index daa630a0efc1..a8050a0937f0 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -354,8 +354,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -364,7 +362,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -377,8 +375,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .no_pcm = 1, .init = cht_codec_init, .be_hw_params_fixup = cht_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), }, diff --git a/sound/soc/intel/boards/cml_rt1011_rt5682.c b/sound/soc/intel/boards/cml_rt1011_rt5682.c index 20da83d9eece..759c1e9149fb 100644 --- a/sound/soc/intel/boards/cml_rt1011_rt5682.c +++ b/sound/soc/intel/boards/cml_rt1011_rt5682.c @@ -443,8 +443,6 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .exit = cml_rt5682_codec_exit, .ignore_pmdown_time = 1, .ops = &cml_rt5682_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, @@ -452,7 +450,7 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .name = "dmic01", .id = 1, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, @@ -460,7 +458,7 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .name = "dmic16k", .id = 2, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic16k_pin, dmic_codec, platform), }, @@ -468,7 +466,7 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .name = "iDisp1", .id = 3, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), }, @@ -476,7 +474,7 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .name = "iDisp2", .id = 4, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -484,7 +482,7 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .name = "iDisp3", .id = 5, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, @@ -496,8 +494,6 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { */ .name = "SSP1-Codec", .id = 6, - .dpcm_playback = 1, - .dpcm_capture = 1, /* Capture stream provides Feedback */ .no_pcm = 1, .init = cml_rt1011_spk_init, .ops = &cml_rt1011_ops, diff --git a/sound/soc/intel/boards/ehl_rt5660.c b/sound/soc/intel/boards/ehl_rt5660.c index fee80638cba2..118d72fab256 100644 --- a/sound/soc/intel/boards/ehl_rt5660.c +++ b/sound/soc/intel/boards/ehl_rt5660.c @@ -178,8 +178,6 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "SSP0-Codec", .id = 0, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &rt5660_ops, SND_SOC_DAILINK_REG(ssp0_pin, rt5660_codec, platform), }, @@ -187,7 +185,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "dmic48k", .id = 1, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, @@ -195,7 +193,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "dmic16k", .id = 2, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform), }, @@ -203,7 +201,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp1", .id = 5, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), }, @@ -211,7 +209,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp2", .id = 6, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -219,7 +217,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp3", .id = 7, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, @@ -227,7 +225,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp4", .id = 8, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp4_pin, idisp4_codec, platform), }, diff --git a/sound/soc/intel/boards/glk_rt5682_max98357a.c b/sound/soc/intel/boards/glk_rt5682_max98357a.c index cf0f89db3e20..a9ee83dfd2be 100644 --- a/sound/soc/intel/boards/glk_rt5682_max98357a.c +++ b/sound/soc/intel/boards/glk_rt5682_max98357a.c @@ -413,7 +413,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .init = geminilake_rt5682_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(system, dummy, platform), }, [GLK_DPCM_AUDIO_CP] = { @@ -423,13 +423,13 @@ static struct snd_soc_dai_link geminilake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(system, dummy, platform), }, [GLK_DPCM_AUDIO_HS_PB] = { .name = "Glk Audio Headset Playback", .stream_name = "Headset Audio", - .dpcm_playback = 1, + .playback_only = 1, .nonatomic = 1, .dynamic = 1, SND_SOC_DAILINK_REG(system2, dummy, platform), @@ -438,7 +438,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "Glk Audio Echo Reference cap", .stream_name = "Echoreference Capture", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, SND_SOC_DAILINK_REG(echoref, dummy, platform), @@ -447,7 +447,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "Glk Audio Reference cap", .stream_name = "Refcap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &geminilake_refcap_ops, @@ -457,7 +457,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "Glk Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &geminilake_dmic_ops, @@ -466,7 +466,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { [GLK_DPCM_AUDIO_HDMI1_PB] = { .name = "Glk HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -477,7 +477,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { [GLK_DPCM_AUDIO_HDMI2_PB] = { .name = "Glk HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -490,7 +490,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -507,7 +507,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = geminilake_ssp_fixup, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -521,8 +521,6 @@ static struct snd_soc_dai_link geminilake_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = geminilake_ssp_fixup, .ops = &geminilake_rt5682_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp2_pin, ssp2_codec_5682, platform), }, { @@ -530,7 +528,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .id = 2, .ignore_suspend = 1, .be_hw_params_fixup = geminilake_dmic_fixup, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, @@ -538,7 +536,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "iDisp1", .id = 3, .init = geminilake_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), }, @@ -546,7 +544,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "iDisp2", .id = 4, .init = geminilake_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -554,7 +552,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "iDisp3", .id = 5, .init = geminilake_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/hsw_rt5640.c b/sound/soc/intel/boards/hsw_rt5640.c index 050c53ebd6ba..4ba82d006f1d 100644 --- a/sound/soc/intel/boards/hsw_rt5640.c +++ b/sound/soc/intel/boards/hsw_rt5640.c @@ -85,8 +85,6 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(system, dummy, platform), }, { @@ -95,7 +93,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(offload0, dummy, platform), }, { @@ -104,7 +102,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(offload1, dummy, platform), }, { @@ -113,7 +111,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(loopback, dummy, platform), }, /* Back End DAI links */ @@ -127,8 +125,6 @@ static struct snd_soc_dai_link card_dai_links[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = codec_link_hw_params_fixup, .ops = &codec_link_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp0_port, codec, platform), }, }; diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c index 18365ce6bcba..9665eb066cf3 100644 --- a/sound/soc/intel/boards/kbl_da7219_max98357a.c +++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c @@ -453,7 +453,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .init = kabylake_da7219_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -464,7 +464,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -472,7 +472,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio Reference cap", .stream_name = "Wake on Voice", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops, @@ -482,7 +482,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &kabylake_dmic_ops, @@ -491,7 +491,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -502,7 +502,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -515,7 +515,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -533,7 +533,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, { @@ -546,8 +546,6 @@ static struct snd_soc_dai_link kabylake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -555,14 +553,14 @@ static struct snd_soc_dai_link kabylake_dais[] = { .id = 2, .be_hw_params_fixup = kabylake_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_only = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -571,7 +569,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp2", .id = 4, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -579,7 +577,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp3", .id = 5, .init = kabylake_hdmi3_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/kbl_da7219_max98927.c b/sound/soc/intel/boards/kbl_da7219_max98927.c index ad4223fee0c5..fc318a979162 100644 --- a/sound/soc/intel/boards/kbl_da7219_max98927.c +++ b/sound/soc/intel/boards/kbl_da7219_max98927.c @@ -679,7 +679,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .init = kabylake_da7219_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -687,7 +687,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio Echo Reference cap", .stream_name = "Echoreference Capture", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, SND_SOC_DAILINK_REG(echoref, dummy, platform), }, @@ -695,7 +695,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio Reference cap", .stream_name = "Wake on Voice", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops, @@ -705,7 +705,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &kabylake_dmic_ops, @@ -714,7 +714,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -725,7 +725,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -738,7 +738,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -747,7 +747,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HS_PB] = { .name = "Kbl Audio Headset Playback", .stream_name = "Headset Audio", - .dpcm_playback = 1, + .playback_only = 1, .nonatomic = 1, .dynamic = 1, .init = kabylake_da7219_fe_init, @@ -763,7 +763,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -777,8 +777,6 @@ static struct snd_soc_dai_link kabylake_dais[] = { .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, .ops = &kabylake_ssp0_ops, @@ -794,8 +792,6 @@ static struct snd_soc_dai_link kabylake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -804,14 +800,14 @@ static struct snd_soc_dai_link kabylake_dais[] = { .init = kabylake_dmic_init, .be_hw_params_fixup = kabylake_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_only = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -820,7 +816,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp2", .id = 4, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -828,7 +824,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp3", .id = 5, .init = kabylake_hdmi3_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, @@ -845,7 +841,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .init = kabylake_da7219_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -853,7 +849,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .name = "Kbl Audio Echo Reference cap", .stream_name = "Echoreference Capture", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, SND_SOC_DAILINK_REG(echoref, dummy, platform), }, @@ -861,7 +857,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .name = "Kbl Audio Reference cap", .stream_name = "Wake on Voice", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops, @@ -871,7 +867,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .name = "Kbl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &kabylake_dmic_ops, @@ -880,7 +876,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { [KBL_DPCM_AUDIO_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -891,7 +887,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { [KBL_DPCM_AUDIO_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -904,7 +900,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -920,8 +916,6 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, .ops = &kabylake_ssp0_ops, @@ -933,14 +927,14 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .init = kabylake_dmic_init, .be_hw_params_fixup = kabylake_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 2, - .dpcm_playback = 1, + .playback_only = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -949,7 +943,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .name = "iDisp2", .id = 3, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -957,7 +951,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .name = "iDisp3", .id = 4, .init = kabylake_hdmi3_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/kbl_rt5660.c b/sound/soc/intel/boards/kbl_rt5660.c index 2c7a547f63c9..b1f644f61232 100644 --- a/sound/soc/intel/boards/kbl_rt5660.c +++ b/sound/soc/intel/boards/kbl_rt5660.c @@ -377,7 +377,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &kabylake_rt5660_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -388,14 +388,14 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, .ops = &kabylake_rt5660_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, [KBL_DPCM_AUDIO_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -406,7 +406,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { [KBL_DPCM_AUDIO_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -419,7 +419,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -440,14 +440,12 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp0_fixup, .ops = &kabylake_rt5660_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, { .name = "iDisp1", .id = 1, - .dpcm_playback = 1, + .playback_only = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -456,7 +454,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .name = "iDisp2", .id = 2, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -464,7 +462,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .name = "iDisp3", .id = 3, .init = kabylake_hdmi3_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index 2d4224c5b152..c9a5b6b709e8 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -687,7 +687,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .init = kabylake_rt5663_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &kabylake_rt5663_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -698,14 +698,14 @@ static struct snd_soc_dai_link kabylake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, .ops = &kabylake_rt5663_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, [KBL_DPCM_AUDIO_HS_PB] = { .name = "Kbl Audio Headset Playback", .stream_name = "Headset Audio", - .dpcm_playback = 1, + .playback_only = 1, .nonatomic = 1, .dynamic = 1, SND_SOC_DAILINK_REG(system2, dummy, platform), @@ -714,7 +714,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio Echo Reference cap", .stream_name = "Echoreference Capture", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, SND_SOC_DAILINK_REG(echoref, dummy, platform), }, @@ -722,7 +722,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio Reference cap", .stream_name = "Wake on Voice", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops, @@ -732,7 +732,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &kabylake_dmic_ops, @@ -741,7 +741,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -752,7 +752,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -765,7 +765,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -783,7 +783,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, - .dpcm_playback = 1, + .playback_only = 1, .ops = &kabylake_ssp0_ops, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, @@ -798,8 +798,6 @@ static struct snd_soc_dai_link kabylake_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, .ops = &kabylake_rt5663_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -807,14 +805,14 @@ static struct snd_soc_dai_link kabylake_dais[] = { .id = 2, .be_hw_params_fixup = kabylake_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_only = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -823,7 +821,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp2", .id = 4, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -831,7 +829,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp3", .id = 5, .init = kabylake_hdmi3_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, @@ -846,7 +844,7 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &kabylake_rt5663_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -857,14 +855,14 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, .ops = &kabylake_rt5663_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, [KBL_DPCM_AUDIO_5663_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -875,7 +873,7 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { [KBL_DPCM_AUDIO_5663_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -896,14 +894,12 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, .ops = &kabylake_rt5663_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { .name = "iDisp1", .id = 1, - .dpcm_playback = 1, + .playback_only = 1, .init = kabylake_5663_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -912,7 +908,7 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { .name = "iDisp2", .id = 2, .init = kabylake_5663_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 2c79fca57b19..1c7bce63ecc5 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -575,7 +575,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .init = kabylake_rt5663_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &kabylake_rt5663_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -586,14 +586,14 @@ static struct snd_soc_dai_link kabylake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, .ops = &kabylake_rt5663_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, [KBL_DPCM_AUDIO_HS_PB] = { .name = "Kbl Audio Headset Playback", .stream_name = "Headset Audio", - .dpcm_playback = 1, + .playback_only = 1, .nonatomic = 1, .dynamic = 1, SND_SOC_DAILINK_REG(system2, dummy, platform), @@ -602,7 +602,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio Echo Reference cap", .stream_name = "Echoreference Capture", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, SND_SOC_DAILINK_REG(echoref, dummy, platform), }, @@ -615,7 +615,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &kabylake_dmic_ops, @@ -624,7 +624,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -635,7 +635,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -655,8 +655,6 @@ static struct snd_soc_dai_link kabylake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &kabylake_ssp0_ops, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, @@ -670,14 +668,12 @@ static struct snd_soc_dai_link kabylake_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, .ops = &kabylake_rt5663_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_only = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -686,7 +682,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp2", .id = 4, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, diff --git a/sound/soc/intel/boards/skl_hda_dsp_common.c b/sound/soc/intel/boards/skl_hda_dsp_common.c index e9cefa4ae56d..8e13216e16c8 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_common.c +++ b/sound/soc/intel/boards/skl_hda_dsp_common.c @@ -84,51 +84,47 @@ struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = { { .name = "iDisp1", .id = 1, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_cpu, idisp1_codec, platform), }, { .name = "iDisp2", .id = 2, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_cpu, idisp2_codec, platform), }, { .name = "iDisp3", .id = 3, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_cpu, idisp3_codec, platform), }, { .name = "Analog Playback and Capture", .id = 4, - .dpcm_playback = 1, - .dpcm_capture = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(analog_cpu, analog_codec, platform), }, { .name = "Digital Playback and Capture", .id = 5, - .dpcm_playback = 1, - .dpcm_capture = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(digital_cpu, digital_codec, platform), }, { .name = "dmic01", .id = 6, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, { .name = "dmic16k", .id = 7, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform), }, diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c index e13a5a4d8f7e..eb90017f891f 100644 --- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c +++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c @@ -474,7 +474,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .init = skylake_nau8825_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &skylake_nau8825_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -485,7 +485,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, .ops = &skylake_nau8825_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -493,7 +493,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "Skl Audio Reference cap", .stream_name = "Wake on Voice", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops, @@ -503,7 +503,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "Skl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_dmic_ops, @@ -512,7 +512,7 @@ static struct snd_soc_dai_link skylake_dais[] = { [SKL_DPCM_AUDIO_HDMI1_PB] = { .name = "Skl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -523,7 +523,7 @@ static struct snd_soc_dai_link skylake_dais[] = { [SKL_DPCM_AUDIO_HDMI2_PB] = { .name = "Skl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -536,7 +536,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -554,7 +554,7 @@ static struct snd_soc_dai_link skylake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = skylake_ssp_fixup, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, { @@ -568,8 +568,6 @@ static struct snd_soc_dai_link skylake_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = skylake_ssp_fixup, .ops = &skylake_nau8825_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -577,14 +575,14 @@ static struct snd_soc_dai_link skylake_dais[] = { .id = 2, .be_hw_params_fixup = skylake_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_only = 1, .init = skylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -593,7 +591,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "iDisp2", .id = 4, .init = skylake_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -601,7 +599,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "iDisp3", .id = 5, .init = skylake_hdmi3_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c index 575604dc8936..bf4e83433baa 100644 --- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c +++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c @@ -513,7 +513,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .init = skylake_nau8825_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .ops = &skylake_nau8825_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -524,7 +524,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_only = 1, .ops = &skylake_nau8825_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -532,7 +532,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "Skl Audio Reference cap", .stream_name = "Wake on Voice", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops, @@ -542,7 +542,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "Skl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_dmic_ops, @@ -551,7 +551,7 @@ static struct snd_soc_dai_link skylake_dais[] = { [SKL_DPCM_AUDIO_HDMI1_PB] = { .name = "Skl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -562,7 +562,7 @@ static struct snd_soc_dai_link skylake_dais[] = { [SKL_DPCM_AUDIO_HDMI2_PB] = { .name = "Skl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -575,7 +575,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -594,8 +594,6 @@ static struct snd_soc_dai_link skylake_dais[] = { .init = skylake_ssm4567_codec_init, .ignore_pmdown_time = 1, .be_hw_params_fixup = skylake_ssp_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, { @@ -609,8 +607,6 @@ static struct snd_soc_dai_link skylake_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = skylake_ssp_fixup, .ops = &skylake_nau8825_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -618,14 +614,14 @@ static struct snd_soc_dai_link skylake_dais[] = { .id = 2, .ignore_suspend = 1, .be_hw_params_fixup = skylake_dmic_fixup, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_only = 1, .init = skylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -634,7 +630,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "iDisp2", .id = 4, .init = skylake_hdmi2_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -642,7 +638,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "iDisp3", .id = 5, .init = skylake_hdmi3_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c index 4f3d655e2bfa..04f3db889d07 100644 --- a/sound/soc/intel/boards/skl_rt286.c +++ b/sound/soc/intel/boards/skl_rt286.c @@ -348,7 +348,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST }, - .dpcm_playback = 1, + .playback_only = 1, .ops = &skylake_rt286_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -361,7 +361,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST }, - .dpcm_playback = 1, + .playback_only = 1, .ops = &skylake_rt286_fe_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -374,7 +374,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST }, - .dpcm_capture = 1, + .capture_only = 1, .ops = &skylake_rt286_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -382,7 +382,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .name = "Skl Audio Reference cap", .stream_name = "refcap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, SND_SOC_DAILINK_REG(reference, dummy, platform), @@ -391,7 +391,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .name = "Skl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_only = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_dmic_ops, @@ -400,7 +400,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { [SKL_DPCM_AUDIO_HDMI1_PB] = { .name = "Skl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -409,7 +409,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { [SKL_DPCM_AUDIO_HDMI2_PB] = { .name = "Skl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -418,7 +418,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { [SKL_DPCM_AUDIO_HDMI3_PB] = { .name = "Skl HDMI Port3", .stream_name = "Hdmi3", - .dpcm_playback = 1, + .playback_only = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -438,8 +438,6 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = skylake_ssp0_fixup, .ops = &skylake_rt286_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, { @@ -447,7 +445,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .id = 1, .be_hw_params_fixup = skylake_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform), }, @@ -455,7 +453,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .name = "iDisp1", .id = 2, .init = skylake_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), }, @@ -463,7 +461,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .name = "iDisp2", .id = 3, .init = skylake_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -471,7 +469,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .name = "iDisp3", .id = 4, .init = skylake_hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/sof_cs42l42.c b/sound/soc/intel/boards/sof_cs42l42.c index e6695e77d594..402e85f08f04 100644 --- a/sound/soc/intel/boards/sof_cs42l42.c +++ b/sound/soc/intel/boards/sof_cs42l42.c @@ -328,10 +328,6 @@ static int create_spk_amp_dai_links(struct device *dev, links[*id].platforms = platform_component; links[*id].num_platforms = ARRAY_SIZE(platform_component); - links[*id].dpcm_playback = 1; - /* firmware-generated echo reference */ - links[*id].dpcm_capture = 1; - links[*id].no_pcm = 1; links[*id].cpus = &cpus[*id]; links[*id].num_cpus = 1; @@ -368,8 +364,6 @@ static int create_hp_codec_dai_links(struct device *dev, links[*id].init = sof_cs42l42_init; links[*id].exit = sof_cs42l42_exit; links[*id].ops = &sof_cs42l42_ops; - links[*id].dpcm_playback = 1; - links[*id].dpcm_capture = 1; links[*id].no_pcm = 1; links[*id].cpus = &cpus[*id]; links[*id].num_cpus = 1; @@ -420,7 +414,7 @@ static int create_dmic_dai_links(struct device *dev, links[*id].platforms = platform_component; links[*id].num_platforms = ARRAY_SIZE(platform_component); links[*id].ignore_suspend = 1; - links[*id].dpcm_capture = 1; + links[*id].capture_only = 1; links[*id].no_pcm = 1; (*id)++; @@ -476,7 +470,7 @@ static int create_hdmi_dai_links(struct device *dev, links[*id].platforms = platform_component; links[*id].num_platforms = ARRAY_SIZE(platform_component); links[*id].init = sof_hdmi_init; - links[*id].dpcm_playback = 1; + links[*id].playback_only = 1; links[*id].no_pcm = 1; (*id)++; @@ -508,8 +502,6 @@ static int create_bt_offload_dai_links(struct device *dev, links[*id].platforms = platform_component; links[*id].num_platforms = ARRAY_SIZE(platform_component); - links[*id].dpcm_playback = 1; - links[*id].dpcm_capture = 1; links[*id].no_pcm = 1; links[*id].cpus = &cpus[*id]; links[*id].num_cpus = 1; diff --git a/sound/soc/intel/boards/sof_da7219_max98373.c b/sound/soc/intel/boards/sof_da7219_max98373.c index 740aa11cb019..37ea39be3091 100644 --- a/sound/soc/intel/boards/sof_da7219_max98373.c +++ b/sound/soc/intel/boards/sof_da7219_max98373.c @@ -316,8 +316,6 @@ static struct snd_soc_dai_link dais[] = { .id = 0, .ignore_pmdown_time = 1, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, /* IV feedback */ .ops = &ssp1_ops, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_amps, platform), }, @@ -327,15 +325,13 @@ static struct snd_soc_dai_link dais[] = { .no_pcm = 1, .init = da7219_codec_init, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, { .name = "dmic01", .id = 2, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, @@ -343,7 +339,7 @@ static struct snd_soc_dai_link dais[] = { .name = "iDisp1", .id = 3, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), }, @@ -351,7 +347,7 @@ static struct snd_soc_dai_link dais[] = { .name = "iDisp2", .id = 4, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -359,7 +355,7 @@ static struct snd_soc_dai_link dais[] = { .name = "iDisp3", .id = 5, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, @@ -367,7 +363,7 @@ static struct snd_soc_dai_link dais[] = { .name = "dmic16k", .id = 6, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic16k_pin, dmic_codec, platform), } @@ -422,7 +418,7 @@ static int audio_probe(struct platform_device *pdev) .name = "SSP1-Codec", .id = 0, .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_pmdown_time = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_m98360a, platform) }; } diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index d6c38d8ea2ff..ff7417ca11cd 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -455,8 +455,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].exit = sof_es8316_exit; links[id].ops = &sof_es8336_ops; links[id].nonatomic = true; - links[id].dpcm_playback = 1; - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1; @@ -496,7 +494,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].ignore_suspend = 1; - links[id].dpcm_capture = 1; + links[id].capture_only = 1; links[id].no_pcm = 1; id++; @@ -539,7 +537,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].init = sof_hdmi_init; - links[id].dpcm_playback = 1; + links[id].playback_only = 1; links[id].no_pcm = 1; id++; @@ -569,7 +567,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); - links[id].dpcm_capture = 1; + links[id].capture_only = 1; links[id].no_pcm = 1; links[id].num_cpus = 1; id++; diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c index 4fc6e1c6aef3..c439829f061b 100644 --- a/sound/soc/intel/boards/sof_nau8825.c +++ b/sound/soc/intel/boards/sof_nau8825.c @@ -378,8 +378,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].init = sof_nau8825_codec_init; links[id].exit = sof_nau8825_codec_exit; links[id].ops = &sof_nau8825_ops; - links[id].dpcm_playback = 1; - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1; @@ -416,7 +414,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].ignore_suspend = 1; - links[id].dpcm_capture = 1; + links[id].capture_only = 1; links[id].no_pcm = 1; id++; } @@ -457,7 +455,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].init = sof_hdmi_init; - links[id].dpcm_playback = 1; + links[id].playback_only = 1; links[id].no_pcm = 1; id++; } @@ -496,10 +494,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); - links[id].dpcm_playback = 1; - /* feedback stream or firmware-generated echo reference */ - links[id].dpcm_capture = 1; - links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1; @@ -529,8 +523,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); - links[id].dpcm_playback = 1; - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].num_cpus = 1; } diff --git a/sound/soc/intel/boards/sof_pcm512x.c b/sound/soc/intel/boards/sof_pcm512x.c index 9f673ccf81b5..52cb1c9a9af6 100644 --- a/sound/soc/intel/boards/sof_pcm512x.c +++ b/sound/soc/intel/boards/sof_pcm512x.c @@ -246,12 +246,12 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].init = sof_pcm512x_codec_init; links[id].ops = &sof_pcm512x_ops; - links[id].dpcm_playback = 1; + links[id].playback_only = 1; /* * capture only supported with specific versions of the Hifiberry DAC+ */ if (sof_pcm512x_quirk & SOF_PCM512X_ENABLE_SSP_CAPTURE) - links[id].dpcm_capture = 1; + links[id].playback_only = 0; links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1; @@ -294,7 +294,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].ignore_suspend = 1; - links[id].dpcm_capture = 1; + links[id].capture_only = 1; links[id].no_pcm = 1; id++; } @@ -341,7 +341,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].init = sof_hdmi_init; - links[id].dpcm_playback = 1; + links[id].playback_only = 1; links[id].no_pcm = 1; id++; } diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 7f4783592668..974e2baa752c 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -647,8 +647,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].init = sof_rt5682_codec_init; links[id].exit = sof_rt5682_codec_exit; links[id].ops = &sof_rt5682_ops; - links[id].dpcm_playback = 1; - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1; @@ -701,7 +699,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].ignore_suspend = 1; - links[id].dpcm_capture = 1; + links[id].capture_only = 1; links[id].no_pcm = 1; id++; } @@ -746,7 +744,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].init = sof_hdmi_init; - links[id].dpcm_playback = 1; + links[id].playback_only = 1; links[id].no_pcm = 1; id++; } @@ -795,10 +793,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, } links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); - links[id].dpcm_playback = 1; - /* feedback stream or firmware-generated echo reference */ - links[id].dpcm_capture = 1; - links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1; @@ -837,8 +831,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); - links[id].dpcm_playback = 1; - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].num_cpus = 1; } diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index d16ceef702a7..5705f5bcca9b 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -815,8 +815,8 @@ static void init_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links dai_links->num_cpus = cpus_num; dai_links->codecs = codecs; dai_links->num_codecs = codecs_num; - dai_links->dpcm_playback = playback; - dai_links->dpcm_capture = capture; + dai_links->playback_only = !capture; + dai_links->capture_only = !playback; dai_links->init = init; dai_links->ops = ops; } diff --git a/sound/soc/intel/boards/sof_ssp_amp.c b/sound/soc/intel/boards/sof_ssp_amp.c index b33f720b3e6d..e98ad72341a2 100644 --- a/sound/soc/intel/boards/sof_ssp_amp.c +++ b/sound/soc/intel/boards/sof_ssp_amp.c @@ -230,7 +230,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); - links[id].dpcm_capture = 1; + links[id].capture_only = 1; links[id].no_pcm = 1; links[id].num_cpus = 1; id++; @@ -250,9 +250,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, } links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); - links[id].dpcm_playback = 1; - /* feedback from amplifier or firmware-generated echo reference */ - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1; @@ -285,7 +282,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].ignore_suspend = 1; - links[id].dpcm_capture = 1; + links[id].capture_only = 1; links[id].no_pcm = 1; id++; } @@ -332,7 +329,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].init = sof_hdmi_init; - links[id].dpcm_playback = 1; + links[id].playback_only = 1; links[id].no_pcm = 1; id++; } @@ -356,8 +353,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); - links[id].dpcm_playback = 1; - links[id].dpcm_capture = 1; links[id].no_pcm = 1; links[id].num_cpus = 1; id++; diff --git a/sound/soc/intel/boards/sof_wm8804.c b/sound/soc/intel/boards/sof_wm8804.c index 17224d26d9d6..f3c6e344c14a 100644 --- a/sound/soc/intel/boards/sof_wm8804.c +++ b/sound/soc/intel/boards/sof_wm8804.c @@ -167,8 +167,6 @@ static struct snd_soc_dai_link dailink[] = { .name = "SSP5-Codec", .id = 0, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &sof_wm8804_ops, SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform), }, From patchwork Thu May 18 05:49:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 683421 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F3DF4C77B7A for ; Thu, 18 May 2023 05:51:58 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 862DD7F1; Thu, 18 May 2023 07:51:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 862DD7F1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684389116; bh=3UAWpJyK9GEvSTkQzT/uVHN+RWkQFnJpy2a5VbK9LO8=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=bVbqXM17BSpdjR5m6hBqOoeNVLsQvzNzff0Ms96afE1QTB3sZghy7DoSqHm+BWvi+ mXrTmdryWMy4VSwn1LqT51SSTbXFWg9q+VR3ToW83Cyth2DEMKBZVMLBG/wsYQQ5cZ hmlv5Lgu1IeYzC6jci1lVivmCzcqKg1OQ64SE9eA= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 676BBF805E8; Thu, 18 May 2023 07:49:28 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 02B34F805D6; Thu, 18 May 2023 07:49:28 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 863B5F805AA; Thu, 18 May 2023 07:49:22 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2070b.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::70b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 8EFA8F8059F for ; Thu, 18 May 2023 07:49:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8EFA8F8059F Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=pQymLS3o ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VjI0GawbaW7TDZTKcSf49boQnFnC2P5TGUomVmObVd3jOL3b9Zye4f38sHOBj2UdGYg8opwpvzaYd02kB5beCElHiQF5nRNQgSKEksapmYRJ8YEJpUqvOkTpmaHuH5WeLZpjNAMITCOlX+AqSkOVHq9U2te79/JWXG6jbUyQa9XVphhXlQWmujtooKi3Q5KlKuON0Fo2ihffSX2DcpOWHpud9gxUcl8tvWjnivdT8SZgKx0HGaEd8Ak3c3dTdAkV0cWMY54w6mQLS0k6NfVOrK+iZ+hJla0VFYM3nAwqKUguFCo5VUmUcI7AgEJ5+OiCkTjbKQnqUSCBLNB8XNB19A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/KvGg+GtRs9ZSxrJdNNHMdnxhkoZHdRwXbE8vxwnTTQ=; b=Z6G2bt+e+tYyQpBGvzMz3bFkKxz62ennMj/mFEOfOuYOQ6zy3llezq9v61rI9AAsmJj/BotQmTCP9d443axoj05zMAcd7LMoMjoJ92p4l4fgNXYTv2yJFZu3Fj+FrXWtacoZVXPT3ZShVEQKi+6q1B/NlqEQGFys07hZl6LunjCW7DHhE9z2A/XsCLr0CTIPHcUVb7zcrTayzXdjp1LEo+Q0awo6fcRy73mBMd+W2Ws/d0shhZnO8URGzXNE0usaZYeQknloK1TPQ9luj06Jspro/FLYyOXcuc4UbVzoQDmr7nxGT1PuuVkhGD02V1e8728v83KLR9LDkQpk+rZfDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/KvGg+GtRs9ZSxrJdNNHMdnxhkoZHdRwXbE8vxwnTTQ=; b=pQymLS3ozijzzxs1JnRlaaaRC3tKLZjo2vWuYGLgtka2l9vMe1FPizkqQ1EfFPJXq+fu3TZDYTW4rTZA0Q9LH5B+mpQFX4JsDV6unDX8KF41bJGxLnQlMBPnUP0EABfF/AVA1UqkGBLiYZTCExZCx+qqwVaD8U1rYHRPceTGWMo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB5591.jpnprd01.prod.outlook.com (2603:1096:604:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:49:08 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:49:08 +0000 Message-ID: <87ilcqp4tn.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Sylwester Nawrocki , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 14/20] ASoC: samsung: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:49:08 +0000 X-ClientProxiedBy: TY2PR02CA0004.apcprd02.prod.outlook.com (2603:1096:404:56::16) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: 886c6433-5348-414e-6fce-08db5763992d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B8SJEylmoJKCLSEn9/bheYMb0KcC3/2sAgE3ktriXZNeWS/ZjGF7n+ItPgUPswGfrj0D4mohkTSbv2gnldbXR4vy0Nne7rjTG/XqmsW0XDm38kK2ti8nOTspOJtL/tEkUMiG/JxRJ6IgPU+4/nUV6nAhrRh2do229StGvrmp5YYROvcnl01EtCI5Gsv+Jdd3wYU7npADCSHM3ie9b0g/ZCeU5QmrdrDL7vxmlBiWzJCMErYW8Q/ELTpS3fONgaICRwvW9+neXnzyRD3w9HGmrWvToMBOPz4cEhHO+Bb9NFF3IY9qhDdmB6tNm48RivbmhNZBMi4EME7qdK9q3DhAHZLI8IymgpSQ3JkAJIarpTGFiQxqI8lEehXzZKtjKE4EeV2C0CUUn1b1ec99LH0/El0+9JcVmoUmD7YjU0lav+2x94NM7sOPcVKAAPrMN+me8MsqronR0SFGd7vdr64VVpLPltf+2wmdmzZF4XAa6DRCcP+sNXDXDhfJ7RrF+K3BpBd41ihsEhPo6nfZ7Oh0h6XD10JDnmHazdoj9luEExPsPg0LP4moXVwHGc90nH+vGiLdXOFBVosY19k+Lxsz6zrw4fFxrYj/Ta3mTgDduatVwGABt7O1CnI7H22Dl028 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(316002)(4326008)(66946007)(66556008)(478600001)(66476007)(52116002)(110136005)(86362001)(36756003)(83380400001)(6506007)(26005)(6512007)(186003)(2616005)(41300700001)(6486002)(5660300002)(8676002)(8936002)(2906002)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aRUGduxp1+kRa0Oc801MsMrSciqWJff9bn3XmAr65/6mYH/LmeI+aHuSixsBgLvI0ncJcRezlBhvM0ILfQWc84q6MQCKtK7b54SOe4qD9t/lG22ptv6Q7bksmwoSuv6ASv5L/w+lR7C6hgCzy+qk28MRiOsijU43X1ta63P0/JNrlDpI2ax+zWCiGdRH0OkJTuPkfbpLAHDikBt4rBfwY674I3qs+ELikogy49NUdlSfLoKF4DWrrXTbm6zNgjTLKHUGd1YCP0llymveUu1w8+jpMs8yl9E5w3ebI5n1j6R36y8fRpgSwbm5CrX/9iXxLWsSvD6eibcRm55xU8JN8eTmfnnkzQuZiV5P1P+sZLweeqjLA336OGy2hVknVzGtE/X2yo+ZL62Uhmr6b4jNZoijb9VDtQzPLRJO7OWk4C8GrzQsNx5l2+e6Yl6klX5IMM9/HCNHiHym0d3EKEZVSLESWH/MaBGW04f6sjtnEj4AS+PcBKApgdE8wyh3nM0ZWDGLdHMYovVXT5YVwRiqwtPkDcfyqwTYFfBYOVb6Q2YXcAkaUKJ2vVoT48gnn+XOgaXPG1o9fJgUclEnDwkRtm6JqpXRj0Oby7hCgM6l3nxqjzW3GRMI0vVrX4jJLy7rZJP9+viGr+50O8eUUqWl/Ft9W65WTlyik95et75KasikgNt1AHwmLcm3a88aMc8kgozydwuDnprtGzRJawhspBrNsUr2mUoFQemerKBW90ozxhaR0TTZGITdHZV063HDGJpgOu3B4OqW5c9yU3lK52TX9WI4qHlfJ8qNc2WRjwnDSmrvgNcGIBpvV+3TzJGgz2y1OpFDytx/HdxbKrUF90xOjFNM8cIwHevGZ4YhMYKTW++8RPdMPOuLTbMnOthc5WK60sPToT4CQOnZVyZnKKq6wwuZsvZ2IaXjsPN/ih2rEdgEx5mBuY2bmfu6Tdc8Yn5va+tOLWhZEJN6tO+opZshNcfcWIDSqVfpHYDJtZMeZuCyJLLxYE1Y2h/79oAQhskcUzn6DFrek4jzzMSILRcvAUKwer0B9cg7Ig04w2ZwHi0KM0O9RczDDocV5ZpXXZVkQqzSqVi+nDxtdKN2BHNtnWT2f4EWSvh8LX5mdqLpja4iO+AxTpp7N+g/H5YBVVTDsooy3bP5qHBVxJ/zivhIQKEfWEnFPCSZ561vvVkQZydii0EP/ITtnyNSaVWEkw6UrPbiY1nF0f0r0dPWArL7GUpZ8jmV8cLcpy0/OjTpnwX7HSKREgCbP1f37YcaezRhPDFGlHfEDggprPmFbEZsyjQtRxYw02pnlkAVkfyC7ptnnzYLrU3lDxVheINNfx3MDgxLFMfshEm5ZfLJ9y8Ob4sQlmN48sMHFddarxzKRUAsW8XnO9i2Bj/j2emngjPHhRczCBmeQCsk1YDqtpUPK7V2qEmHqQ7kwjPGFMopmakFE/svzoTYMtkUUhUN5saM48fzcUXFWTfq31S16Za6xUdWmaPg9PntwRvg40kEzYIs8iORkP8sACmtlRNWAYz6EYr2XPuJ8oUu9a/VmiS9zivGJ7ueI5SJ+7H4123c2slXwXE9XHdlUEiBr0w/+p/Shle1iciSdZ5peP+ZcOsWZdNdazvBTuB1zQWSNOU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 886c6433-5348-414e-6fce-08db5763992d X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:49:08.7352 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: S1etStba08Y3UcatrMWRbvxqTb5gu3EmPbUPa7cn4eZW3mgy0qOWzc4VOMwM+fwBM5xWnqFoPHpucnBgJ5MkyCgkrJUSYH8msODUXrlr5mhWIC7m6EAOs4Ic5uiD0dod X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5591 Message-ID-Hash: IFVJB2P76AOMEXOKYWSQ5LZUAMSMT6TU X-Message-ID-Hash: IFVJB2P76AOMEXOKYWSQ5LZUAMSMT6TU X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. Signed-off-by: Kuninori Morimoto --- sound/soc/samsung/odroid.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index fd95a79cc9fa..3fd6a8c2c0fe 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -173,14 +173,14 @@ static struct snd_soc_dai_link odroid_card_dais[] = { .name = "Primary", .stream_name = "Primary", .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(primary), }, { /* BE <-> CODECs link */ .name = "I2S Mixer", .ops = &odroid_card_be_ops, .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAILINK_REG(mixer), @@ -191,7 +191,7 @@ static struct snd_soc_dai_link odroid_card_dais[] = { .name = "Secondary", .stream_name = "Secondary", .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(secondary), } }; @@ -293,8 +293,8 @@ static int odroid_audio_probe(struct platform_device *pdev) /* Set capture capability only for boards with the MAX98090 CODEC */ if (codec_link->num_codecs > 1) { - card->dai_link[0].dpcm_capture = 1; - card->dai_link[1].dpcm_capture = 1; + card->dai_link[0].capture_only = 1; + card->dai_link[1].capture_only = 1; } priv->sclk_i2s = of_clk_get_by_name(cpu_dai, "i2s_opclk1"); From patchwork Thu May 18 05:49:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 684524 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 68624C7EE25 for ; Thu, 18 May 2023 05:52:17 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id DC635826; Thu, 18 May 2023 07:51:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DC635826 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684389135; bh=e1oNBFvYNx13CpFzcWIhv5aiDDj5e1g46SwokPM6oKU=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Ak8O9EJxLKHkjamyT3R+UQDEJPJP/bH2s/zWRKihsrAV0z3E0PTpzvzGY+BL1zQcV E3QFsb3doYAW/smtl5T5AfCzsQj1ZBaMbp+dpAL3ljGLs/C94UNXL77SHHDRKl3GUN xTrCpiCA9Q/8aZ/7sW/Eea/4Q0gnQ/MLdBgkb/38= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0416CF805C4; Thu, 18 May 2023 07:49:42 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 8C183F805E6; Thu, 18 May 2023 07:49:42 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D8255F805EF; Thu, 18 May 2023 07:49:37 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20711.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::711]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2D3A4F805E1 for ; Thu, 18 May 2023 07:49:27 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2D3A4F805E1 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=YkoWsiWq ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J6Ts3ddVmwEys2V7csdiESijSPv0ycoMxqUHnbQjfQbHBEzCPrQtdGAgNF8t0ASeSVdstRyiag2BgYXOou2uaCflol+ZQxhV6Wr69H7skKguUp8xaFhIeoeyFAskKxJGeeg6JtK08Gp6/tMVrNPnMByNV1I8UOOkfrDZ4NOPUKp71tTE+NqcrbzIXbLZT47Y7xF0iXUAsNkXeD+bOK/oTq4X37mJu0GcQA+v2vlvYESGDk0pWyjrkPGMMClGm/wTV1QDsTAQf/h1wTEm56jT6RblpMq49B0csg6YZOoMk/mv2lUMZrNTxGxEENjM1dsJD+d7tmUX5d8eCxv1+8Tc8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8lYcIvZjQwNMuF9FgkZ9no/ctFvPzcapRVEZRcODqrE=; b=XmV9MmqNbY9GXBStxlTZuq7Uk22A8iZqN0ll6rE8nULO64iYaHE4UAWmo3OGEKWx+ByHzWA5p7BlAThS+TGzqeM9UjZbBr9pfkIQEn/yc7bt4klf9VlgdoeqLhLk4jvWD2ry8dZWjpsa+92abC3YlDyRvMBUpsjDH/e+QGCSY7NqLsnZsAR7us1WqMgQoZe2bnOALmi+Q+sPWTHzhOXu1w4UbipGzBnkeOJeBXmRfaBgWNoKpv5bb7Dnj8cUqUDGDA6Xz9avPhUkSZ5iMTlgpStF1GsKfm2MD0BCQk/0K89aewYwiIr0T1EEsYUxWr/i0yloWyd31YhPoKI2SOIwlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8lYcIvZjQwNMuF9FgkZ9no/ctFvPzcapRVEZRcODqrE=; b=YkoWsiWqvaM8j0c7zCJ1/8Q9ifSYeLjkJObUHsTiDf/sJ8aabqf8cjUzh3yuL3PCeR8BM4hbJHZDza/FWAhIj2DF/UV/ZfdZgdV48PlPh6IYfv6gQyDhi4EghN2yid3UvolbNgZ9w+3pGmo2BwtPidX5v1c1Wj6OTgfyxQbNyxw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB5591.jpnprd01.prod.outlook.com (2603:1096:604:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:49:18 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:49:18 +0000 Message-ID: <87h6sap4te.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?iso-8859-1?q?=22N=C3=ADcolas_F=2E_R=2E_A=2E_Prado=22?= , "chunxu.li" , AngeloGioacchino Del Regno , Jaroslav Kysela , Jiaxin Yu , Liam Girdwood , Mark Brown , Matthias Brugger , Takashi Iwai , Trevor Wu , Wang Yufen Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 15/20] ASoC: mediatek: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:49:18 +0000 X-ClientProxiedBy: TYCP301CA0025.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:381::12) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB5591:EE_ X-MS-Office365-Filtering-Correlation-Id: 416e31a8-669b-48f1-6f05-08db57639f25 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1e5xX8N+jL6QydLWZ0X3vBRjHA7D2CI0c9PidghB87kbxq2Q11cAuaT2zeVFAMmtGTuVNyKf5qnwRiFHTjBgE9EGGcP9TRvHVUcyrcpby28F312qZb8BR55P5VSyn8U84qrhqPylF/yeakcgn3Md+BRaaCH0HTlN2zoevSceOwsGxwo4yKQWf8Cv1C/dKa/WcaboKw4MudY6cIkzmQuLyIkxFdcIB5xVoV3pv2R5nja37m+m5KcExMjH4yXqSRNXGOTUXkTrc3il5p58FFlW3yhkQv0s1Cx7/naV2eGmEQfnrFestq/PURxpvvIuACD3ICPB1OT0j5jszZChAg4d8Pfqr+irfXT6aWp4oE2dA4qLrBFrfgcSOHtezvQ1y0jTDeVbj4c6GkubZHSsQSKXXWr/jWtdfSJdjBW+VzicC8zS5r6MHpZ1d1WZUZ3pYY48egqUPqyu3Q9vZDH8nR5s7HBEz9gDaLCT6LyTxG8v3pagxcpIAKjQAXu55hTxlHM8DIr93nj7wcWNoAcfsMY/ksIy+Jjr3cTVPFnJ8Q0Y/9rpD2DYrxKIHSsaU/tF+alRi97VEzGUxFTKcLjQe4Q3ybjuA7TviSNa4fjPar1RB4zAn/GpK0+3+rN65S/TJW08z7nLAFdQ0YjmQV8VyHt8EA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(316002)(4326008)(66946007)(66556008)(478600001)(66476007)(52116002)(110136005)(86362001)(36756003)(83380400001)(6506007)(26005)(6512007)(186003)(2616005)(41300700001)(6486002)(30864003)(5660300002)(7416002)(8676002)(8936002)(2906002)(921005)(38100700002)(38350700002)(559001)(579004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1OkbDFrZn2cfXfPouj/2YjDOxFP7kHUgCpLCHXDPrrtr+3k082obdMcitXiuBL9avTq/btyN4RD0wjCaCg9GnJ5CHKAyp4mWcz9ro/t6duEFVCwkTIScQdgIcoJr/FdlQcRTCX55lo2++DSJZlwffGT1PIjKlxGmLfj9frGdNkG53uKscWlyUMHHwOAZp4P8sQnF2tbQiexnYE7F1YDKWalfp/mp8zn+6BJdUL9c7ScIIFpx8UKPguCx2jQvEXp3mB4JxyccvNrGqGoH0DMX0l0mFuoGUnDMNeaqNuKDskxOvojgNNgdeKNO0CPRHsIJyc2Co+7lPl3rvmow1sewyw5WS9Ftr9HZCUJSSWR+pUShbdXwwl8KLMKyM2ERjo86ZhID8b4WSzAsfKNMO7VOYrt5lSp+nzf1FpNHOAjhX1FFXPv5zTlB1R8ClRhQjGUuDHufSwGlXBCYhTp8LkQbJ2KqCjk93QhvmSh+BB+/pFZQMA2dVWzhJYs/NHLaPSAYGAaAMIBoLb5dXcUHMWfAYxOYrP6sDEssN08VZDLrL7Kp9FPEGIWkoEMvZdMkX6Ji4dssw1kZfBVnCgL/jyWp/lc/dQ80x4ZOqRoIsNOPx4/P0zYp27ppkj08DXz1CWytWKEGHyxTgSh7bMGqbErRce55YeZgsP4jrGJdL5qs+lSUECyhBkNbRg7DtZVeL6+DCZozEMH2HTsj3n0jQd3aGmBFhObocez9+1hqnMV8k4agypdW0vkw7FpTCz1DFhn3jVmUiyCqWy1Y7SXEpVp3HIeMT4BV5IyZlOC4AKtjoRnufn2QZYpddjNucR1yiuiFMrJTfaiKSGSq5+QseEfHGdZl0d48qv9vrFZkMH/wNvdCmPizvSrCrJbeKRY9njEPAMxTwjcVBvZWfd/wIkEjbsRcFZ60Zp5OExDg6Va/09IwPGxqa1WYMnChU/UrP8LYYfHyJENk8AwUdmY5jtkLj4n6CFQWrN1pCSH+hHNiXm3oP6qmb38uv+qeEan7NLpBx4vT1IpG7p9taZb5/B87O86eB86yRgJTV8FjCjBegqhXwUIjYxceVxmN1U7YndjkB1yGakJUXfnntvaXZorASMY/QF6ckukP2excwVw2B9Sk4Vjv3ZUUuQMvCEy6AIsuIfgzAAarIaRLPagcHkqqGwzt3GbsqnqX3Hzq8HdXY9k+Cc882pCBekCiay++q7gv2SjTqIqxsy/TNiiim/8DPFPFH7/Q1lWDqktwSpoq8XSeXohrUjraMwzF/vNWq+QFNak24Lq5m4OocqCCe2MyPyXcivFwAS1/zCVBaqvk92Va6vl/UxZMQUuYpaqFY+Jzgx6InPUDyz2Guaoh5CeNaQCbauShYnRqadzU5LNR0p/i87v72EluIsvxAfRP3+RKo4EbRLN/jZNCq3NPjKez5gAw/liIzbk/xNjFQir4xl/b2DjucqFX/ZISsaoawKgYXUXfnkxLZCU2Gt13Op9Nfc65ON454LHv9hHMCJApWuQsQrzZMmgJAJHK/ceiwxeE0pn8n4S9KrYDYXKBGMVHoLviX6oTaalmUq/0BoHB9ihg83Fkcn6/qXcN+cUdhaqzaXPpfz8YGGBzaeWqXZhxsKDT2vMdSs/0/Y61zeBQPfc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 416e31a8-669b-48f1-6f05-08db57639f25 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:49:18.7733 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: n77YV5tGPj+SD8hkgvm319wuDljuwyfLM3hNDDszSceynUXW5kDc6MQCGuy6Bi5oX1k+xEFHytYAfbNSqWI8tSz0MnZqzLi4BreZJZSMUvDRMQnN/A3Ruf9Qc18RwM4d X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5591 Message-ID-Hash: L2R3IJOYRAHPU2DOWMGZA73DVWTU2HB7 X-Message-ID-Hash: L2R3IJOYRAHPU2DOWMGZA73DVWTU2HB7 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. Signed-off-by: Kuninori Morimoto --- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 20 ++--- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 6 +- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 24 ++---- sound/soc/mediatek/mt8173/mt8173-max98090.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5514.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +-- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 10 +-- .../mediatek/mt8183/mt8183-da7219-max98357.c | 34 +++----- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 34 +++----- .../mt8186/mt8186-mt6366-da7219-max98357.c | 86 +++++++------------ .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 86 +++++++------------ sound/soc/mediatek/mt8188/mt8188-mt6359.c | 48 +++++------ .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 78 ++++++++--------- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 60 +++++++------ 14 files changed, 204 insertions(+), 304 deletions(-) diff --git a/sound/soc/mediatek/mt2701/mt2701-cs42448.c b/sound/soc/mediatek/mt2701/mt2701-cs42448.c index 08ef109744c7..e71c23ebff62 100644 --- a/sound/soc/mediatek/mt2701/mt2701-cs42448.c +++ b/sound/soc/mediatek/mt2701/mt2701-cs42448.c @@ -222,7 +222,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(fe_multi_ch_out), }, [DAI_LINK_FE_PCM0_IN] = { @@ -232,7 +232,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(fe_pcm0_in), }, [DAI_LINK_FE_PCM1_IN] = { @@ -242,7 +242,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(fe_pcm1_in), }, [DAI_LINK_FE_BT_OUT] = { @@ -251,7 +251,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(fe_bt_out), }, [DAI_LINK_FE_BT_IN] = { @@ -260,7 +260,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(fe_bt_in), }, /* BE */ @@ -270,8 +270,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_i2s0), }, [DAI_LINK_BE_I2S1] = { @@ -280,8 +278,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_i2s1), }, [DAI_LINK_BE_I2S2] = { @@ -290,8 +286,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_i2s2), }, [DAI_LINK_BE_I2S3] = { @@ -300,15 +294,11 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_i2s3), }, [DAI_LINK_BE_MRG_BT] = { .name = "mt2701-cs42448-MRG-BT", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_mrg_bt), }, }; diff --git a/sound/soc/mediatek/mt2701/mt2701-wm8960.c b/sound/soc/mediatek/mt2701/mt2701-wm8960.c index a184032c15b6..24fd522d2d37 100644 --- a/sound/soc/mediatek/mt2701/mt2701-wm8960.c +++ b/sound/soc/mediatek/mt2701/mt2701-wm8960.c @@ -67,7 +67,7 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, { @@ -76,7 +76,7 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, /* BE */ @@ -86,8 +86,6 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_wm8960_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, }; diff --git a/sound/soc/mediatek/mt6797/mt6797-mt6351.c b/sound/soc/mediatek/mt6797/mt6797-mt6351.c index 784c201b8fd4..daad9544a8d4 100644 --- a/sound/soc/mediatek/mt6797/mt6797-mt6351.c +++ b/sound/soc/mediatek/mt6797/mt6797-mt6351.c @@ -78,7 +78,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_1), }, { @@ -87,7 +87,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_2), }, { @@ -96,7 +96,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_3), }, { @@ -105,7 +105,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_1), }, { @@ -114,7 +114,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_2), }, { @@ -123,7 +123,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_3), }, { @@ -132,7 +132,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono_1), }, { @@ -141,8 +141,6 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_lpbk), }, @@ -152,8 +150,6 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_speech), }, @@ -161,24 +157,18 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, diff --git a/sound/soc/mediatek/mt8173/mt8173-max98090.c b/sound/soc/mediatek/mt8173/mt8173-max98090.c index c2b0619b6158..02a7d1370731 100644 --- a/sound/soc/mediatek/mt8173/mt8173-max98090.c +++ b/sound/soc/mediatek/mt8173/mt8173-max98090.c @@ -105,7 +105,7 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .stream_name = "MAX98090 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, { @@ -113,7 +113,7 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .stream_name = "MAX98090 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, /* Back End DAI links */ @@ -124,8 +124,6 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .ops = &mt8173_max98090_ops, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(hifi), }, }; diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c index f803f121659d..2a22a14f686d 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c @@ -128,7 +128,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { .stream_name = "rt5650_rt5514 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = { @@ -136,7 +136,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { .stream_name = "rt5650_rt5514 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, /* Back End DAI links */ @@ -148,8 +148,6 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_rt5514_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, }; diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c index 8794720cea3a..8866abee6e35 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c @@ -160,7 +160,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "rt5650_rt5676 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = { @@ -168,7 +168,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "rt5650_rt5676 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, [DAI_LINK_HDMI] = { @@ -176,7 +176,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "HDMI PCM", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(hdmi_pcm), }, @@ -189,14 +189,12 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_rt5676_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, [DAI_LINK_HDMI_I2S] = { .name = "HDMI BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(hdmi_be), }, /* rt5676 <-> rt5650 intercodec link: Sets rt5676 I2S2 as master */ diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c index e05f2b0231fe..617f5dbfa6be 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c @@ -199,7 +199,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "rt5650 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = { @@ -207,7 +207,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "rt5650 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, [DAI_LINK_HDMI] = { @@ -215,7 +215,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "HDMI PCM", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(hdmi_pcm), }, /* Back End DAI links */ @@ -227,14 +227,12 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, [DAI_LINK_HDMI_I2S] = { .name = "HDMI BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .init = mt8173_rt5650_hdmi_init, SND_SOC_DAILINK_REG(hdmi_be), }, diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c index 87bb04846991..848fcd5341bc 100644 --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c @@ -410,7 +410,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_da7219_max98357_ops, SND_SOC_DAILINK_REG(playback1), }, @@ -420,7 +420,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_da7219_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(playback2), }, @@ -430,7 +430,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback3), }, { @@ -439,7 +439,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_da7219_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(capture1), }, @@ -449,7 +449,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture2), }, { @@ -458,7 +458,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_da7219_max98357_ops, SND_SOC_DAILINK_REG(capture3), }, @@ -468,7 +468,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono), }, { @@ -477,38 +477,32 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, /* BE */ { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -517,7 +511,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -526,7 +520,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_da7219_i2s_ops, @@ -536,13 +530,13 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, }, { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -555,7 +549,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ignore = 1, diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index ce9aedde7e1e..0a0aea9b5337 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -430,7 +430,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_mt6358_ops, SND_SOC_DAILINK_REG(playback1), }, @@ -440,7 +440,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_mt6358_ts3a227_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(playback2), }, @@ -450,7 +450,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback3), }, { @@ -459,7 +459,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_mt6358_ts3a227_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(capture1), }, @@ -469,7 +469,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture2), }, { @@ -478,7 +478,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_mt6358_ops, SND_SOC_DAILINK_REG(capture3), }, @@ -488,7 +488,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono), }, { @@ -497,7 +497,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, { @@ -513,31 +513,25 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .ops = &mt8183_mt6358_i2s_ops, SND_SOC_DAILINK_REG(i2s0), @@ -545,7 +539,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -554,7 +548,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -564,13 +558,13 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, }, { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .ops = &mt8183_mt6358_i2s_ops, .init = &mt8183_bt_init, @@ -582,7 +576,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_tdm_ops, diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c index cdf54d1eb50d..b71e4c4b896f 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c @@ -567,7 +567,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -580,7 +580,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback12), }, { @@ -589,7 +589,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -601,7 +601,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -614,7 +614,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback4), }, { @@ -623,7 +623,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback5), }, { @@ -632,7 +632,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback6), }, { @@ -641,7 +641,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback7), }, { @@ -650,7 +650,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback8), }, { @@ -659,7 +659,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture1), }, { @@ -668,7 +668,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -681,7 +681,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture3), }, { @@ -690,7 +690,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -703,7 +703,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture5), }, { @@ -712,7 +712,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -724,7 +724,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture7), }, { @@ -733,8 +733,6 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_lpbk), }, @@ -744,8 +742,6 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_fm), }, @@ -755,8 +751,6 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src1), }, @@ -766,8 +760,6 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src_bargein), }, @@ -777,7 +769,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_hw_gain_aaudio), }, @@ -787,8 +779,6 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src_aaudio), }, @@ -796,8 +786,6 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, .init = mt8186_mt6366_init, SND_SOC_DAILINK_REG(adda), @@ -808,7 +796,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .init = mt8186_mt6366_da7219_max98357_hdmi_init, .be_hw_params_fixup = mt8186_anx7625_i2s_hw_params_fixup, @@ -817,7 +805,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8186_i2s_hw_params_fixup, .ops = &mt8186_da7219_i2s_ops, @@ -826,7 +814,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8186_i2s_hw_params_fixup, .init = mt8186_da7219_init, @@ -836,7 +824,7 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8186_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s2), @@ -844,39 +832,31 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { { .name = "HW Gain 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_gain1), }, { .name = "HW Gain 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_gain2), }, { .name = "HW_SRC_1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_src1), }, { .name = "HW_SRC_2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_src2), }, { .name = "CONNSYS_I2S", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(connsys_i2s), }, @@ -885,15 +865,13 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "TDM IN", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(tdm_in), }, @@ -901,35 +879,35 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { { .name = "Hostless_UL1", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul1), }, { .name = "Hostless_UL2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul2), }, { .name = "Hostless_UL3", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul3), }, { .name = "Hostless_UL5", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul5), }, { .name = "Hostless_UL6", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul6), }, @@ -937,25 +915,25 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = { { .name = "AFE_SOF_DL1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_DL1), }, { .name = "AFE_SOF_DL2", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_DL2), }, { .name = "AFE_SOF_UL1", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_UL1), }, { .name = "AFE_SOF_UL2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_UL2), }, }; diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c index 7538274641fd..523fe18cf904 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c @@ -635,7 +635,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -648,7 +648,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback12), }, { @@ -657,7 +657,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -669,7 +669,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -682,7 +682,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback4), }, { @@ -691,7 +691,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback5), }, { @@ -700,7 +700,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback6), }, { @@ -709,7 +709,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback7), }, { @@ -718,7 +718,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback8), }, { @@ -727,7 +727,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture1), }, { @@ -736,7 +736,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -749,7 +749,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture3), }, { @@ -758,7 +758,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -771,7 +771,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture5), }, { @@ -780,7 +780,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -792,7 +792,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture7), }, { @@ -801,8 +801,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_lpbk), }, @@ -812,8 +810,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_fm), }, @@ -823,8 +819,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src1), }, @@ -834,8 +828,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src_bargein), }, @@ -845,7 +837,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_hw_gain_aaudio), }, @@ -855,8 +847,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src_aaudio), }, @@ -864,8 +854,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, .init = primary_codec_init, SND_SOC_DAILINK_REG(adda), @@ -876,7 +864,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .init = mt8186_mt6366_rt1019_rt5682s_hdmi_init, .be_hw_params_fixup = mt8186_it6505_i2s_hw_params_fixup, @@ -885,7 +873,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8186_i2s_hw_params_fixup, .ops = &mt8186_rt5682s_i2s_ops, @@ -894,7 +882,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8186_i2s_hw_params_fixup, .init = mt8186_rt5682s_init, @@ -904,7 +892,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8186_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s2), @@ -912,39 +900,31 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "HW Gain 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_gain1), }, { .name = "HW Gain 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_gain2), }, { .name = "HW_SRC_1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_src1), }, { .name = "HW_SRC_2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_src2), }, { .name = "CONNSYS_I2S", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(connsys_i2s), }, @@ -953,15 +933,13 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "TDM IN", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(tdm_in), }, @@ -969,35 +947,35 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "Hostless_UL1", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul1), }, { .name = "Hostless_UL2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul2), }, { .name = "Hostless_UL3", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul3), }, { .name = "Hostless_UL5", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul5), }, { .name = "Hostless_UL6", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul6), }, @@ -1005,25 +983,25 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "AFE_SOF_DL1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_DL1), }, { .name = "AFE_SOF_DL2", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_DL2), }, { .name = "AFE_SOF_UL1", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_UL1), }, { .name = "AFE_SOF_UL2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_UL2), }, }; diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c index 919d74ea1934..224a376680a2 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -435,7 +435,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback2), }, [DAI_LINK_DL3_FE] = { @@ -446,7 +446,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback3), }, [DAI_LINK_DL6_FE] = { @@ -457,7 +457,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback6), }, [DAI_LINK_DL7_FE] = { @@ -468,7 +468,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback7), }, [DAI_LINK_DL8_FE] = { @@ -479,7 +479,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback8), }, [DAI_LINK_DL10_FE] = { @@ -490,7 +490,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback10), }, [DAI_LINK_DL11_FE] = { @@ -501,7 +501,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback11), }, [DAI_LINK_UL1_FE] = { @@ -512,7 +512,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture1), }, [DAI_LINK_UL2_FE] = { @@ -523,7 +523,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture2), }, [DAI_LINK_UL3_FE] = { @@ -534,7 +534,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture3), }, [DAI_LINK_UL4_FE] = { @@ -545,7 +545,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture4), }, [DAI_LINK_UL5_FE] = { @@ -556,7 +556,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture5), }, [DAI_LINK_UL6_FE] = { @@ -567,7 +567,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture6), }, [DAI_LINK_UL8_FE] = { @@ -578,7 +578,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture8), }, [DAI_LINK_UL9_FE] = { @@ -589,7 +589,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture9), }, [DAI_LINK_UL10_FE] = { @@ -600,15 +600,13 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture10), }, /* BE */ [DAI_LINK_ADDA_BE] = { .name = "ADDA_BE", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .init = mt8188_mt6359_init, SND_SOC_DAILINK_REG(adda), }, @@ -617,7 +615,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .ops = &mt8188_dptx_ops, .be_hw_params_fixup = mt8188_dptx_hw_params_fixup, .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(dptx), }, [DAI_LINK_ETDM1_IN_BE] = { @@ -626,7 +624,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(etdm1_in), }, @@ -636,7 +634,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(etdm2_in), }, [DAI_LINK_ETDM1_OUT_BE] = { @@ -645,7 +643,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(etdm1_out), }, [DAI_LINK_ETDM2_OUT_BE] = { @@ -654,7 +652,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(etdm2_out), }, [DAI_LINK_ETDM3_OUT_BE] = { @@ -663,7 +661,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(etdm3_out), }, [DAI_LINK_PCM1_BE] = { @@ -672,8 +670,6 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(pcm1), }, }; diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c index 5e163e23a207..cedf838249aa 100644 --- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c @@ -689,7 +689,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback1), }, { @@ -698,7 +698,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback12), }, { @@ -707,7 +707,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback2), }, { @@ -716,7 +716,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8192_mt6359_rt5682_ops, SND_SOC_DAILINK_REG(playback3), }, @@ -726,7 +726,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback4), }, { @@ -735,7 +735,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback5), }, { @@ -744,7 +744,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback6), }, { @@ -753,7 +753,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback7), }, { @@ -762,7 +762,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback8), }, { @@ -771,7 +771,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback9), }, { @@ -780,7 +780,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8192_mt6359_capture1_ops, SND_SOC_DAILINK_REG(capture1), }, @@ -790,7 +790,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8192_mt6359_rt5682_ops, SND_SOC_DAILINK_REG(capture2), }, @@ -800,7 +800,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture3), }, { @@ -809,7 +809,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture4), }, { @@ -818,7 +818,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture5), }, { @@ -827,7 +827,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture6), }, { @@ -836,7 +836,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture7), }, { @@ -845,7 +845,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture8), }, { @@ -854,7 +854,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono1), }, { @@ -863,7 +863,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono2), }, { @@ -872,7 +872,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono3), }, { @@ -881,15 +881,13 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, /* Back End DAI links */ { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, .init = mt8192_mt6359_init, SND_SOC_DAILINK_REG(primary_codec), @@ -897,29 +895,27 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "Primary Codec CH34", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec_ch34), }, { .name = "AP_DMIC", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(ap_dmic), }, { .name = "AP_DMIC_CH34", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(ap_dmic_ch34), }, { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s0), @@ -927,7 +923,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s1), @@ -935,7 +931,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s2), @@ -943,7 +939,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s3), @@ -951,7 +947,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s5), @@ -959,7 +955,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S6", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s6), @@ -967,7 +963,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S7", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s7), @@ -975,7 +971,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S8", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .init = mt8192_rt5682_init, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, @@ -985,7 +981,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S9", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s9), @@ -994,23 +990,19 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "CONNSYS_I2S", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(connsys_i2s), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, @@ -1020,7 +1012,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, .ignore = 1, diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index ceca882ecff7..f349ba27b9d0 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -1025,7 +1025,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_playback_ops, SND_SOC_DAILINK_REG(DL2_FE), }, @@ -1037,7 +1037,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_playback_ops, SND_SOC_DAILINK_REG(DL3_FE), }, @@ -1049,7 +1049,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_playback_ops, SND_SOC_DAILINK_REG(DL6_FE), }, @@ -1061,7 +1061,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(DL7_FE), }, [DAI_LINK_DL8_FE] = { @@ -1072,7 +1072,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_playback_ops, SND_SOC_DAILINK_REG(DL8_FE), }, @@ -1084,7 +1084,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_hdmitx_dptx_playback_ops, SND_SOC_DAILINK_REG(DL10_FE), }, @@ -1096,7 +1096,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_playback_ops, SND_SOC_DAILINK_REG(DL11_FE), }, @@ -1108,7 +1108,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(UL1_FE), }, [DAI_LINK_UL2_FE] = { @@ -1119,7 +1119,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8195_capture_ops, SND_SOC_DAILINK_REG(UL2_FE), }, @@ -1131,7 +1131,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8195_capture_ops, SND_SOC_DAILINK_REG(UL3_FE), }, @@ -1143,7 +1143,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8195_capture_ops, SND_SOC_DAILINK_REG(UL4_FE), }, @@ -1155,7 +1155,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8195_capture_ops, SND_SOC_DAILINK_REG(UL5_FE), }, @@ -1167,7 +1167,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(UL6_FE), }, [DAI_LINK_UL8_FE] = { @@ -1178,7 +1178,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8195_capture_ops, SND_SOC_DAILINK_REG(UL8_FE), }, @@ -1190,7 +1190,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8195_capture_ops, SND_SOC_DAILINK_REG(UL9_FE), }, @@ -1202,7 +1202,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8195_capture_ops, SND_SOC_DAILINK_REG(UL10_FE), }, @@ -1210,13 +1210,13 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { [DAI_LINK_DL_SRC_BE] = { .name = "DL_SRC_BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(DL_SRC_BE), }, [DAI_LINK_DPTX_BE] = { .name = "DPTX_BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_dptx_ops, .be_hw_params_fixup = mt8195_dptx_hw_params_fixup, SND_SOC_DAILINK_REG(DPTX_BE), @@ -1227,7 +1227,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(ETDM1_IN_BE), }, [DAI_LINK_ETDM2_IN_BE] = { @@ -1236,7 +1236,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_capture = 1, + .capture_only = 1, .init = mt8195_rt5682_init, .ops = &mt8195_rt5682_etdm_ops, .be_hw_params_fixup = mt8195_etdm_hw_params_fixup, @@ -1248,7 +1248,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_rt5682_etdm_ops, .be_hw_params_fixup = mt8195_etdm_hw_params_fixup, SND_SOC_DAILINK_REG(ETDM1_OUT_BE), @@ -1259,7 +1259,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(ETDM2_OUT_BE), }, [DAI_LINK_ETDM3_OUT_BE] = { @@ -1268,7 +1268,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(ETDM3_OUT_BE), }, [DAI_LINK_PCM1_BE] = { @@ -1277,48 +1277,46 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(PCM1_BE), }, [DAI_LINK_UL_SRC1_BE] = { .name = "UL_SRC1_BE", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(UL_SRC1_BE), }, [DAI_LINK_UL_SRC2_BE] = { .name = "UL_SRC2_BE", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(UL_SRC2_BE), }, /* SOF BE */ [DAI_LINK_SOF_DL2_BE] = { .name = "AFE_SOF_DL2", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL2), }, [DAI_LINK_SOF_DL3_BE] = { .name = "AFE_SOF_DL3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL3), }, [DAI_LINK_SOF_UL4_BE] = { .name = "AFE_SOF_UL4", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL4), }, [DAI_LINK_SOF_UL5_BE] = { .name = "AFE_SOF_UL5", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL5), }, From patchwork Thu May 18 05:49:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 683420 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CF97AC77B7A for ; Thu, 18 May 2023 05:52:24 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id AC6A81FC; Thu, 18 May 2023 07:51:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz AC6A81FC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684389142; bh=GRwlCRp5ndl0F/IBfqq4KL7Aq6bVeeXh+aDypGbh4mo=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=EZ+nE9S9po02fogiOf/lUUAG2pRhCIjyReKwQw49GUnlIdtOnAvDlmeJo2+HMusYb IiTX2SQL11Hu/P8FGU4pzz67ovZBUuTrIDyjkyuTF2UKXqHvnPw49/65xC1Wn5NNZB M18H7fhHHO7YbjIvzMRMY16KTNsU4nuYeftrc2fE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D0C02F805F7; Thu, 18 May 2023 07:49:44 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 6C598F805EF; Thu, 18 May 2023 07:49:44 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 32E1AF805EE; Thu, 18 May 2023 07:49:38 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20727.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::727]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 05D1DF805E6 for ; Thu, 18 May 2023 07:49:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 05D1DF805E6 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=Hk+2OB92 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MSLmNaX5dkvJvnTgkz6CARbZYYVd56ghqUBQw73+OSuL36u3UWvM2pb2Zit3y0gEwS3AQykHSNiIG148ceEMfiLthqvE3/iwf9JSLBedHZGa88k1HQ10n05O/M1MPcQkW471M0qfwrKcUoUexgUZKM6HpPW0tzIyWXgd5dal4o2l4EL6/7AVIdPjkwFGmlJTBqzqljUYgTNIcMNlmq6vaDgE2vtWiBsNYcplXU76cNUQ/ZxcbRk1c3cO5QbjukamO+YwMry7xThRpgsqFsiBOlU2fdKO/z8t7JXUWDuV57k21G+ks/+OoXxnIkJoPd+nhuBfRWjwvZezQvtBV8yqug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9+JaZB2+1Qbc1YqBv4oPcCEPSAFChQvFQwBtQ0Noebg=; b=NdGJG8HngNV6Pc/Q/j/4AWwoneUZocOw5C+SRtlbEhgPh48IoAqTGMxmZ9PNi/6H2ZxA78eXFz+LNKoVA7iaUFAoj16RlqbsP88sG1UojdF+7s9oqytSpwdGYHLtmaYaKC5pV8VmDFnUAiNl3Aor8HhRfxMFTYdDMgCVvtw0/t8yDSZIMp9uq+LFBNRRSBfJGPxgWk96H2BoZvnV1Z/tlZdCpWosndgrc5t62gEyWrEYhvx5QXcmDaGaiCjwGl46DgSEDA78/s73KkymuhlhSEKwPHmnQYv/C60XeNX4hTBVQtjowG+RpCmhv7Dn8JIBaSlqjeFWg6f5m7draTBnhw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9+JaZB2+1Qbc1YqBv4oPcCEPSAFChQvFQwBtQ0Noebg=; b=Hk+2OB92wOWFGCPi/IphhHu9yscwH4FUBUmTBSFHSvaY2mvuyT7oS0kj6rGNz8w3nIViRcUGODnPrODqO6RhwLvvIYLy9YZEHNLC7iSNKrD/+Yx00u0gLGz/Zx5ncvWdTyUmnOEQ7kmskqniQHAwQk3mATXQfQ5+2m8MpJFMgk8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYBPR01MB5325.jpnprd01.prod.outlook.com (2603:1096:404:8023::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:49:27 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:49:27 +0000 Message-ID: <87fs7up4t5.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 16/20] ASoC: soc-dai.c: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:49:26 +0000 X-ClientProxiedBy: TYCP286CA0228.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c7::7) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYBPR01MB5325:EE_ X-MS-Office365-Filtering-Correlation-Id: b2c3e252-1398-46d9-4eb9-08db5763a3ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YjUjMy0Z6rEh3wTXQBOAVkaqqYjUY6ha+Epm5EQ7xC8cXmC/mminkuJ1bIT0llWmcT1bZlKn8VYVNa7hlBMFSaboQ5ggQC5NujZkaDjktywzVpfIXH0e/wokom9eLTlwO3p3tEFmL6Vn5l8VwN2wal6nsTcDKkl/khC0Sui09WJnDamcCqd8EIByFj4xOJKKKuB8g9yolI7kmoO79EvYF/OPPHKwY5VMGOQ8Y9s9A7oQ0vQHK6S7eO68NugUs95j8YnATtq41hzZvZjMgjdyqcTW6B1kyfjPmFT2gNMWxn7AijhCerkqgPkVGzMFs4Z1WuBcvEHnKfgCVajDIUTFizlxumbHJlGk4l7grvWzVykrV6yQ4+XVg45a7MO1hqQ2kOEkehBCBbFS9VVyyANoSnArtu3yDa3hNrD0USsZCVd5IwX+BOjzMlHPYeL9y4p848ZJKDIg4vtm6ROL+XIQGjUzVP2FLaBvQ+zroFvT68WAZMXHGTVpGlV2yZMAUyeSf62pbg4DziYXHURAwAOGQzSfvP/yIsHyZGcMKSJSGGTe1YqqrunmiG27SpV2HB2r3E/pHXJY3f7ppkLjnWwCceAYAgL1DbAGs2Fw7wz+LYX2c1NWjgluOAxmwmGacpxg X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(39860400002)(346002)(396003)(136003)(376002)(451199021)(36756003)(52116002)(6486002)(2616005)(110136005)(86362001)(83380400001)(6506007)(6512007)(478600001)(38350700002)(38100700002)(26005)(186003)(4744005)(2906002)(8936002)(8676002)(41300700001)(316002)(4326008)(66556008)(66476007)(66946007)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1/VESsPEGuAPz8JRvQWix2BVS+4WaHrL0XnF5G0HmR6DMAXrYF8lFXTqUcRZqvGBcGIQKWnRnalCmit3M/DNKjKhvAujZdLZgacdYmkBXqjUUYm63qcJ2LK0TaM1z4cED9Hlf9lT6fyfQGzM+iPIHwJhIrFAjwqy+3sJ9alLxgg7R7TF5x/DoHMEGMz2vSeDmggnGn8wvgbF3VFTVCVK+esZe9+VRASkCi7s6WeqDjWy0FbrD6o2Ksr5hrDhBE5LgiT+IVNpgwtGYPZSb7YVEUiJg3bIUl3aZU2f4OBruJRmBm0tuTST8PBFV+K0hnMiSd/EOYd4fuDnTYt8XaXlLPW4daQ/zEKos/MTQLmY0grZmIpIjOXx5qNRDLvqSdMgX9B8+ERy32GDNKVVn3C5BBb3CGLLhFpHASl4QMeG9iD5mOhhca62XQQiv4TTJEZlW/YclWdAGb3SUS/7J4pRdVgqp7OEgKnIKfMj0sgT68x+5ZMu+UEANPBzm9RdctAsGWB2TlL5T/i3yWdJHiAiXVPhLu9UFu9Ra4hjY++C6LV9H6gJXX4a5Zu3yoB0iRf5M8Xend5WfiinXGCC/MyJpuMkQCVbBetlxU/UeGQr1fWZyMb9hoXkTFdH233f4TW4V2Xd0boPMZ5tHkttAM8wZ7ae7+t9E+hEBs/AT2gOynu+H7QPkpgMyrhWDy6jPm/bOH4i+dM9Ti/BOrzVFKtDP6LtUIHuKNduGCgXcmury8aCoylEoc8ut6PFVVX/ucf35pplz11+dGKlL/CEbqfgJvxdZJ0kgEOPLN0y8su7FmkJ7MAVyJuEtRw2HRUOvtYailw7CJfquBto1ymEfCmDM9ozmou3Zl7hGSc1mZqotkEq/55uUJ5eiE/bpuU4+MoB8N/239js/r4WXh0W2rogcmdtgavg9HX1jGFxEHENqAX0M6oH+6XABGVM+VbS4vbJQhPVyqHb2vcLmWJSzHF2B/qMnDPoLNYUxxtpSXpiKfPBZQfrb7Nxg2O5uJEKVV/0e41q127vivNzXPzozoqvMBvTVQY+gI7ekIKwpkuWXhiASEMc0w5Ixl8/hK6iLT/fWly6z+iYfzWabBaES5ryY6SfShhUm2rLpnHvX63QSjhS1TCSQYFL4NGlYHbjeISN0f1wVuWXHc1SZo1MQduCRtX8Wd11MZ+RZQuitm3YcLqGZE6v5i6yBoh2lH5LVCRjNomi62qr2lZbIo+oXLfV6ftuQ/IgAFMlyWX2BLVJaH93ZWURQVH/CIzQjWaoX+sLWz26AmuTJ5uJ/672CZ/C3sljifT1L9Y1cN1kvKjAZRaf9/GC1AFwYBZ6MuRJ37/yb+9POueFe/vIjMKjr46nLhfNk/tCUEIeXCllZp5KuolggsqN3kwe0XaVzZwrS6oM6ujPSmFgA06UyVfxGjaLmzWvwcvSzT4cjs2zx+J2LDFz+bWcmEaYrmc84X4omuE0qbLSJul6Qb+0cDgsjKRjAcrgjQ29fajYUg0ccddDRDx3BVapMCoNuhmIpK0mdgzorD0Tr1hFm5nn44syYvXjB/AFZXiteTC+/vMXwmZf7hD2POY+Kp8oq6lshhFN3YNPNFF8sMNtmw7t4J+MrxUIJHCwz3v+t1cDYDS6NdDed+c= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2c3e252-1398-46d9-4eb9-08db5763a3ec X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:49:27.2362 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QJXcATbEFccvIpaJibbr/nj4UQ1i2pdeNjrasxtXU9xp7tD9cJA7/MezSNCdRkqHEKbvBAjCkCcChKji4X/V1uB/NCtdOnGUDyBa4Jh+vQ5qoOgUKhq/OSvZh18BYYnY X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYBPR01MB5325 Message-ID-Hash: E2RYOGDVNQJEGTMBM7D4KY2ZL5OV22GV X-Message-ID-Hash: E2RYOGDVNQJEGTMBM7D4KY2ZL5OV22GV X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-dai.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 02dd64dea179..e61414bb0b72 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -505,8 +505,8 @@ void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link) supported[direction] = supported_cpu && supported_codec; } - dai_link->dpcm_playback = supported[SNDRV_PCM_STREAM_PLAYBACK]; - dai_link->dpcm_capture = supported[SNDRV_PCM_STREAM_CAPTURE]; + dai_link->playback_only = !supported[SNDRV_PCM_STREAM_CAPTURE]; + dai_link->capture_only = !supported[SNDRV_PCM_STREAM_PLAYBACK]; } EXPORT_SYMBOL_GPL(snd_soc_dai_link_set_capabilities); From patchwork Thu May 18 05:49:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 684523 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6C240C77B7A for ; Thu, 18 May 2023 05:52:52 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id F350C206; Thu, 18 May 2023 07:51:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz F350C206 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684389170; bh=MdOPOnw42D38J3ZgxhQYYNWSZMr0gNs81G1R4ZGFdJ0=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Q7Hecr50QpSNfr3KHeHdIv16Xoc4mtjwAssk8t15nD/IERlUEVG0ZCewwgdPG7zyf X+TsokOPU/n2NuzA3J+QTSbxWlNmvBpYvpj51oN+vUhcEEOTuvbWM4DO7y9r+sFoyt JXcedCbpol5JNTb3rISX20aRGOkKUkX1n5oRbxhI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2EA78F805F1; Thu, 18 May 2023 07:49:47 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 897EBF805F1; Thu, 18 May 2023 07:49:47 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6F774F805EC; Thu, 18 May 2023 07:49:38 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20727.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::727]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 7558DF805C1 for ; Thu, 18 May 2023 07:49:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7558DF805C1 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=KbURRZnl ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n0iNk2/BcvohBqzrfjODsfSCT0aZmaD++vo0JH0mAMTcTeRhUdbN++zfXuUlIxn0zBxGW2t2Tzru56tNvUYQWUi28O1as9XuTyjKAVKGiZYHtE9eHpPLMS/YcxNUPS4ocrzCutvw11to9lvBfB2wOZLPQW2d234EGEKADfjCQHqoMoyyt/W1UKIhkFyP99mPZdUfbVWRcAr8wDYADGxYVXQXeb9BJ5Ql8hnhfmX4ohPVIcQGCeIMq+Hh0/PTkcCa3Yg7SsnP5luJNsChN/+wr0mFCeyBGIHZmnUGBzstbzrP6Y1lPSADZYJUsJa9SwisCAMqh03zN+qstSpZ4s+GoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KW5PZhkQGaI6WkmYemAQT2fQ7z15UhnM1G+Ig5cR128=; b=dEGFwlSeel4vXkHnuhmOebQFwesyhDZ12dDnT5fvDnzCMB/3VvOeCIMxUCFqGdc0zxK50MeGaxxk3nWF1AquCAJDcKse/Qjczf2vj/+U53jg0efwollPBbKKZ3SMehscDWnJoEwxNw5CPF8bQ/oAfSDNT0M/D/LZ9g+Ug3kq7G78EeYpxGiUteOWBmuBjVjoQMxPZPCZWyiOyksJ1eYHg2PNUVD7ZhyVVJ8qX3lY9//0CvELh/0JJyQulB1zybeMmepiqZ9IRgknTXd/F+0y3TxiI5gvl7+QCoIfskjPdpgh9jLGMHSpbRclNi8JdQDw5P6dTDpSrnb6IC3RtvZjCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KW5PZhkQGaI6WkmYemAQT2fQ7z15UhnM1G+Ig5cR128=; b=KbURRZnlcjumvGJBTE3lLpaVOQfGJWlaTYPhgodWr9b2RenMItYAC6RlkWyf/wNVo69Xlswd8ntvXLls0kYQeBsTPMWUxILdNwrNgpnnnSinH4o46qvAEbwnpBS05KiXdytzT+AqcBHCqNVJdZFIxp9/Vay6Urb3cRyLc8YvjW8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYBPR01MB5325.jpnprd01.prod.outlook.com (2603:1096:404:8023::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:49:33 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:49:33 +0000 Message-ID: <87ednep4sz.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 17/20] ASoC: soc-core.c: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:49:32 +0000 X-ClientProxiedBy: TY2PR04CA0019.apcprd04.prod.outlook.com (2603:1096:404:f6::31) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYBPR01MB5325:EE_ X-MS-Office365-Filtering-Correlation-Id: a046d07e-f7ee-4d9d-1e1a-08db5763a7b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tfrbh70oS4Rx6HOBWMtqyFP4a3qsT4gkEfgAP13Mu+k6+OdszwiuuIqm6nMZP0ri6boDoDglQoHeZomtcILMvGmK3xcrFZ5/hF4so8/j30QyYz2aN+xLYYqtspcHNBWHzQr7m87ai27uM8gOt8rw5n9ZHseVuPWI992UvXg970yWTlWwvQYuJrjTMnEYaIEij6ex6h4O3qeJcHev205SNGBG512X/uGogU4ItP56n0dHtomxBcBEH+gK8VRDclNIQZFTO/H4A1Q/237QBLNScbgJilQCmSSDqS55e1W21LHjWP7wkYPLl+60bhsXLm6j1wPgxiU93zpdujzwAbYcYilkfwHP3/T2Xcnrq1d8mUWU8SKQNuwgOqQT5bkE4FAnZnPnRotRmPpNKLWjfRiHGf8bh6Tw1uH3PV4WDVKnCo402QYlp95vEJ94j13mxLgq1JQoeH+3wBYhAYEI59c0WDDDY7aKB7grP5heEXkXce5dw1L8USmCZnbtBsYN71viISWwgBtW3J9m/KftNzlt0QiWvaz32Hiu5wFRWWCuMPP0QdxSsMV0JEXuWJ7sETNPP45C1pLD69iJ8HDY/5xYnAaFWKyl8CfQkmMbiqLQ+LSSklFY5LKcw0J0wVyqL3Fw X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(39860400002)(346002)(396003)(136003)(376002)(451199021)(36756003)(52116002)(6486002)(2616005)(110136005)(86362001)(83380400001)(6506007)(6512007)(478600001)(38350700002)(38100700002)(26005)(186003)(2906002)(8936002)(8676002)(41300700001)(316002)(4326008)(66556008)(66476007)(66946007)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hQgVB26HoH4W8a0SlzlJUVpjUk+xaxkn0Oh9OQN9MYJvq4FmXT4MnjnHliYef8aLK71bYv2PzuMWKMq2vpbTx2aPbduftwNFSfqjMLGWXjYWj4MNw5qrBBbEtJaXSqYXQYiPfoKKfUnrjE54AYXI+dCQcYvPK6wRt3jlHVd68wpJpGXwI7ebibzo71QflyLIjY/Z0dNUIM4JhxftHzSM1rrdihrXYpQS1SPW6r5BFdozOCLQFHTkR2KHtUY2OpDuqS758x3pFpBv19+RzodacdBYQzeRuxO+epkFt+/T+XyHlRIGz6YGrC4JZ2ekBHOvd+EEO/CtT/W5T96oXGf5g9YIqrV01CAjNyDJuZiqsOzuBEbf4vZnzAqdkqjMhHmCnTKscR2yaFJeeS3NCaoDIyG3lq3A5AcNrX4gTKdls2TDimmgdQN5liEIns3qnnmUnmmPvgk18c12E4G/BVm7Kvum+Io4IoKLiEUgidQ8dZi3jCuS4Y6HrFvnBDUB0iuuhX1lo/1Awnd1xKdAOKu6NWToFs90hwovZB7htuEdZEHzRpPnZ2Atz4pRYBWwvuLAkdZxpUt+JJBFc53FRwoBNnbbjMXuwrTnpsA4pyq2YIIrv6+LnQ3K3u93GhBejShnmTH8nkiDal/hk7qWYvC47echDEg0QYGS3G8kTNggCG8ph6L9leJQqEbV2EKKgdBTPxvhulWJc9VF9TuTl/CD+66dSqR83YfkIf0DIQwC1o3/Z0hQoXE44cbisvT46oVvTzoesbMg8mysXMOgZLkUL0ToiLGdB+xqZoXLY5c87GOdahvT5lA9yOphYKAXsOPGN5ZjHHHpDcM7TEdZvkMOQ2E7gKm/OfCN050FDXMhluvX18jvnOv20HyIxEtWaeEIfJsvZk5GSCdhcprS05HxC2hO08ILw6/LoJzhdXvHwhTwt5rpXzXZQaFuFh9r4B6DvB78R6Zvzlaljdw/QlE4m2AfpfiJCQmtnJKwVq+lBp57WYvRkzl/UJjLs3BoJQN5vpipXGQTaa+WGDZkpsKyfIO4yqq6MUjx9oy6BHjmFiNxoKcJAYrvK2qjBqoe7KtqutHjzfhoUx8jT3XRKl0lpyvg3FN+rHLc/0YPWHaxbp8oHXOJOFYyFJvNOku2BZHiUxprvnn3qpkvuxtsbLGr4bNXhApL1und0urOOLdT+DreHPb86yANJxWVdN7U0fyGu9ZDo+SJzCDMtsVjeXC3TPm9tA1ucD6woo3VtML61hmpP8f7nZhTdxZ5UNv7R8U94h6QB37p7yvwOM5rb6rSwuOC+wcTThHHw0wkU3OUEPp5XzArwItr2E66iAili/dssKSDTDuot52cF690AcJCmctWH/1X3YxyasHYCDIgdj5yuUF0+5+3F5ZQ6tPvHNmaIkREOmUkOHCpihuYTBEDRtpe2RWRzupK12Q1yfHtInLzSWJro6nzgTV2KTnwA1RUjZDhGQwxl/vOjt6QQko6S4EEa63bkLbdmM7zbQu7rX3pgUg6sislD66QGphSdtSDRt5GDXIFGZT3D8zcX/Ok1ef985z0MMmc/+CuyvNkHWQAAuWbhyHCOxiit6n35shpF7VqcoVHi7BUQpQT7NBvsYTxgTBBEsDWfqHKnreyHmg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a046d07e-f7ee-4d9d-1e1a-08db5763a7b4 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:49:33.0720 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2GTTmkAxgz/ZxbdpnceoY8hKl9vVUrhng+0kIldpjIuU7Qj4RFp9XxHcPr9/3yVYzKXLrGjTW/uqmrCtWNxyU5+Ury1ChfYUVtpfjuwnCRnzXc7wdRx5FlYCcZSVqF0y X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYBPR01MB5325 Message-ID-Hash: NDK2WAWIUEMATGPA7KDGTOK3ATTZBISN X-Message-ID-Hash: NDK2WAWIUEMATGPA7KDGTOK3ATTZBISN X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-core.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b48efc3a08d2..f57911e4e4d5 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1781,25 +1781,7 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) dai_link->platforms->name = component->name; /* convert non BE into BE */ - if (!dai_link->no_pcm) { - dai_link->no_pcm = 1; - - if (dai_link->dpcm_playback) - dev_warn(card->dev, - "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_playback=1\n", - dai_link->name); - if (dai_link->dpcm_capture) - dev_warn(card->dev, - "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_capture=1\n", - dai_link->name); - - /* convert normal link into DPCM one */ - if (!(dai_link->dpcm_playback || - dai_link->dpcm_capture)) { - dai_link->dpcm_playback = !dai_link->capture_only; - dai_link->dpcm_capture = !dai_link->playback_only; - } - } + dai_link->no_pcm = 1; /* * override any BE fixups From patchwork Thu May 18 05:49:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 683419 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0600FC77B7D for ; Thu, 18 May 2023 05:53:08 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 1DEEB82A; Thu, 18 May 2023 07:52:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1DEEB82A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684389186; bh=nmP/EvPfRymITFLvQPIXlSBZ2NojsgRs2MbgQKjNQe4=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=eLI8HyfrMlEsuEJw4x93n2rK0BSysGdrX/ulVRFP1mcQJFFIoQwh1gjx+BUNahp+R AYMVa/vfi4chzSIgIx9doZiCmZ0oQDZoFzldtNdOwACBpBGmnlIqmH0ibiLnfLCuDH BsTNt3OyJrzTfyTJQP8nj5AjeeU0uQyfivxi3lgY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A37A3F80602; Thu, 18 May 2023 07:49:49 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 03547F80602; Thu, 18 May 2023 07:49:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 50B88F805F1; Thu, 18 May 2023 07:49:44 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071b.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 43DFCF805C1 for ; Thu, 18 May 2023 07:49:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 43DFCF805C1 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=Pb2AaVtG ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N/16sqVWQ+ru4y/9up8Yy7qv3TVPtIt7IePHSyzJAkzW/spRhKmPlL4K+dV8Hlvt+4dJO7rPzMaxH+fWRGNeOS8KF6QgeqkSXQI4f2vFGQQqfDS5RbJXPn8/Z7yu3RGlMSyGBkNkbzS/dxVlQIVvQ3ZoDD03gkh/62LdpPAXH3vdDFdUNHHZi8g6SmLyL/RTa5MdvN+6X4m2wL5T9LD2+UqOCCPR3OyUHT07AS1vdyP7hcSNuKZOOz4XKXPZidPQMifRz4T43Zx2E+8wlekh+D4rfOqtrx6bFyPhR7Hc7bGayqUd5Kt746N8kvrkQ32ZxrgYfp35tUk0nn1EnPkbMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SimhG1a3s9oOuS2YbMrEitedG/dG+CSvSIEDKoLhFdQ=; b=dijP3TOB5o9B6nkBd8Nnp9pSmIx1kc34RaXrBs6jHinOcyihYp0A/LINPAlp+Mh+oi90m3LvvHwH8xgbFkL67FjVLdBmAsCHKerx3yWnHSymNjl57yGKIS5AnrnkIFrKiRjBhi3u8IiopfuIA1vWhjk4sj46BKrOXsmV/WeMonk/gTKVB2Q0mDgHMahipj8LrtyxASpO956jbw0zdxtD5Q3r336BR0XcDWC2hWkp2VR5xZstTWDsq3px5uOnmpm7tAlsHy+UbLi7mkoaGtDefF26iDjyDqQmJURay+5GcqkSQfafwyHF+cZimzd7scnRWljeWRADS8X28XHUYnCD5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SimhG1a3s9oOuS2YbMrEitedG/dG+CSvSIEDKoLhFdQ=; b=Pb2AaVtGd0HYqndbnvkJH1jEMvIKVjyDWljef4IsoxKEYUEZwC6ApQrg9F75zRS1X/01sfjVn7l4Xvv8JkWcWRXn7Xd3nNx1KelpNu4RsUwMqd8dQjH5sE+pXNv9o1UBS9YCO1f4FQHrjUU6C15WGNI1t91KfKwI8DKGOIpcUkc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYBPR01MB5325.jpnprd01.prod.outlook.com (2603:1096:404:8023::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.18; Thu, 18 May 2023 05:49:38 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:49:38 +0000 Message-ID: <87cz2yp4st.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: =?unknown-8bit?b?IkFtYWRldXN6IFPDhYJhd2nDhYRza2kiIDxhbWFkZXVzenguc2xh?= =?unknown-8bit?b?d2luc2tpQGxpbnV4LmludGVsLmNvbT4sICAiVXdlIEtsZWluZS1Lw7Zu?= =?unknown-8bit?b?aWciICA8dS5rbGVpbmUta29lbmlnQHBlbmd1dHJvbml4LmRlPiwgSmFy?= =?unknown-8bit?b?b3NsYXYgS3lzZWxhIDxwZXJleEBwZXJleC5jej4sIExpYW0gR2lyZHdv?= =?unknown-8bit?b?b2QgPGxnaXJkd29vZEBnbWFpbC5jb20+LCBNYXJrIEJyb3duIDxicm9v?= =?unknown-8bit?b?bmllQGtlcm5lbC5vcmc+LCBUYWthc2hpIEl3YWkgPHRpd2FpQHN1c2Uu?= =?unknown-8bit?b?Y29tPg==?= Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 18/20] ASoC: soc-topology.c: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:49:38 +0000 X-ClientProxiedBy: TYAPR01CA0152.jpnprd01.prod.outlook.com (2603:1096:404:7e::20) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYBPR01MB5325:EE_ X-MS-Office365-Filtering-Correlation-Id: 2414b335-9be7-4972-343e-08db5763aafb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HSA/YFINPdvHXe1yCJl25OT8pLxCMc0IpJIZmBBKXPMTcu7M/gU0mcOXsMvaF0oRVTBXereF+I3Zxag1k/sz77NXL/ZLfx30uMsewyrOXDZc88GWvuWK+V8FzVyK6+RH8PSZ2mM6Hph0wASIlng8jC17njs9eimw/OgxAjTK/vDr+qGeY9PZn9yWu5A41lfB2eM9zL23tUWgm1OIXa78KqvJE4BiZSw5vrxCI1DB6X3VC/UL88yBryN8SXlItaJOf+yjBSw6E9tYDbIjtV6nLX+Dw/t1w757xQM1CKhg9B48Lfp/RtzuZFLs6CQWFuVudsjsoKcn3cHX6to/lotOWiNlKxtmKfyZ6gtofWnOjJe1i55G00OwAutjpn6MyZ572qtW1WvxGncHtc6dkf+PDR+qcFzSJazaAtnuaOWiDcdvPaF9M4J0Fo7rbrHTm9kz+qDaXpKD9lxp8e7vijfqoCrDWtYX73DP0IBK5p18s3Eq172O1bddvX4guDxIrADTK6lI3SmS4HLuA0ywwByqAq7a4b0826GDkxg0fR1eMtR+pK45SjRpEKz0HiKfgJOnGZsOh56XSbyU4zjGJ23APbgUsrAeZEYC6wxe6rwax8f6ytCJmPjyjjRfDBYS7ivI X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(39860400002)(346002)(396003)(136003)(376002)(451199021)(36756003)(52116002)(6486002)(2616005)(110136005)(86362001)(83380400001)(6506007)(6512007)(478600001)(38350700002)(38100700002)(26005)(186003)(2906002)(8936002)(8676002)(41300700001)(316002)(4326008)(66556008)(66476007)(66946007)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +S06kIiUvW7/i/5W3XUxQIX9dUIRcjxmH3xTVVXdlabbBif43d0Aov8RGh9d6sl8CQWdAwWmOgYKyztPoQ4jNKF6XpOcEQZp5Zra5Nf4uV6U8w5nqX5Bf589VTrJqc4g47L3BLoesE+DcdMA6xicaFmJ0+fdgzQxwU/+5750wQ5WTNxliCWWKhC/TC5oUfG7WVuCzhomcUuGySLBPYoLtRSRg1SHlbBvfg4xS+UAyykbRKF9B+Ww4oleAZQO6ik3mmDOOqrrxBEHvLwzxrIRYxY2oTgavG6F7yYHhh5r+tuEB2UJcGNp/ErZ6pr/E+U96ddnBX4SlNDrFo3fHkKcwwjHtXRiAoZgYkEieUsOBz9gWLEl06ssi8eeLecyVslbgIJj8JlNvy7iRL+BSQeiDSVpvt/qb80V9pi3GPgGLiYDBY8TX0rfe8WKJwmFlL0GJ6xA+FdcAD/kF/a+4ytBTsuez8FGN2H7yLTeqQDMPVeoYSjx2p3Eo07K+26gcx8sOIPS7SRv5kTUyEqCtn9Qsyg4QpEf3a2ynC+3dpCBalluApuYpNdOA4YmlYuRv9O9XdtWiDTtf83+LQ7QMlLi3xZwVPKLz80Lpd39JuKwNNUrQF1y0Yo1YjEqfbH63Yg8hxD/f15OAMwIVIGdNqWtDnbxtNtRHNDRI357tgmlFm8damHRiRdH1YW6xz3M2AfTcRGgWT31QK+LOmC2OdZk2L593Mh8qNUJtIwqbQDlCEezJMibUa0AdNfBD6/LEo6mKxSdi1jdhUo/HrnoFSAkHzfSc49zll/LFR+/FIMeGIUZZVYLoOtKLKsY4DWANU7vuDw16wGT1bnvrBmlVMfMk+cXfP8LRCWekNRKEhiZYqPGzf7RPkbfevBPwA/+Y00SxXGEHu8jwmm31iYHtFN/w2oLyyUV8aRn7f+bdRwcQHdtRs6hrb1cfnHH3wPKfbYpXdy6zf7VZKj1hWS6B+DeUgD9HFKiHOAXhaHZ/Av5DC0m2aYNzhSqTIM+JNDlwaVOpjoZDCZhnFFSATG2qGZuUJplKVzRqymtTUGuSwqW5TGoA4ArdfpvPxfnybs2/oU+PmonzmrjcJE5XgTSaRbJ1eLvcRWDAthSUwMkaSSKe7e6FekOsJBHcD866fDPuPO43Hbqmm0pHqZIzOC91JZhKKJip1qpLzfjg0J0ZDKbNNNw7zVKRmNb6fPtDmAAlneSD6PVqMGX9wDUNw5NAgsyiNgRQPgflQ2h9T0CssCs4Ku8i+zypKLUToF4KlCkCCZFoiwzdc3MV1h+wnLbtIopXrmhtyOHSsRx4p8SPKOGE5zZLKFWEAKg6e11G+kmVOTsqGGKff/LnA0pV9+AiYr1TU3GZS+VcEnBu6gJOK76H4s/t9PZAigDFbtikRMTWGJIs/fXoBkfO/ab8i4BsfahRFdXyVn7q+nuXzVavScovb/0STuVucDcOcfI/0bYn+/w0xMt4Ljkj8mUtoSxBaXCytqjU38LzDXPxxaV/HG2ZN2ZDDYBFz3HyVCQyYiGoFKmjA736cVaO6rj+79t91YcrlR+L6u7zpM47/qg3uq5R6wcfW0vMxia0AJhMwaZF2l7gP8dyB2KAQ0H5DhuSXIKYUb5I3BWij4l0eJeXPrUlfU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2414b335-9be7-4972-343e-08db5763aafb X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:49:38.5902 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ZhbqB9BcUNBAU69vO1oRHKY7tj5Aqwl5S1CONvmgSRyca2uSlJMzUJXDw8mDaPF7UFqSF2u1VyU1iNMH2Pfm4S33IRAm+ucGd6R1th85kl10o9R8NRFF9t+JmC5+DIad X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYBPR01MB5325 Message-ID-Hash: FJXWY53A7YV5QHGI2DEQARYUO5WLBNPK X-Message-ID-Hash: FJXWY53A7YV5QHGI2DEQARYUO5WLBNPK X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-topology-test.c | 2 -- sound/soc/soc-topology.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-topology-test.c b/sound/soc/soc-topology-test.c index 2cd3540cec04..703a366e0abe 100644 --- a/sound/soc/soc-topology-test.c +++ b/sound/soc/soc-topology-test.c @@ -94,8 +94,6 @@ static struct snd_soc_dai_link kunit_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(dummy, dummy, platform), }, }; diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 47ab5cf99497..16a3d570463a 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1735,8 +1735,8 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg, /* enable DPCM */ link->dynamic = 1; link->ignore_pmdown_time = 1; - link->dpcm_playback = le32_to_cpu(pcm->playback); - link->dpcm_capture = le32_to_cpu(pcm->capture); + link->playback_only = !le32_to_cpu(pcm->capture); + link->capture_only = !le32_to_cpu(pcm->playback); if (pcm->flag_mask) set_link_flags(link, le32_to_cpu(pcm->flag_mask), From patchwork Thu May 18 05:49:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 684522 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5C089C77B7D for ; Thu, 18 May 2023 05:53:22 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 132743E7; Thu, 18 May 2023 07:52:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 132743E7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684389200; bh=2/gqu3s4pji9P4C/2q6o+EStRNzcf4INHLqcYIrl0XQ=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=gKxekHxUfn6EZWUddgGMpJgB4w+kA56vfbO98pt1Ri1eMU/+zuyPrs9KrkdbOOnRo kn/NqIY9si2udS+1ynUcOhnG/mDn9ExObGKlB0RMwJlnZIjcUu8Tqb6j/hu4L/ye2B kLLY9XPe5Bqxb0LCK5RhhkDURSIL8oQy+nKHSJXk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 30158F8016A; Thu, 18 May 2023 07:50:00 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id BCA26F80609; Thu, 18 May 2023 07:49:59 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C51E1F80610; Thu, 18 May 2023 07:49:55 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2070e.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::70e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2A5A8F8060F for ; Thu, 18 May 2023 07:49:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2A5A8F8060F Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=Mla3g1Z7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IA64++vVpxh1GQdirn4algJ9dCY94wH3GtSOGYxLjN0QXjLBKyJg0UrilPE9Yau65PPMuv96QxGDE9gnQ6hDujxHXO+/f+R3BWPjOAGSauySaymHMyr7ThnhQ0uUF4c1ba0ZqanoFyl0OWVlZXOeOXm6G9VEJPxYTeODlPUAI71bbreqRI92/6xgjvnyqijPGB3Bawu+kfvTeL9RSnR5NgT1htECfNLffuIALxSas8XGxAezftlj8yLFCrEyEWckJe5ybZFj6MvEw8V9c0f4o3EsZfRoZf5fdNyZPaXrtDm3HR8fvkzN8m5E8UbpC8VXRDRjguIa01PwNnx8hRVvyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=K7WV5gDJ28s91mQ7vYqXTAYTKoK9LzvZmSQ57xSPFBc=; b=ni2S+GXr1N5SFcLhPoOsMeL2vbLj0em0jvOJhDpxSVWzpVbMcNcdqHtX2ueMQKShZDlCRzmvC67QZIlB4ekVclsZJJecQv56XFeE1Ksg6dZ1u+Mbm26ccNXgnv6Dl0Sla0PV6oTineffPHvnapyiumbGW+LJIX3U2aa6/ZQyqae/rmwG/Mn8rED1x3dC9nfERRW/JTPVXIwsxZ3wO00hh1IveKopipOUiRnOn8vUtUhHQvdTeOWjx9FmD5mzVP/PlESA03LKYxHngM7hbVgOlMbtYtvA0JUx1hU6V6/c2upSTq0epARW0heAM6XCgy3xFCcFb4ThPxx60CPxQRejjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K7WV5gDJ28s91mQ7vYqXTAYTKoK9LzvZmSQ57xSPFBc=; b=Mla3g1Z7Edf1xkt/WN3Suz0WyI9JjG319gcdjdT81QZJNvuhdur2SGv5lwNRK9sSKI0mM6ycQQQ9nwuNw/MPrkyWtklHV+Kl4LLwxyTTbA/itRbZ8AfH3PUy4nsg5hFUWiI/Mwgm2fdonqjV6P487R7rE32EhJj5QGMkVWK+MYk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB5984.jpnprd01.prod.outlook.com (2603:1096:400:4d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.19; Thu, 18 May 2023 05:49:47 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:49:47 +0000 Message-ID: <87bkiip4sl.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai , Vinod Koul Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 19/20] ASoC: soc-compress.c: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:49:46 +0000 X-ClientProxiedBy: TYCPR01CA0088.jpnprd01.prod.outlook.com (2603:1096:405:3::28) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB5984:EE_ X-MS-Office365-Filtering-Correlation-Id: 5cc6706d-44b1-4cb4-1fe6-08db5763b013 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ORgaKkxFoB5O30a+/BdzfeZw0EKhywC3GNvIq05SzhRG6GTTVTbcqib9awpfqoGcgIkcCyXV8h9pbZZw+5EGBhFEyrjWIB7aR6aohVAl43xByGFaNYkPADeo3nB8XC0ssxZGUBMxNU30T4mVfd9h2tCZ8R8ePmVAfzPJW9rFvAp3ChvcQMknjh7sLiPeT3bbxNZ5Vspp+8NjvYCEBT3SBEMNqIbN3cpV8QuAtb1HTjfhQJOcFyjFU6UyJ9BzOJRifNveuAKNcISbMuxzP+fKwU7E4AmLycm0CuAVB2qth1f9ItBk1NCyxQmBFc0nP/I64GDYALBWVYVm5YxV2Yp9ucTkAkSNBzDMVRs1upDZQAYAPiBzupfYi8zvPd2xN4j0oCqZ48oySmrTO4VW4/K+lNXEMVKA2vocDa0+62zzJGzUbJRUNm9PbJGQUx2y4PDCyr0icjd+QGgaB46h/Sz/czmj0xP0eAQW+iV2PId5xe0nu4yWR6zlxjEEt1tRV91TXaOWpQ7wLed4LW3J3GqiOP4CwSv9EAV3y9kr5lqZ83FQULoQKv4oVxtAODMSRjF2wUpuPPbj4HaTZRoQ2xpHuL5CtlhUu3h3GUYsMTNKaRT62BTrtQlDI4knzn90OUAd X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(6506007)(26005)(6512007)(186003)(2616005)(83380400001)(66476007)(5660300002)(66556008)(4326008)(316002)(66946007)(41300700001)(8676002)(8936002)(52116002)(6486002)(110136005)(2906002)(86362001)(36756003)(478600001)(38350700002)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rM0+KrVW48Uz310lBaYh77nmh+rSnv52/fFG8xCNnDjm7AGUibjA7zriOyVtFftNyEYLeE7zzv2bWU5ILSoPKqUgT5YJVi33yE8EmzCHhEqiYwlvJNGv6xzaM/i0VWzu46ZhGOL+KqokuQ79K0jv1HrnIGLgvjaHGZP0FVXyaVtHni6t+9sTJMVsH5H/Qj0LAgfMt5O8Pl39i3goQnXkAlb4sGNVUH9R/dijwO7x+CbXdHeU1PEYrA98ijjYVLgL4y9KDo8+OZzAxI9yUSOdUD9eVzCN+lgVLLJvXQgE9tzowKVUyJwKpbakYFM8+/N8is6TRc47lQDuOUg+YT9DVK+S2euR81DPoykCqtT4xwiFEglvOHuYuPelOiFpQ7BrfeEDgdqm4UTweT1JOpbuItE8roDE1SYT49Uicilm/cgDaC7dKH1YgxwymRm2bIvaJ6zHKu7EUQ1pNsY7BzRh/+b6954mD//St2LpVWNqSLa2IWbDOEXIdnnu+UTcksJJvevEJzs875YsH3FfwcMJeLJXERwP7YPb8FTr/1ufF5Hx8T4wLXQOCvqsEKFioWhC2dBhMs2bKa4ePiaeoYuqRSGR3/1gYKknP6FWSEa+222TyDhGsKv5ee3f1uASzduaUqZEyK/s0Qyuy8eUnkyQmtJTNdg71exgvmaFbc1zCuUWpuStcVQg0shBa6Q+9InUxRLaZMaRtgxldgs/cgbYCdC+wB5ZHLw+5uIMXxNOqVf9zXu1jkKTqDWe5zv+Rc58Lx4KlN5FCDOMp/Xn50Nl7GQLPjC0y1FDZjTk0TKABVpYKGAH5qHkceHjLULUJKTkNUPZ7G6+C9LlyOD9cROd9uOn2wcu9RW1W189dooJCjEOCQ6eKo+maXhOaQyf87B++y6vJK/WVSlHsVjGeUQ01zvMHCTjHaW88OpkV67UKtlKRWk6FGlOpoOniEKebxFVnyOi+/J1VO4VBOeTSwl3kCISw19PB/n0bitQfyjbGyovymHvtCT5IzrNP+6Iv4S5j3W6zVyoICo9LhnoZVlbi4P8k7/S/OvuJsVzL27n99mwHaWeMuRoYA0Zv6xM5U1/zK0zDGiMjC4oaWjDMkb/uLYY0CwoN4WvMYlvEltYgQ0847Hvo+bFQ7gGQ3ucJgXeFqtA1XFncR0Bf/5qYFcoqXqar1201l3RK3iu+B0nHyoE9TX4PGP9/Yb0EV5LEsD9LGUZeynQjB5cMcbWjBcnoKz9W+UyojLrkgAwGXrgFwsIVMFFskMQDGQrkTQlEQrYQITEjYqi1YXePONC1WumfcEcNGFX1HEvNZZS9QQlqKvsvqF/bfC9MRxOttAbWjkDot7EqSvgz30jIOqDqSeDeHY6WE5HCoibfZQnMP0zR/znvZW5k5J3EN1YDJgnzQlRDaFTJ7kIG5hEPIXNZDsLWUY2Nd4U5sKPGuj5x10B9ktT6HrhrAiMjYSFj3Eel3PSJepDYYX+frJl9LTGgWFUujTyEsYyGi7UUvm54948hLAXPpMZna3Z69RjBHCp1nlY4kOvu6Fmme4Il0g3BNQLjTJyy+L34pl/BbJ355q9NENM/bGAffdWgcwWKsok/aJBwYz6ZDuMA7QI+Rs/NBWzuP15eJZWxlc8ITgnUwP05tY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5cc6706d-44b1-4cb4-1fe6-08db5763b013 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:49:47.1262 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vTfRfFb3k4th62BXc7tRdJWH831OFXTqYHuxwjEicGjzzeq0U7YvrtxHVNPbZf/JkOT0lx1EhAY+mSzjfGx0mF/GaPZomFRjw23t/Csin5eGlPoHQW0DK8YemepIOb9l X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB5984 Message-ID-Hash: CLPHWBHUPF36CQ76XNWJTWT3SUING2I2 X-Message-ID-Hash: CLPHWBHUPF36CQ76XNWJTWT3SUING2I2 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-compress.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index d8715db5e415..cf3cab7a648f 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -602,12 +602,15 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) return -ENOMEM; if (rtd->dai_link->dynamic) { + int playback = !rtd->dai_link->capture_only; + int capture = !rtd->dai_link->playback_only; + snprintf(new_name, sizeof(new_name), "(%s)", rtd->dai_link->stream_name); + ret = snd_pcm_new_internal(rtd->card->snd_card, new_name, num, - rtd->dai_link->dpcm_playback, - rtd->dai_link->dpcm_capture, &be_pcm); + playback, capture, &be_pcm); if (ret < 0) { dev_err(rtd->card->dev, "Compress ASoC: can't create compressed for %s: %d\n", @@ -620,9 +623,9 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) rtd->pcm = be_pcm; rtd->fe_compr = 1; - if (rtd->dai_link->dpcm_playback) + if (playback) be_pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->private_data = rtd; - if (rtd->dai_link->dpcm_capture) + if (capture) be_pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream->private_data = rtd; memcpy(compr->ops, &soc_compr_dyn_ops, sizeof(soc_compr_dyn_ops)); } else { From patchwork Thu May 18 05:49:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 683418 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4C26CC77B7A for ; Thu, 18 May 2023 05:53:36 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0B186DE; Thu, 18 May 2023 07:52:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0B186DE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684389214; bh=GK8MOCNCRQr+OcRBqULmPxbY4OTyqSJVjp5AuQ/Z0MM=; h=From:To:Cc:In-Reply-To:References:Subject:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=qtNxnV+Z2SsWUERddka7wOHGg1WeuOk0DsfKeq5ir8MWKjTg3/M1lPaJ1dlxDl7Nc uBbLZJUbhCUxoedW7+qGHqYhJ0BSaxQhhxGSz+Wg9EMvUJrDuCzzfCwuUaU9xF1p9i dSwc/UjARoagtmGOmtx5VSKKKfUBkKYW53O1QABQ= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7C53CF8060F; Thu, 18 May 2023 07:50:01 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 27177F80617; Thu, 18 May 2023 07:50:01 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1C3E7F80609; Thu, 18 May 2023 07:49:58 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2070e.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::70e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 5B865F8060F for ; Thu, 18 May 2023 07:49:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5B865F8060F Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=VfPwUiWB ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dcN5Ft1IOQ2AhRwszzzIlnXePGInJPvKaJH5AFOIWxjvp+1VtiUDr5VEFDiixkCo5s1Jh21BIvfF+8ZBrP44kZPIkguxSAZoatU9JbNQTVc6zrwylSjY8pjYnG9wS9+j7nPfG2NU98ndSCtAn4+34bGvGEhojZ7wqncMpTwWyumZp41cmX88nxfqPUVBS5D0dCZAEbL3DeA8JCoT98+TXk/oD3dS7HeUwb0BXKlehPFZLmUnQoOAfjJPuHjnvIL4yfXZlN26/eNA8xna1vDqJDVQXQIwYsfwqtoEOt5p16/Y/O1hBpls6cCfm6qh7gE/GuPR1PyE+gj+k/M8t4Wzhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UxL44Y4kZz8o6Sl7OUwPSTlFIlXSayBnN9Wzfjj9+O8=; b=FTydE0NiTPI2XHxIf9jF+sSQNSHDJ8tGT7cbs7D+wHi4HA7yVkoDeryvg9gnLYa4Pr/Jn/MA5yasjHQ4l0TXYd0251VHDnEhsjpdeZK/it0QbbL+MrJTrpNJgehv1SfRzwzgJnpOcm4S/M7AkaY1cN+gNziZ9r9C/LmMVIqx4II5jtUx1rTT5G83Hp4DsfO1f73lkS8eZUfioSxrTAZ0Fx20Y9krRav4LDvDy0MGvi+hwGLe86atHJQMSr8jVnKOg37C1OG2RqodHOwwS+qcJYlNIDcpKlmt5mVeGLer3CF+lhhhV97ZTx7VyF2SArGzqn0xz7ExYxmdFGtQNQAZww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UxL44Y4kZz8o6Sl7OUwPSTlFIlXSayBnN9Wzfjj9+O8=; b=VfPwUiWBzsSSje94B2Rjt0SfBszc93GhTf/hGya4CsJwpxbjEylF3xMRuQnYxvQ/NBOykruK2klaShpH8j55Db0IoLM3Oo9BBs8RuuRnMtBlkNRunUH2tpVkH6O7o1lVhOsd0NA2m5jVrgDAH7+oFeHCe5qKves6KlOJs0xIIG4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB5984.jpnprd01.prod.outlook.com (2603:1096:400:4d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.19; Thu, 18 May 2023 05:49:53 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%6]) with mapi id 15.20.6411.018; Thu, 18 May 2023 05:49:53 +0000 Message-ID: <87a5y2p4se.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org In-Reply-To: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> References: <87353uqjiu.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH 20/20] ASoC: soc-pcm.c: remove dpcm_playback/capture User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Thu, 18 May 2023 05:49:53 +0000 X-ClientProxiedBy: TY2PR01CA0001.jpnprd01.prod.outlook.com (2603:1096:404:a::13) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB5984:EE_ X-MS-Office365-Filtering-Correlation-Id: 356f9776-80fe-4727-12f0-08db5763b401 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I4uAtqZmn7v7C5XjM0MiOPKW3KJsG22wi2lZilidJna+Aas2l7qDZx/MOtOgUA67cXyS4AoV6O+E5eeb6XhLG9ezYU0S0qWYt0UrIHEjgvE2kQwmGhn1CioRP8q0bm6McPrjvlZ0HaqM6NrtPAVzhDHOVyVpbF2dOYBy1EhW0ND9kupcdoHK3hvfBvltgXy7a+IWp9ZXYB+tSTYnOAWqlEcF+Ley+GyOvAu+IzF2BPP4KS66AZEH7ZeiuRURHNpyqcLcOCPJt1kBUHCJen4IJ9NT8kG5PFk6L+EiKyapOYGilteqN7yMgV35Bc1rwUvpNFv+yW2UoyCRG+owfZzUfKbwrCQ/HKDJObZXJVI9jDxLrMm+YPXCkNUuucqkzXb45JCB5IcqmO3P7pkY4Jwp7r7IDNlJFQSzUWscnEpcyL8JWXuonS/POKjrsQQZmn+gG7lk8+i2ev42nzfZSRczwsbY3oHADShmoMbuTCvztE0+4Gvrto2sCTuW+xAFM2lJ/m9sL7b4zUNKu3ToXo0/+eC/9J6WPDU+Ea5Wdnp4LnG50mqYTiNxZu2jFDdj4CJkzZvCCRE92pStnssDXXACXBME3JxKPTQ/yIWKA5RWWP3M+epyzoARDpI2VcQm9G/9 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(6506007)(26005)(6512007)(186003)(2616005)(83380400001)(66476007)(5660300002)(66556008)(4326008)(316002)(66946007)(41300700001)(8676002)(8936002)(52116002)(6486002)(110136005)(2906002)(86362001)(36756003)(478600001)(38350700002)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HkbbmpzMciX2/Vo/cLoz12GJToEqYKXfl1wx23ALY90VaR4yfA4BPLvTCT0Y2DKEI79CK305KcN4Zfk4EkS+sptiJp2dPWMnx7DmVN1nQ7qkmSOttKw3jiVbpNI/pFIVW039rD2+TwEkLKtyUNYO8VGG9Wfs5uCHhyZrU6gfE8N1PTfGcL4Yr4bvFdNtb+i6tViAZm5VsmpTi7gWBf+/1m7YuNePi3mISzfgd+xiN5Ba+L05WUTtpeGPDjveW+qQwRLJbovufGpN0B11zmAAi06ejVczXFyinKvk0cv+dOX7fKz6pneG5zDEwZZhDgDQcvBJd3DWnPR+OowcgM9fRovoZ6fSBXMaliE/PAnekzljuH+WMrAR3cYMeYKRITkfzxAs3Xr/oSEp+AKcXHc6Ca3PKeNW/xqHt2ms3DII4iW2D4Hp/kUMbOv8KjhFl97GUQtbXfDZcqZSpm/GNnrG7meYhuLNW7f6b0gxelFTJYGCfwVDJZ2haHCGkV4YKqy3ROTAM+sfxzTNJrW/FRwE9T7Q61/c6p548YeiNEOz7wRp4Cyy+ivhmYeXMN90O4wbqxKRL62cPITM7W+1/AYunX/voReqDeVAvvockKGit58qUGx+ew2R8Ej0gcjOlU5ytY9kLCLRDKL+Wwyya5Ul+WxKm4ZsnMNT+yeYTTh5fQNid16/58fX2uYwir9mscNWYWZ+k2iaS7VPIBqpTDJ1YtG1t3xyb7hbSmmSBkgVp5VG5+5104D/bNw5IL9cK9t1DxkMqdfxwPwIzrCNZfKA6BAbaIMqEoQmDUimCgjJLvf5PnUjr3Vd5Iu3Qfi7sBz48FXLM6lSRZ47YWvRO0vtygst3gBEq2u6Xy7eM7ZV/5tlXAYQ/T+c2eXxqmH6djLIB2IBAbd1gyBnSoM2HIU1+atNzyzIMxXJEuIjrDt3qIS+UlEUXwoy+xmgiyCZOjHytPTFlqEqBl9Ktn++6mlh0h3n8qM6VKBjuQMl76uYuOKIe0uF6E6M6peYzptCGmYYZg2cUDCimtUfX6ftWxiLZoR+cGrmRqceSeMUTtnqFaQEIwUI1YgUHUvLGFHZriurdhmWYnqXPrP49RhaZYQNarz0SYfJnkBNqX0xsCYNM7Iqch8oyigKDhsdJ1QOislcXgi9ylzBny+R7nL0QEK3xGLpDWAvNtlD+3nWnXmdtxeghbLI9NzPh9OdJFdzoq41I+3sjqabiBgIx41fcd3vXW2cqjxbl+9jpET+7tmMSrKSzOqLq85g4uELdamEoNrYnETJ7xia20g+vfD/7glEFzH5oxUx0t7DlTTT79Y0dTwxm47dbmUqdkDK5JvjZy3AezvZepvQQTnX+xauQLY2fG5Bu9Z4rYqX6i6BZH2HmMFbl1sGzwrgVC5k6pSkUTYeR9wTtgILyJS3ItoPklKRsdKxsnYtic1j4Lq0KVPuqdILnP3hjN6mkYpEInBIzZdlh2zA3zM3P8aRcw9vJ7rd3hgltcvOXIwAZHTkT4gzJpMMee+xk2Amd3bwOUcLMi/QjU/V1RUzUY4Q1rXPi20ZH0ZpfKlmwns3i4SarSxLHQ23d7vVZ3joPdXb79mNanl5Cmh4l2cVLF1iTMsGpYiorKU11sFLhr047hXfjzgNtoY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 356f9776-80fe-4727-12f0-08db5763b401 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 05:49:53.7685 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0OMaZkyalyfBZeK5sZB7sjYpJzO5UCq2m9HEwHXaAgLFWE3Gn173XtPX69sTW4WbKUVdD80QiJdcosOHC+hkZ90NaV9ALflSz9d56Zy90l37abNl2sJ8g/+Wu+MHL78y X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB5984 Message-ID-Hash: QTIPZKCVCPKFVGCX2W2HQD5XB62FXVJ3 X-Message-ID-Hash: QTIPZKCVCPKFVGCX2W2HQD5XB62FXVJ3 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: No driver is using dpcm_playback/capture, let's remove these. Signed-off-by: Kuninori Morimoto Reviewed-by: Amadeusz Sławiński --- include/sound/soc.h | 4 ---- sound/soc/soc-pcm.c | 6 ------ 2 files changed, 10 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 533e553a343f..b98f49037d71 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -729,10 +729,6 @@ struct snd_soc_dai_link { /* This DAI link can route to other DAI links at runtime (Frontend)*/ unsigned int dynamic:1; - /* DPCM capture and Playback support */ - unsigned int dpcm_capture:1; - unsigned int dpcm_playback:1; - /* DPCM used FE & BE merged format */ unsigned int dpcm_merged_format:1; /* DPCM used FE & BE merged channel */ diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index f47ddf660c57..910780ca5565 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2757,12 +2757,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, cpu_playback = SNDRV_PCM_STREAM_CAPTURE; } - /* REMOVE ME */ - if (dai_link->dpcm_playback && !dai_link->dpcm_capture) - dai_link->playback_only = 1; - if (!dai_link->dpcm_playback && dai_link->dpcm_capture) - dai_link->capture_only = 1; - for_each_rtd_cpu_dais(rtd, i, cpu_dai) { codec_dai = asoc_rtd_to_codec(rtd, i); /* get paired codec */