From patchwork Mon May 29 01:02:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257965 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 655BBC7EE23 for ; Mon, 29 May 2023 01:04:31 +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 0F51382A; Mon, 29 May 2023 03:03:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0F51382A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322269; bh=X3jrfTcX9sZ0mJfA334R2cRnau6nF+rMqe41lrrJZG4=; 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=iRdGhY5ztpm8M4yb1BRmQA60vEBGk4pK7dYPGw+AdZbFE/q1eZWHwjJuq0mkW50AL RlNomCFlqircL4N9fX8z8Y2IXYKL7nImoCsUfMXZhaWNYLBbc8C/q46aKKYqxrj627 Xp4nz809WGG+8REiaAdmpVerhvzAha0QzsrhjaH4= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E0D15F80551; Mon, 29 May 2023 03:03:07 +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 62B25F8055B; Mon, 29 May 2023 03:03:07 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3DC0AF8055B; Mon, 29 May 2023 03:03:03 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20704.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::704]) (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 5292FF80557 for ; Mon, 29 May 2023 03:02:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5292FF80557 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=SiHK8QQZ ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jC8zu8d9KxkKMslcL0D7vgc/xJqznHabZu1vMC7QbRfhEA2gFCKmEtwpbdNElgEDSq22twNUbZYZe3EQrGF9xQLB/FlGbzxvDKW2wTk/9tc++6TbAto2sQMllMwZLuqjTZ0yyuO8Hh2i60MTyVc5wnOf5ZaUicqyNDBc6fup8bI3yxHcz2FcY6HpacLuJP7ni5I47dvWNMyVcwhZeC3adk7YyatQgb0SWCkRCnc+NCQdGK2qHfIdn7UV+Y9NgAJpI9cyq7bYboqFEaVddScdWvSucPiLg5q5PhcLiJzCaoNDYmsTb923hiCaau6zTfbvgRtTwUxlnod/a9Gg7ODiLw== 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=DcGT3aG4jCHW0zmifrgnFgdO6mu9JHx+TpmKcWKAM7A=; b=k0tlHjDtTyxds1q6p1l+m0P1Uvbdhuu+AfMID40pU10U3OkU3RU8eKZ1y8K23SAzHnC1l1LcbwtT64KCzO3sHVKjW4UxYG6h01ttxFRTKmjgLCiGl71ikPCrM6Y56jUSOMiXAjoU4yjEsIhYO0mfFPdKa0vUx/JHwzg7hASVVpVRoNlN70baKtqdKVDj52NQznvhvPLTS9VMcQlHQb6jh3anC75x80fYja96Tn1iYyo6tihPOSt2ze7oaL4rGi8qx5XgzUk2JZsrBqs7AR11XMNXkZKDprpfvx3Eb0Zr6GN61kB6X9kd75YVRC11RynAWuiRxXk2OZAFOh84L/D6WA== 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=DcGT3aG4jCHW0zmifrgnFgdO6mu9JHx+TpmKcWKAM7A=; b=SiHK8QQZuXX+kyOQ0rnzdatK0jLh1zsG+nNJJ71qnhy0JU3A1ACXJ5LfDuiLiwb/4WuN/6jvTU7VScNm1fywkxoR3XoriJZe10ucQ+KEmhsQD2avQ6L2iksRDDscvhc7jMFIqVNZN5a1Dk9HBWSmwFLLYVV2ON+mDlo3dWJpYC4= 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 TYCPR01MB11557.jpnprd01.prod.outlook.com (2603:1096:400:37d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:02:51 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:02:51 +0000 Message-ID: <87mt1olzk4.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 01/21] 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: Mon, 29 May 2023 01:02:51 +0000 X-ClientProxiedBy: TYBP286CA0010.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:ce::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_|TYCPR01MB11557:EE_ X-MS-Office365-Filtering-Correlation-Id: 18dd987a-46a9-4cc7-b3f5-08db5fe06d7a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2iOFRiLqeJdJEcBtAU876gd09x8wbqwEVuQDAkjwHz/SDTdz5xbhGiUxjHOUIWwZCLY1Tbow8TZcta3u9STBcUXhn1elKIC6P6azrHwtke7FwE6cdknB9IAbIQ2bwJ+9NN6f8ZoUbE/cBtnXUQtmhuQC90p0NSk1jCurugCgE3rmO+HevteCkbl1GIVR+y9AD/6t6s6lO8smltHCVW9L56PWFBhtaPS3TUDA0ER5VhhfXyLvD7H9rAmV7IR9DaSjOXx7WHRdYBa+tM6IAv/TrO2AD9EL3MLVk71XtX1AfnCmh/qJZmQiGwmeuKa554p3f/hXsy0zu9TKGAd0iurJySnOWwjEZVegxcA8TnPSI6gYsgJKuuzcvpHHymvUTkRmeD68HFWLLpsKnespHrZe4C/U45mSOGlJCu4nwdSJnZn0ird8gbkP15vRVKPZwLC7LStwXZuFxNQ8nWT8aQfxCa9AzRypSdPBRsU9AaYDaVUdbBQ1WqIqju9D7uyzHT229JVU8AM1KHqgKA4Blb3VmaU0msr7TaMZw4HinzVRWQGx4HzFlijRRemWWlXno7hNLVdhq75yO0JAu4B0pp1Kd3Ab8hDodPcVX0s3lATF423KZwic7jAxbcj7E4zjVCtc 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)(366004)(346002)(39860400002)(396003)(376002)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(66574015)(2616005)(38100700002)(41300700001)(6486002)(52116002)(86362001)(316002)(66946007)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-2?q?Pc1wtIcFeD8OtQ1WKIOoPmY?= =?iso-8859-2?q?02DGi/IbmE2WRoZFDL1h3jkPpz3yNcJLnPwOh+2+MChwf11K/oiaQcqri2DS?= =?iso-8859-2?q?HR8a9A2OtZE2t4n8BHn2jx0S54dhkmYifwvz2RAx5Jbko4z39AP8A8J3T/wR?= =?iso-8859-2?q?BvxlpBNsoZuRI1Umv9uiYS4ow7QyZ+kW6FRCbFMFhQ924J0rMgwLkTMiTQo9?= =?iso-8859-2?q?vz/KKyKdqpxqCSdC3f6uMFxgDbhUraaYYvVZq4Tj3AJSNaP6S73dab01hq/A?= =?iso-8859-2?q?0yOjK805qoKnlJEyJ7tTHXdhf/lna+8b3+kszsmLzs0QnA7tdTGoquvMEXzw?= =?iso-8859-2?q?9UJ+nJDkF/T55Hl6Q7NIKP8SWf+AcjE88aF0cX/pNzA/Yn++JeUQS9znrbfC?= =?iso-8859-2?q?k8+CvXn9vKRxlrp9IULu2xJ8yB4+a0SEykCDkOp7urTviSPigq2XJYDkfp1l?= =?iso-8859-2?q?SdA+9w46R3ptB4i2Idf3D9JTv7RECCpliv7tyE5L8Pc7swSbY0ml+JiITz4z?= =?iso-8859-2?q?RmWVvOL/3Up3br4LamV52bL6rHuismc7J4g5G78SnX7j3ahlpMpqF2HkVuAO?= =?iso-8859-2?q?Gs8NGWoJ6gVUoGWopli4jjxkeUThn3KcAdgmO85etY/FhbqRDK7Z1NaRY8gw?= =?iso-8859-2?q?N38IQWJKI9E4lCFwzfvoPzDXyorDgsxggEXVzEmvyyV4MltuSsfPtzub7Gmb?= =?iso-8859-2?q?t8zzfbxnAlxCqVVp+2Zi0x81SsymhWv2EV8Cj6/wTxvaPjhrA/dfBS8oBoxN?= =?iso-8859-2?q?wHG5P9h/knVutWPptnyy4RMxUnnZzEYMOUwzVB47HzLc/faTH8mQkIhTDtfc?= =?iso-8859-2?q?cy1zXCYhwbUxHSZcpZkEMd3WVG363UYtbYREVvyl/AKxQ5tP/ZakslSct6WQ?= =?iso-8859-2?q?FQOkuTFVeBtdQIOoxMCM711nPmV0se5m0rBJAKzg/QydDFKbnDZxAXQdk2TZ?= =?iso-8859-2?q?GeaxG1S6YjgtcvDGk9qnJNL9xkhKhuHxaGrv6GgJA3O9TWFSISrY6ZquHAjS?= =?iso-8859-2?q?6eFrUbTOMH3VM9syo9uue3U2iV4sw4iPYGqA7NwRG13f4+1wXSEI1NfN2kao?= =?iso-8859-2?q?b1wiMkrXopu7UBbsLQGx67NYwvfeaTDl6iz/tB8+AuRA8+G9QKqZWrR1al7k?= =?iso-8859-2?q?gKKAok5jp+ZnZGCNFuF4tryqiWwLcp4E0JqbxTILQqMSNahqe0fgeLdUDsXt?= =?iso-8859-2?q?59IG4LQjwG6hKqCF4RfFmsipNDEQ3LjGhpGaDVZxx2RXiL457WMr0wKT/t22?= =?iso-8859-2?q?YmktZ3OKbhJp43CqtcFM/VTP8h8q//CZLIz4n7u+UgJW6XqJnd1UVSKIL0S6?= =?iso-8859-2?q?izpltTjsnswQUIi7Q5OD5FhlADSZ+re7smaUx+pfa5tKHiCjxXYXK3wu5BnJ?= =?iso-8859-2?q?hKROHUHB3mg/f8K9RXBjiHM+RkcKNqA+H8soXDpXuQ13kdp/oOuqB0OuIAHA?= =?iso-8859-2?q?B6Kk76Smb8h/Gi1P7PUpjVfFdbUuWuBgWhh2egW7/P71LWE+gcjUCtPdu9Y1?= =?iso-8859-2?q?5KGbpW7jQV/FJ6eMAYv3eeG4M+n3g5brD5t/L+yz5l/cKzMwnwug+IePSaab?= =?iso-8859-2?q?M52tj2aB6hdLZJG7+MGpdX2d8Cd2LXqn3rtNsfEnNLdSSdyp6hB73NRknKaz?= =?iso-8859-2?q?gE0kURta2lYIAK8gb+r+YytAzn2Zd3UHNzPwpotQiTnsG5opK5K0Z/axd6L4?= =?iso-8859-2?q?=3D?= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18dd987a-46a9-4cc7-b3f5-08db5fe06d7a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:02:51.8336 (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: F3uQEh1syS9puSZXSzGTpu+vpSw6Si5AL0lF5IivmS2qbflLmB1nSZCcxfwmN/qwq73nw8XKvFCJftTXckZf2fZFT2EWoJ1dCGjfxfBw1jLw/QHkc9Suj009KEQZIs49 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11557 Message-ID-Hash: COYXSAS7EF64KUTL7EWMAJL7GOHTC45D X-Message-ID-Hash: COYXSAS7EF64KUTL7EWMAJL7GOHTC45D 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 Reviewed-by: Amadeusz Sławiński --- 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 Mon May 29 01:02:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257966 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 53301C7EE23 for ; Mon, 29 May 2023 01:04:38 +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 06CFE3E; Mon, 29 May 2023 03:03:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 06CFE3E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322275; bh=TvTYotcr4ZOu144Ecmw/NtiyUw1IkWxrJ0GVFOaUoro=; 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=QRhpOJqDxHce+Shvmro4zqdIC0If+rXqXnNS+sMVmOA+96/S6oXfe3Seg+JGTckfR kWZGae+CfFqwGSNCl3LptqQ1M8jf4vVdklvmeM+GTOc3ey9V1LW7mYqpW3OQWOm6NC 4Q92q+IlN11j357TF3SVZSfpxIFVyiukdGipGfzQ= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6EBA2F8057B; Mon, 29 May 2023 03:03:11 +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 DC34FF80578; Mon, 29 May 2023 03:03:10 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 66D2CF8055B; Mon, 29 May 2023 03:03:06 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20704.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::704]) (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 4D77EF80551 for ; Mon, 29 May 2023 03:03:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4D77EF80551 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=NzPb6hHz ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AdqWYIkN1kWBY0rPWOreVx+FKz0o72WnpAHBdjQQ9O+skgZngtQ1iPSj1Q69AYSAyY9nBlI/v5314+Y+VwwCnIahlHZL/tQLMe2MpeC79/doaC08Tj4WXZCgGk9QwbNxomowIdAbUmgbi6klSTJMO4ddb3yAKqeXp74vzh8TvkFNRxMZGLyuPIua+XULjDt7yCKp8ugjdkMi8tn4xjpoT5+FcONPXLwJpMn6SQADdOeY/oi4049oTmhZOGNGm+bEmIznDXkziiI/BrTETJA6kVnvIOiuL7kF+Pe5mHx4+TTGk2LCFNK3foNAsS5cIzVxnY5irgNe9AEvimv2GSEFiw== 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=tbeDTQB35tZm8Y9PzzEs450v5znSklXmzYkAjOadlco=; b=nByqQ7GY9uFIMKqdA2nerrGM2i7TSxBc0TktSCtD6mVcCdIt9C3BUzwq9EEh8GAjjS+C6RUXbWDCek+5yodAakngJ7N4NCbbsTeB4iE4Zgpt/Mnn3hvcihu1S2FdSNRQW3AWgXBSiunoBi4Lst9wiyGxycFBQlg1lzEQbVkoYKVM+0KrIi5ixkuQjsG0FSlREr8ZbiiI+QXxmVUuNV68Zm6I+Zbo6TU9S0/NxiLfLNS5eHoiF7CPlBnmT9ge7MacWYdYON7GchAr6FR6+mJ53bN0fC3zPT6/qDwLhQ4nsl+S16ItdpGa2MFy05DgnXO9HtC3QY279e8S3tY7vzOkcw== 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=tbeDTQB35tZm8Y9PzzEs450v5znSklXmzYkAjOadlco=; b=NzPb6hHzngS+H+Y077tVyax4qEwG4D1in+Qm5jmyeXyWQ8noM138zQO8TsJLlVrrWkNC1sbfoiAYFgh9VKuYzeNqTQOBmaSntekXIHXaQZSOAYkFtgWkpFR9wcLhBPuy3EXV0sylcWK3C1+qxx5B4yHKRkXPVu39ycFgfj3/T6I= 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 TYCPR01MB11557.jpnprd01.prod.outlook.com (2603:1096:400:37d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:02:59 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:02:59 +0000 Message-ID: <87leh8lzjx.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 02/21] 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: Mon, 29 May 2023 01:02:58 +0000 X-ClientProxiedBy: TY2PR06CA0015.apcprd06.prod.outlook.com (2603:1096:404:42::27) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB11557:EE_ X-MS-Office365-Filtering-Correlation-Id: a8f0373e-3d78-44da-e786-08db5fe071d3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oGV4NPZnvo2MwYqtUJbZE98gIWt3jDGci/k6GustS1tY4YtYUrD0fmX0fNEPqwaexzWVEeVk2eLQoV1QBup7C0n3GKg7Mbkj0slZPVTjuloIiP70pHxIf+sVGB/YcHeucDlgDeApgwV+nlvzqaYB2NVKw41aHYuGIqxKiwkUZL6/5N5q/cTeyTU/HCK21k6TlSRsNhZY0bF7Yl4/rKFrglnn3SvIbuu21SQnvpLHBE7D+idJtvsTkMWO16qKRkV2AondtBOuq8goWdqjubtwvpnTdOGFkFyzw4RN4t+lMuoHXLWsdYvnbbR26702ZhEd/FMZR4qxM0pLex/4o8xvZ2Fl40qbroELLvO1BJVLLoag/JkAVtjOODQIt48xa4e9jDCTnzQYRhrDt7rRpCiub9hBtBYhZwZucuV3KLaynyW7K99bSyEujJN1Quwt862/yoLrR1q7bCd5slzoYzJhtaxTe1MNGtsNu3WL3f5wu8B5mqj71GwS7+eL0SEKjAazg615CFAF/zuDK8yHCaU2MBT9Q2SunAbhAsHiCNnPxmbGg1HwNGiDe8PlsQdxfOVVAx+IQ+YuuCkXjBag8o+9z6XvmdYZM79HmMpe8nbORQTk/8sZ+IR4uTGC4H5X5iNp5VNfXFAT7fOXMDSZP6fLeA== 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)(366004)(346002)(39860400002)(396003)(376002)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(41300700001)(6486002)(52116002)(86362001)(316002)(66946007)(36756003)(66476007)(66556008)(4326008)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-2?q?la2xZtoTOSqq1FOTYBltWpc?= =?iso-8859-2?q?qEZwlGp+ZDeqYqcDopdrXc32jIj1UtZ5y6eeolwwU0sRKNQmPCut3EFLBUi3?= =?iso-8859-2?q?N7jQ+mPvsN3NAhPig+fbIESxh3U9trEuXMQP08PJZ4pktm3RuoJrUvvrvkj2?= =?iso-8859-2?q?kZd0l2bBYHZBvaNY/Kw0RGpor9/KgC3ENUPbX1STjCs4an4rZ7gwmSUlBTxm?= =?iso-8859-2?q?ktSe5Q2P8t+n/cG/+ylomMhzFKRwJBToq6rmF/vMGTB7gl7ymzGjfDxNWvuT?= =?iso-8859-2?q?egOYhahg8IvKzyslY3yr+hxGw4psdXB5xarz2g4z30RCney5O9BMXgX1Evsx?= =?iso-8859-2?q?WDjNPabxCdp17rXthe/Jdu8WCCp+J/hMlhtBkwupw51cpaHIp2wimXQXpogM?= =?iso-8859-2?q?pr5FgIYikv2p1P0DJsGl0RWINlhAGzLahl/cxbYgKSFd4fZ+e0eK5x4xQtkY?= =?iso-8859-2?q?Ow1hD9ozY8BaG3cEIqDn/JTlsK460mJPOj9iCt6B5MDRcHkoVhdkTXELYoHq?= =?iso-8859-2?q?CpDiTCqxVmgduL50rt/FzqoInAA2sxOj9xYn9s7EJlaHjioj2ZMt//xd4zqL?= =?iso-8859-2?q?+5rieIRwOZEzLzpOdKlOs8DK5ajjZGHcIJvWEern9aQgx+yiORVv+RHAjzAX?= =?iso-8859-2?q?CwxfWMsz/K9C8cdO8THeUW9PYGQlLHZ/HxXD0z28U+/MmK5qN5iTb8niWW1d?= =?iso-8859-2?q?gSppQUUNx6E5e+WEEeJH/rbMxp2hLSGedmepdYJgh2mO2UCwaEE17q+IU4BZ?= =?iso-8859-2?q?yy+/h5Q902YwOheuvqOdc6xfYmUsuPtGep+Pms4NK6THFZHRTuU0CVfFZHxO?= =?iso-8859-2?q?dub+jEFR4pxMbC18y4XmaWbOUlxCjKsaA1Upzz76eRVzCj60ivMv6YBJLlW3?= =?iso-8859-2?q?gqVqRGqthz7VIYNKrJOYKp3G9F2YqcpIEAbJuRjrmia+KL9p7ctUTSBFhsAB?= =?iso-8859-2?q?Kk1SfvvC9SC5BdMidtwmnAcOEUc13Uh3HNTrwbURSWTkpI7d7jB+DLNh3aLG?= =?iso-8859-2?q?pHzFtNmTARz2uqZlGEtN5I5ZVQbZVFqOtlLSQ/mkb5UOOALDdEeWvDTv5s9H?= =?iso-8859-2?q?WIZP3gTAoCel+xguL5VvfhR07MLgOyFXmCNGHjfV+JZVKsO05Lyy6BAnvC/V?= =?iso-8859-2?q?NIjvKss6/ADrF0J/MGiU7nqZQUPjGKJdNERtQG6B2E39241nIIjNfSze3/HV?= =?iso-8859-2?q?lzTmb4QT3puI9tC0+81hb9lhjJ7Sptz2eJqHxPA0GGrrka7bb79wWTrmkhxg?= =?iso-8859-2?q?l0OBs/3UdCyr76IJgBaZpxjgdrCUEftTByHnRz4TqT8ZyGg8Aci+VQvTHQ0W?= =?iso-8859-2?q?ezAni3EvpvYhBHh5vMzB0ZjQ48h6DQIRvHMHae6FD7FzP4sv3qR9EGJ5/tT6?= =?iso-8859-2?q?1lmyYdXU7flchS7wkLU60bnU1C7BxgfAXwvZ0iOuh/LEzFfuALDDVv2lF2v/?= =?iso-8859-2?q?iB1Q8pgHoAu0IyU8wTSk5ZK6hRDj4dtWz3LYbs+unEam8cUujFEby0tDFdFx?= =?iso-8859-2?q?a5isStb3lNIYJ/xdvQpKm6dmDbnGwwTbgOWSugd1O5/xS/pQTkQRBsSN2S1x?= =?iso-8859-2?q?IcR3V6C8BQfK5A9FTDIwL6KfOLGLwDtHuViWx83v7ITxlAE/xUE5Y4Ts8SD7?= =?iso-8859-2?q?/EjsBOzc+lTwDIrgGwmlalHvnON1Z7FaooKblxt3+QdklIln0ExOh3Q4+7Xk?= =?iso-8859-2?q?=3D?= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8f0373e-3d78-44da-e786-08db5fe071d3 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:02:59.0890 (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: 3/1MiVPlTVfzeRMQKlfmY7TQoeqetrshbIH1QMbkVg4SptTsRw9mswfQ/SLgAwvBoVKZ0FDUiOgPC5hgqYa6kuDf5iK1FcgAv45/iGqclcdpBxrZu4sguMeb2x3y2fdE X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11557 Message-ID-Hash: A7ZMGISXXGOMKXV5EYYFJG4RKTQAFP3C X-Message-ID-Hash: A7ZMGISXXGOMKXV5EYYFJG4RKTQAFP3C 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 Mon May 29 01:03:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257967 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 16504C7EE23 for ; Mon, 29 May 2023 01:04:55 +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 22C983E8; Mon, 29 May 2023 03:04:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 22C983E8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322293; bh=jVO+YGsbwRnAzy9jREUYpNMZuswwebg6ihl8fGfpDtQ=; 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=fuyOLQlBqhw+4weQgpjQP+DlQqMn5euhZDGga+e2VqNZyAgoMkZ2yoyM6IiealoVs FuuDqjx9Fx2zl9XQEQ/LK2BdB+lu3OR5rOgx6lZ8nqXbyW/EgVRsbb/NxVxvrNtDRz tDkUvxzSsY7s0LyggJiDHqxOZnQ3ZuKnKjPZEkFs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 60847F8057F; Mon, 29 May 2023 03:03:20 +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 5508BF80580; Mon, 29 May 2023 03:03:19 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9615AF80580; Mon, 29 May 2023 03:03:15 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20717.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::717]) (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 6BBDAF80579 for ; Mon, 29 May 2023 03:03:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6BBDAF80579 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=GzK70zXE ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ESP1F2QSCyJ1lFoCQwkiUVHDYC4pzm5p/abMx34+z39vqFROsoayCNPXOSmVbK2Qig0KwcXsSdZZMFWYvKbgoIFwWVCPj9jmQJm0w+cjtGNCJytzpgRC00Yp/t+P5hIHHEA76Oa8RVs/oL9qnYVVciLIg4RAOZvCQ9haAJl+p3o1SzcglHJIrUUY/504AaxsIVh+B1dLBGxljY4hiz93DTxZVPjFULYmGi0QehRoDsb8TY/6daz7SDzJK3Un0IYl09LXmoXc6Iea+PYvAzkRnAdwTLdeWmjEiignjosRXvkBF0kkSdp/MlF5SP6JCyq4kFriEaq7HY7x3BZ/Q0JVhg== 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=kmQ6mb3JrwoxbGRKGzZ43ikrzMM7iiARHn29Pvf66OE=; b=dKgYEmLCuDlWuqzRfRLx0nwmm6+rNugDWIX57ke5iOIIsx3d2Jeidnbm+S3RBqWX3RlwyxkGT4ckF/77M1HdT+XDl8USJHA8vNfuCCncJfCpgN1JjAP126mvFkrKjw8ouz1JfF7UDK914wKCdynUXkoOOrRblvKUVJj8B449IJddkobmti6YjkJT95evXmMfZ0Z1D7K1Evw4XUF6LmXRg/6PwU8uu4FE4KrpeM/a70060vbmiCeyJh3kqgJAct6+aFjfWf1J3rHqb7gqHueLHB1P1hQrXw9HToMz6T790MYoDmsWbh/qlfz4EyhUedZpL04c4AuJHBQ5yu4UyhwNKw== 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=kmQ6mb3JrwoxbGRKGzZ43ikrzMM7iiARHn29Pvf66OE=; b=GzK70zXEKUB85QDT7zrltUnJmea4QTPpttRC7ejc13Krlb/npJzjq4pP7RBbP9DXWHBS+WOrN8WwL+bqF60dhOGxZcBo8t1GulBNeX0ZRBPz5zWHO0ygqpFmNRtryK8fIBUKBmpAZU/Agdz85wyeFA8vI8nGvGBi78slVopmNRI= 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 TYCPR01MB8658.jpnprd01.prod.outlook.com (2603:1096:400:15e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:03:06 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:03:06 +0000 Message-ID: <87jzwslzjq.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 03/21] ASoC: soc-pcm.c: cleanup soc_get_playback_capture() error User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 29 May 2023 01:03:05 +0000 X-ClientProxiedBy: TYCP286CA0222.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::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_|TYCPR01MB8658:EE_ X-MS-Office365-Filtering-Correlation-Id: 0ecce9f6-59c0-4f7e-60fa-08db5fe07609 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r8zsI46HwiGfTWi1Z9STH5mOg01BWuYzUzmEIR95DbzD8dXnd8XxVdztI5mE38bla74cDWZjtDmj7uPxKHaaZtn2UNBeOddJ1JYatR9X1qdRnh/6gQ1CMiyF8xXRIjzT2wnHXM1jUYuVg8B3ZlNhkv8RDDeNaqXlkWkw9CPd0oLzQBlWDaRLQlmGtoDJpcOAa21wKO3GZlYOFCFKN6NRtLaqnnhq7h7UzUpqqSo8BKUxYARMrkZA3VItKxYwgx6SrXVf1Bmqx3fED4m/C5cd5LT2jvsmfBgPdzsDv2qtmTHMJs/jjPSU3bmCxcu9AZhNET5i2UGrJbJWtWHG6m/ojyM76S9pzFYeehz4cH2ATK7uY2WKPrxXKPkNPkemDZtlV/Nyb2uZJK1GaBdNeiKT/yMy+J/VTx4YYDywy/piWf4Pss2pcjxK/JQdTILAk9+05JiBpmsKl4anL0aX5eOflqOvPCQfRy20gqK5ygfmXkxh6/IVFigxVBMWpsXlYUDfQmiQkPhhyktXmAXP4mAJLV2gUNxoT7L5Ms0lmJbpPKkKJeK06BU1kgPa3fu1fDAY+liDNHrAH3MVnrJXZfFGPQWaGfIN7zLZRfTWeUvrba/XolD+08LeO0GpMl2JkGRd 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)(136003)(39860400002)(346002)(376002)(396003)(451199021)(26005)(38350700002)(38100700002)(41300700001)(52116002)(6486002)(83380400001)(186003)(6512007)(6506007)(2616005)(478600001)(110136005)(66946007)(66556008)(66476007)(4326008)(316002)(2906002)(5660300002)(8676002)(8936002)(86362001)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-2?q?eHPq4O7X5oHAhXI6ngGlZgU?= =?iso-8859-2?q?tcNr3kYvzM8k9zhZ0d44Oa73q5zZqsrPCD0OzV3R5qRnD6vNdV42ogQSAfCz?= =?iso-8859-2?q?OOojSuJ885QK+p3hOhKVfONAkvmUM6HerMRQBweFSjI0qtb17xMekxLwlKds?= =?iso-8859-2?q?amZG9nw3ZyuNyy1JtvMzKkESV6+HMByZy/6amHZVxn4FFs0W6Q+1CNZPzHOD?= =?iso-8859-2?q?4zjLGkGIjDYZ16y3uauILq6/Fg00GRTWit/es9Cw3P5sJIADb6U7pN31MkkQ?= =?iso-8859-2?q?fzM8gRTP3BFgr2F+3WMF7E8FCFRP9KzoWthHoemKjeU/WtPkMADTeZgj9pZh?= =?iso-8859-2?q?5AWw4h/4i5WNnNvTwQrMtkm1mcNdjVMHWEBzCmECqu66yxpzaTQ1JqnnkEHY?= =?iso-8859-2?q?PT6ursYbsz9+/OBzG6GwXSkJyjHp4dqRcllVbocMc2o0k7XKALHXlBEJ7Naq?= =?iso-8859-2?q?h2l1WiqvBkV2/03ZORo4Mbc0POCyPgLYtKd8cGQ/yV8/SrUI6f6YMGl55vFf?= =?iso-8859-2?q?FXzrB4BQi4AaBwSEI8weLlDqxHH8XiB2mLFieiwRflrY25Nqit+1DdTp7OAq?= =?iso-8859-2?q?POljeCnmBzMYHIefiGxxy9ApCjB5ZMjWPu3xJib3LvWIj1n4JEtnlIvdvtqp?= =?iso-8859-2?q?Vmk6VZl7Gle2plcdq15bcVSE6ZvFdlJCDDHpsq+feDJBKzWxLfn4viNsC40X?= =?iso-8859-2?q?8hYMiWNCO7uzAF8t9qqxwxAXx/ggiFEQPi/YWNs9r5zLZNA6hYgjsljFGzAh?= =?iso-8859-2?q?15HhqBVPIFkD/HwsmI80ZCxO+wck2c1tFEORCWZFgzdoUOI+eQWj2VK2tiUK?= =?iso-8859-2?q?hbievO4prFqAbgHMm6umFLHHVa8ga8Wn426B08qvcJaol73MIC3JX4xRiJaf?= =?iso-8859-2?q?+/W13pv+onb2YZ+xeYYP+a8MV+Xv8521txnNoBt5zmZ3+d8oQCjE0ls1GY9i?= =?iso-8859-2?q?QpY9gTTtZLCBfl7K3nQWUEMzlRTa1N+J1BrVj0cEC8wZjLXP0BdCFkD0fPOz?= =?iso-8859-2?q?h4UbN8DDQJswk6sQj4iph4YmCnHR4Mf1TLLbx/VZbGTGnjMHYQkFwuE44HRQ?= =?iso-8859-2?q?HhdEBCQD9C0wZfz6s2vmvnA9SMZbu+JxUaOI8eN0agxR4p5b0Wwah2tsBnQV?= =?iso-8859-2?q?gA3lYbbUTBTPPcHYettVxoe2Ty6in+KRuGgG/FZD5pV/92liEuZH9SDyhRY9?= =?iso-8859-2?q?Y2N6qr9kuhXW8dfrDANt/toLFFg1Ysm6zcnEOjgszZYlYP3fncKBCVkl9WaR?= =?iso-8859-2?q?JJrKegH9N9agh1XWyet9sHjXdmXgW4WEur5JIow6cwP9g2lhsceARLtHH4OA?= =?iso-8859-2?q?XC+1IiFIS3duODuvqT+/9ifpMHYJJ8llHJvs7D6UGiFz801Fn4irhC7dRlCG?= =?iso-8859-2?q?kWCfPZcNi2ZbZq2etBTenYsG1aS2aJYcrilQtqtd7yp1NFv+bfvpqmcgkDAl?= =?iso-8859-2?q?o1E2ef+/Wy0lOOA+zckSvqnGiNO2mtyjujsocOvc5JNxJEdMTjCoMGW1sWrb?= =?iso-8859-2?q?x0a7TLH+XzTmdBSx2ed+sinwX/33ppQwe2ZFGSTPEvrL65Vk0wV/ceBOb7t5?= =?iso-8859-2?q?QQw3A7I3oTLKPU6HWyDqDAxyizrVeFGXO9proZ2M1vNSjmI7qwSwij3XYSwc?= =?iso-8859-2?q?Y92FXqJdNvoWoEJN+1fiqnPSNUA1V3IsuDMUF24DBlKCtojGDvtgRjiSjZLM?= =?iso-8859-2?q?=3D?= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ecce9f6-59c0-4f7e-60fa-08db5fe07609 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:03:06.1578 (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: OdhnIRxoJ+CxIqfDuAsZ3oIQWf9Z3rWPWnaKWUAHmpOdcU3YVWoMIigo1nAPslzLtwAGs60TCjNnmj7bFpfpGSovEVZJIegT19N1wf2IH71DUwbCp53HfPyatZ21wShu X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB8658 Message-ID-Hash: 6VKXX5YLGSNZP5JJTA4SQF5JIG4Z56UC X-Message-ID-Hash: 6VKXX5YLGSNZP5JJTA4SQF5JIG4Z56UC 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 Reviewed-by: Amadeusz Sławiński --- 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 Mon May 29 01:03:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257968 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 E513CC77B7E for ; Mon, 29 May 2023 01:05:21 +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 D6EB083B; Mon, 29 May 2023 03:04:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D6EB083B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322320; bh=ZuNMos54AIJNlqmD0jq22TXyOPV/7yJ53PYTpNN2gro=; 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=GS6urPrGR54kUzlgVpZHdDr7atdUT8GLiWlk/Gxza4RAo59ngDwM7feseCHCoC2yQ n/yJd7/hAKJE2o7ir2qtskoOGs/BGkZstg7fXQxsPa7kbeepcqmh4dlHGZoVReG3BZ EJuAoMTm8d1AfGfz3OtlzemOBnVf1gwLG/yD8eHo= Received: by alsa1.perex.cz (Postfix, from userid 50401) id BA7A6F805B5; Mon, 29 May 2023 03:03: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 2B796F805AF; Mon, 29 May 2023 03:03:28 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C827FF805B0; Mon, 29 May 2023 03:03:23 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20703.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::703]) (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 06486F8058C for ; Mon, 29 May 2023 03:03:20 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 06486F8058C 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=RCFnT7Mk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SZ5cfXu5H7VYQqM614DU5rhc4g2vBR5rmMZMKZys20kqBDjIZQ9taBVW6pjjHoDsiIUspAjg6n8Tdv9hz+NfcnlEctpHMNrz1Ci05l7zg/tEQDAozkq5FsV8pqg/CIB8fC625kYxuqPAcLXWrXp6f+hZxvxqG5Nc2lszHXIqG9Qe04rKr7okBuK9l6ge9MbU2mPLYhd468hpFXh01oPeRXH0GSvjXD2hrDJrZHY7rngr8yJQI+XTLocI/yMTXDE9S5ZO/2ciOzlyByLj5U37gJWd3F/hJdgvmgO1ihqyNqs68HfHgT3gyipbfVem6UQof0/h87Lpdp2xDfcIxBW3kA== 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=+oOkqhKbkTL/3SiEEeyds8HkZVDM28kI07WMjcz5kLc=; b=ay4uX9OiBH3lDZyhoHkx+Q9aCpAbua1gSTTySCeKU63NmjE6mVBQ2WIEDDS9gQZm3siIVSABU/nU08TfeZ3RZ1iNaosrLw7F/5Fs90NkBpSeD7powIo4a6fHT2MDNdKQs9t8gxpEvDwoqUonQiFGUvW7bKOjJ3kEXMQRlJ4VHvbZAcbZh6Y02nbUb9l9T7N1sPN7lwOciHdW3izb1eVVFv5De8wlW0bmFA6tEXRyMfTF85ROJeeJO5BrCcllTeI4uz+SxGBxUb2jm6xgvqyGOZMC78t7P1NGnQ1n7J+lGZkrQUKQoE7/n+mzGVB9QWQJtn+9L2prDJ2VKQfChOjdIg== 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=+oOkqhKbkTL/3SiEEeyds8HkZVDM28kI07WMjcz5kLc=; b=RCFnT7MkhDCTYS4vqvcf2q79a4iDPYad49/zb9gL8V1lCDt89n1LgcsZHtfARmQwEg+JWLX0WUzYw8cg4fWuHjWMbPus1T6InMeeEP6hfPj3Ukt80tCvOsDsN2pzkog13qliN1iI8g3UeEC1pJXpgZeUV+zrz23ZtFE1d08X2wQ= 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 TYCPR01MB8658.jpnprd01.prod.outlook.com (2603:1096:400:15e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:03:14 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:03:14 +0000 Message-ID: <87ilcclzjh.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 04/21] 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: Mon, 29 May 2023 01:03:14 +0000 X-ClientProxiedBy: TYWPR01CA0016.jpnprd01.prod.outlook.com (2603:1096:400:a9::21) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB8658:EE_ X-MS-Office365-Filtering-Correlation-Id: 35fe0a33-e22b-44e9-68f5-08db5fe07b34 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ly72blHgvg/6i5LLxRqRNaHDDfI/qUEzkVkSPHJ+OaV2xiaI5fTB57P7FD8eJW4fMyAvlW7pOHch7EYWCzCnKwCTVaz7J24NfcFjqQPTWN9ESZQa8eKtNcmUC4AjWjK8HwC/pjZ20Q9AU0/WjIdsbW0VzcjsgNILhPPyQLvcCjPWqIN2fz8/1IajkLqFhWs6e6NapmeTuk/1a1BtJXxja3Mr/29J6sUIFA+RGEkLyPSbV+YnKYQbP14v6NP9i7iX5NkFlKD379mdZ3C96wgkSbOH5+DBelpevmDIW4EOFSdyzG/Og47nAyLmTsANUeuOu6kGeHrHPuuSXhaf5Lov7sKR8H/dQqGzI5i4e1qzTTiXbxGUCHNBoSZPWOnxC0Yt9sfY089rsodQg4nV9wS9NlE9bqLvwEhtOnEiA3E7kCtapD3226N/GaBUc7RnS6SZiWi6AsMLXd3ERdn8dSzocfD3jM9k4MM1mR4M1dcH2NmZQqfy9GgPllxQWh5cbDxxu2/LAfWwZcsI0JCuUYM2CXI/X6WQxt3NM8rLhcAKElWlkntYxGqtVxMDkw+tkA5kJSs/D+5cZk42M+hrwTSkiLwEN4pXx+WJ70vzAHK2cCLYt/CQUgyQcbuZc3qr/CDDmpZGPKv9qGB0Wq/6u2/3/Q== 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)(136003)(39860400002)(346002)(376002)(396003)(451199021)(26005)(38350700002)(38100700002)(41300700001)(52116002)(6486002)(83380400001)(186003)(6512007)(6506007)(2616005)(478600001)(110136005)(66946007)(66556008)(66476007)(4326008)(316002)(2906002)(5660300002)(8676002)(8936002)(86362001)(36756003)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rypZsQTYc9freb2HjGlUXhgRYMdBDbcVwa4bpZ62Wd3U44scb/DQA1nWS+BAgCuehSZx97fYYsHZMdPSRweUQVuuCxeYiXNjYsRI2k1OK4OXwJWOd5s9p/ciDP3BPamz/cwiqlwLV8E5/orjDnCvdiyLjoGzgsb5wLdIMPhNHnpQlGJOvZwVC3Z+MaUeKYib2NhqM72CL8bKWtLqFEo4lY4JYhyGl1si+z/NIAlBBSu3WKrF5fg8mjx1cjNymKSZowCaekNIxe6QDvN95axjIDB2F7Maqo5XqhYP71rJOq4uAD0mChQbnfq02nWDWPCBLmNKjMLnaJV/hO0e7rriWaUKsJcabdN/42LUJp1UQDLpsCEwkniAi/vH+G8TH9GkYu4Nd2yEZ0UH8zr3CQAf49W7LgZW+oFFoSKc9ToLQrAd9lunKg+iutoiQHcDLzzpg/adeyNmSw24cyG2TsQDabmsAef/w4Ivh6kLH1PiJAK7NXMvUDmNiAqNQH8RZmGyNrOZyDCnCBgMqDzdCO/vjUdY2bbGT6qdT4DUScui6W2Yh5bEwVLuyfzPoxS88mokiVLWopXFqr+G1bmL6cbSnIHw5IUVnCaTF11Jg41HxEaBKxLx/ejHuEdzURPJJgd9MiINrPLoenrkb+Pk/wNV4XegNCooeBep21sEuEfUz+dmA/l34W6Ru+jQngDTZcan7VCTJvIqlwzLbhQ1xEBmZ+2bQaCCLX7eqs9n3CUEYOiCFThn0+djGWg9gwdY7AkflHDrsH7pR93K/P82ouxI2PvA4WY3qO+RFRekC6Pl+ZDALqFTA2nikk3QNBA7/vHkcvSQZ3du+PbZV5MqpmCwTpARcNWZGzPNbN5T9uG6PSrR0gO/6sWOQegxu63Jx7KKsHfeGvrS33297Y21Mkjou1MJPlvrPjzEWoQ0CxZRuTkCwnsCoKWdRRxKLffTT8o5n3UutCh0dLvLxZS7CJ5zeQANgdm1anR/xvqOccHPErtzdHof370o75w8Wpeiko3Df+orHRYkhwvyccLb26nZ+1B3qevXkhqP2KdLy/2SrjKCuu11a2YB1GeMwaQojSplF4Vo6MtGgXK3A1OdRSkEpoV6U38KK9sPpw29mx4Uolaf6B0Sn9Ac8lKAkw384nomomuypat9trzLQvIprnmfhSaXnVVas4eQvFnEb0ZQpZt/+sMH28y7RhzPvSvQPvm5BIn6KmIv1uZ2lasi2iuRvwKx+byCTF5yffUWzzdWHVfcMh064CeaStrMfws+zBSYUok3ERkSuE83VU32NunALlMwVhvNgliUhhVLbgeXkbNMazHj+utW6RWioYmeF/vTmKuW7o+Ibxbsy1UuCAwCLdWtdsjrPYLnxEkZAsxJSBSF4pQYT1DuU+IJy5L/RlpVI6begx1QOhkANVI31SG8+j8pI4stGO/KOCXYQpoD7yn2erDIam/s6bVkNCFnQEuCFvz8oCHQmT8q8fsqMt/mLjjnCMmtbIEijmfUkDGoYFOehZMBHNJA19Wy2nXujV/TFa9h9CESKVi9PtySUYyL6eM5zQDGEhzCRgbEZoD0df5+sTODjIRX4jkHmeBo6nw4ys47qGQQg4qbuv5drUe7kOxagG3lMTTXPTs1DW63lrs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35fe0a33-e22b-44e9-68f5-08db5fe07b34 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:03:14.8402 (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: jIT/Z/UhKkF6f6AoZhMWE+ge4Vpb72uhfFPkz2+VnkLHTxjsbDbwmIcsoRJ9ZTyEd0u6Si6foE0gXAu9hwJENux+PIkxAQy+4vLoCobNfHZw7od/0wHVgs+/VlydmNGh X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB8658 Message-ID-Hash: ZPDFS76B3LKTEP4BOGP7BPEI2CE6ZT6J X-Message-ID-Hash: ZPDFS76B3LKTEP4BOGP7BPEI2CE6ZT6J 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..b3d569e7ba61 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 has_playback = 0; + int has_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; + has_playback = 1; break; } } - if (!*playback) { + if (!has_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; + has_capture = 1; break; } } - if (!*capture) { + if (!has_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; + has_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; + has_capture = 1; } } if (dai_link->playback_only) { - *playback = 1; - *capture = 0; + has_playback = 1; + has_capture = 0; } if (dai_link->capture_only) { - *playback = 0; - *capture = 1; + has_playback = 0; + has_capture = 1; } - if (!*playback && !*capture) { + if (!has_playback && !has_capture) { dev_err(rtd->dev, "substream %s has no playback, no capture\n", dai_link->stream_name); return -EINVAL; } + *playback = has_playback; + *capture = has_capture; + return 0; } From patchwork Mon May 29 01:03:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257969 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 1AC25C7EE23 for ; Mon, 29 May 2023 01:05:28 +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 9F6F484B; Mon, 29 May 2023 03:04:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9F6F484B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322325; bh=eXkDvqezi7ERAGj77f83+BFDRaBmKx1vpn1imIQSQqc=; 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=rw7Nnf0XqHx0p00YTJm2Bh8ZoJcrV7gmwN4qRw/kPh6Wf9AB0MwlcRq01lMEU0fjO +84moq0FIp4PsJDsuIUvOxiC29Sa5O981m96wfaumWjHOr5kZiGfnhs+GiKDnk7tUQ HRY40FYpX+2Kjw5vWeQJevYGshG8hMqpH87FGOKg= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 11CE7F805AF; Mon, 29 May 2023 03:03: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 84C7EF805BB; Mon, 29 May 2023 03:03:29 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4DACEF805AF; Mon, 29 May 2023 03:03:25 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20703.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::703]) (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 9A85FF805AC for ; Mon, 29 May 2023 03:03:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9A85FF805AC 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=P/KZqW+N ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kZVYB+LD8FogeG051oPyGJoTwRoiQwED2YDOIiAiAVgIKolZK3FpYN4SQsvVGTqEa0/k0uQCHi1m8D29bbuvOkj66DkqFi8/WSGLfOKR/Mb/XYdp9cJFvYc2P8LQ7eP7hzA/hC9TDKbBMYaxDcz1H7rYlwNk1IML8C7X2BPcdEE4LB83wWX/qth/8pnFCK019t3c22Z8P81+1FVm5arjSMgWZr3Zmb3XNrTzB9PSPlxW6+bvM/mAiGa8CvzhIQI6EhDnuZJ1Wwc9RwPDaLbonOrfwmm2wtc8BvnQiri3/QogDq/eayDa3Lksvu6OikC6wC1sE2YjulSXDZVvoMT5/w== 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=URYLGPDTAxi+1oEIac+j4tw5WMwXWhid+7elBPBpCKA=; b=W/S6GX7RLBgT/Uea01q0xxXOb/IEGA3/1i6Yk5+1qP6s972aWoyMRkgEQJA6In90UwWv0/n6ONPxdR7zxTJ0hgBVlMPUpGC0y5nsZvCSOLGTK6j2uADPFWRuYjP36y7Xs7yzBFk9F8my5IG+N/Ul/zpX41nlkoj5eSlTGl3sZ+OLEThWDDVXT3olBxT5mr4FZ/4RuaRjc+zntqbHRdzO422WKGyzUWqu1abIJV29O4RKjfIPV+fS7k2kylM9uQLER3NqJR4V/D9BwvMgV1imTYuxoL2wrbgtPjFgjJ73o+hFDJ2sEBHefmmMmQMW0drm/TchJOp+KN7ONHV8HWAUZw== 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=URYLGPDTAxi+1oEIac+j4tw5WMwXWhid+7elBPBpCKA=; b=P/KZqW+NoYzsbzGh+XeteRZkqhtRr2RIWRNRHc4y/6pKHSQhghLpsfO6W2g8erPgYBtgUb3FoA22wofDd1CyOZcpYBy2gaLX8HyYYlWqXTnSgsdw2ZoZGi/woVYLJHWrzDubx8qyLumrm5k6hFCUWmhYH0f3XohsINOqXLY3JPY= 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 TYCPR01MB8658.jpnprd01.prod.outlook.com (2603:1096:400:15e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:03:20 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:03:20 +0000 Message-ID: <87h6rwlzjc.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 05/21] 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: Mon, 29 May 2023 01:03:20 +0000 X-ClientProxiedBy: TY2PR0101CA0033.apcprd01.prod.exchangelabs.com (2603:1096:404:8000::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_|TYCPR01MB8658:EE_ X-MS-Office365-Filtering-Correlation-Id: d5b0aec7-13d7-4cb9-974f-08db5fe07e8e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rlHbQuhHKyda6O2YG5Cs+GKdmNRtSfKmJOroFjs76Ajm3JXCofqfKCtJ33BQPpZ2ArWnAzAiFF8Ls6MWSTjw+7BZLmmrj+SeBrIbKeHvdQX3eSgndOecLwloVfHKk+yNjCk68EuWXuhvYNU1DAKUNqD+lr7PEybYn1qIqJVHIc0VccBgixlGoIrhJsIl3meNnSmLqf2HMYm+bLFzfCQnnfxRINMYoQ89GzPtzM2YEcHAYutjc3gziQ6No9drJ89z1/aJdMqLd+1mYgwgoOcVSlgOjXzNDluCPzbkV36rwyjwa7pnynVwvsIR5hNF0BSELXIVm2DxNO33sQs4E2CA7NbZC11GCNHUHx6ZWxKyQ/NwQ+1EQRk+0gohEt1WhH/Rq77eB/GdEyf3WAr9p0qlyryuXCvNI52eG8ez+ueT18AdEovRFzA0IW65LjW8UIEoAUIAnzzLEzsNx98mXA4AztTLDhOxhPkp/tDCP33uSunNEVnF2FM2Nb7B8yFnsbasyjK6scFUNrcRNC75YmdMjb1AVEPAOTuP3l2jUbd/yiGPb3wkiYl+Ap3J/j8lqV67ltmOdqMX6aLvCQ03EjZObAgFr3e27AwsWPYX8tvZbxgTqTAEwF14pdJjvNQHaew9 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)(136003)(39860400002)(346002)(376002)(396003)(451199021)(26005)(38350700002)(38100700002)(41300700001)(52116002)(6486002)(83380400001)(186003)(6512007)(6506007)(2616005)(478600001)(110136005)(66946007)(66556008)(66476007)(4326008)(316002)(2906002)(5660300002)(8676002)(8936002)(86362001)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-2?q?2mbrNZw/Te31FBZkisVmHnx?= =?iso-8859-2?q?PD3zIBKNGp+RNRx4CudipefSDYwfajl2PagQjhctGrkIDMKPOhHeU3cA11nt?= =?iso-8859-2?q?Whr4GcvE3Rk86Kz1J0kU7BR52cVlYJjsdpG7GLjp73coQIRLnsq1O+s+1WCH?= =?iso-8859-2?q?liqtYylfrFjG9YlN5RhQlHvErD7Wq9VSiXEXQZz1dwEhg72c3S3rAlnQvya8?= =?iso-8859-2?q?38CzGA+AEKiasq+Xwjzz3/Vo44i4VVkAV6ZAlCmXTL1JUa2ZQN8RVazCz1bg?= =?iso-8859-2?q?IRojnt46hcOtArHFWxTNL/e0djtKWYw2A4EdcA8jTYzyYSJrj8pQOBSQGT5R?= =?iso-8859-2?q?X5XmdbmXFai2/qzk1J8XRfGbt/Ynq2q+PQuuswmquqTDzxhGm8EtPNW/MlIn?= =?iso-8859-2?q?R/AXCFOvsO/drbuMy1R0T5GJ6ekPRsOPblLVqjhbNB4m/eZ54o2Rn1+w/32m?= =?iso-8859-2?q?EMFZ3hN3Pbbbcerd4PRzHgVvoI351th8wW+YCucOBTnJqsf7LmyXiAar0czD?= =?iso-8859-2?q?VECpWjsFg4iITCyUxJBzqx401HlATFwjjd3pQK4eePo6wuK4owtsiTOXz0IY?= =?iso-8859-2?q?JHYFtnpZCUgQfRzKrLPmEq4XlhFlVGuW1VT/+lra+rPdZUJipIur1c43dISo?= =?iso-8859-2?q?0hVYqOoXJU6TKCWYEP86aizE4/gY8929c5vtFrqA9HEEaRphRQpDPgyTSZQd?= =?iso-8859-2?q?xHV5HHJOsvuQUdiHw/1sIdzwdeivo6F75NAVZmdkWEeh5eohgNEYy2kId8Z0?= =?iso-8859-2?q?2FHQHkpDJ/UuEc+IUtFR1Yh0Gqw8ry3FmTPfXPstO7NvtQ6MksQCgQ04H13S?= =?iso-8859-2?q?nRoJhhHg2d5v6BD+OcBTfZLpbsjla4kMeoBSHuSrSlzTV2TTp6BL3B7ZUKOa?= =?iso-8859-2?q?tAg9z4OOz48rlniGHiStqmN+hins5dBTr8pk5VIMeEEWKNaJbPdpjTLuwLCn?= =?iso-8859-2?q?QZJiFT7hEnl1shPrQVktMt/t2qGAxJOrElX0wfQzqbYhUCvKqL/rmjnDohSp?= =?iso-8859-2?q?aft6G4Ea//SsQ+j4k0OskDtEj19D1LKfkfQ8jsIVAQa9RXBp/EbizFPUk/Ch?= =?iso-8859-2?q?OoqR4V6QsGnTdcbLPwHg+p9MPO5lhBk/Egb4bl0WniJgZMXaazKvAd6YB4Ja?= =?iso-8859-2?q?Ox0z8l1atBkiF40SjeykoPqGz/wbDB2sfp3cQev/JUYKDV2EvpDkJ3goJ+jx?= =?iso-8859-2?q?tDdFf+dHdJHBDzgxYR+X4+m8Qku8bIF+H7+kDWD+jGI6oYOpmCcyb0mFS2Jx?= =?iso-8859-2?q?rv0Dh+JfPX3r9HjMXlX7SRG8Oh78/0KKHHkhl3Z2QtuFmnN02mKjR0V71Q2M?= =?iso-8859-2?q?p9v/HTzHFA33w7ec0A5bCwnDWmvXDW5TGGwQh8XPxWFQxMS6Zzr1by531tE9?= =?iso-8859-2?q?4rvuZaRA8x9UQjNcizRa2SyOTESNlo2DQ0DwNEVFcqBUTzYcCXnXuXgxcKwn?= =?iso-8859-2?q?36o/EhfSTbcPnKKE0sJLp7zW4VRu1esNd31ANsYRmBuntdB+fWxl387tX2jp?= =?iso-8859-2?q?ik/NQWX0n5ryrBcRunAP+RJYSXPGRahdNugho9nl6THCGjXtxAQUBwrrn0WU?= =?iso-8859-2?q?5e8xwCFRNvXFGl9iOwCnlFVC9rdYuAbBzgD+pUIMFA+D8VVqvLSsygbj78dR?= =?iso-8859-2?q?r3LDwH2jFWYWrllt3tv1hzwZe5PfTWTW2KiW0zEJlVh5aocsYJ1vScrX7E2k?= =?iso-8859-2?q?=3D?= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d5b0aec7-13d7-4cb9-974f-08db5fe07e8e X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:03:20.4573 (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: ryCOhfug59GI5B3rwKssUCvPNn1aQBj9KdO0Lmc7J3jofE6Er3bip8l9cYxf2pZeOpyrdyJaLDuYTxdV6Tgj2UETebPdBvFYumw/Btuik8mh1uCsjbvTZAHMEpeJESwq X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB8658 Message-ID-Hash: ZQYJBJANFHDNRRMH3BTCMYRT2N7NEVQ4 X-Message-ID-Hash: ZQYJBJANFHDNRRMH3BTCMYRT2N7NEVQ4 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 Reviewed-by: Amadeusz Sławiński --- 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 b3d569e7ba61..159670612de3 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) { - has_playback = 1; + if (dai_link->playback_only) has_capture = 0; - } - if (dai_link->capture_only) { + if (dai_link->capture_only) has_playback = 0; - has_capture = 1; - } if (!has_playback && !has_capture) { dev_err(rtd->dev, "substream %s has no playback, no capture\n", From patchwork Mon May 29 01:03:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257970 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 EB140C77B7E for ; Mon, 29 May 2023 01:05:49 +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 6CFF6209; Mon, 29 May 2023 03:04:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6CFF6209 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322347; bh=/2lVF24wvwt/EniRLlSW76B85oHGuFwZaRGEElduacM=; 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=TGqFZ+oonM8XYvqPJt91CmFRQmd/iNjZ5Y+7a9GyWAy/KMP2FdtTDd+9/UAC31keB FDH+UWHaqHqdr68IrFg1SSthgiC3I9h9gQSYMbdgtOGiOVshigGIGfHe+voHDNE20l RP24L8+11Ax/wIh7SZFDPwlEu7ADJmTAY/ARuauE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 618AAF805C3; Mon, 29 May 2023 03:03:40 +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 D474CF80528; Mon, 29 May 2023 03:03:39 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E9992F805C4; Mon, 29 May 2023 03:03:36 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on20706.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::706]) (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 EE331F805BB for ; Mon, 29 May 2023 03:03:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EE331F805BB 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=nBfZaUXu ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IJ5ZOnqtkhFaCU22Jf92rtqICWDuVfK6MiY1hBW/XVI+fslr30m1iqJTjURtlVK/+UNAf3GrUbFM94UXBG1WccsXNHrARa2FB1IoBQH+Op4RoOjZBd1qjfIvBFcsxc03YdidZxME8pYOa7XW7zhHUboNP0LIXQNr8Q84rt0avNKloCdTN7ImzAJwBpB5VvNjFqGNW/QW+4oIxm3nuyKMcpjw1pPizTYMWVbtGbakOrqliLLFBfhOXPO2RZkuf2HslkeNn3Aysn9Hxmao7QPzIvsZ87416fPLDTxbhE8CcBZvaHeyEsFlrlLi+GDrcQTJgt2jJZuzyAgZ6gAi7XunHw== 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=zP+GOkWNAvoqclT3V//3dZg8IFTrUhfGtd+lfR5Ea18=; b=hVryhkFwa0KsxAJmPW22AvXSyZN3qMaU1eGdo1dBfjBFKemPO63sNS6QkhSeI/H2BmPXaKVyhWqtZ3lw82Uw8szLYyQaSoqCvrnF+T3+sMAmVYEFe3ld4cdOkLy+Rq4e/hllWstMbx7/vJR+B6wsxe5MP0F7hlTbHVLtyFzN40cFhoNYh63Fc5rOsDd7TttQeCs2BP5/aXKOUFxZoxDDPan2og2SvKis+wnk2DC7DME8DZvNDoxCT/xU/oekounuDfAj1w2v3nYjwGu1L71W6697o/3717hSSI/+jMOZa2pxAryJ9wMuqLNEg/h+TtJwHo3v/5NzD84ATgMqshwTpA== 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=zP+GOkWNAvoqclT3V//3dZg8IFTrUhfGtd+lfR5Ea18=; b=nBfZaUXuHdfLSUBsrpAkmq5tu+Ov3MsCZXgeRpb3sdlWx1wic0U9lB4R4KzaV8j6nBnhmgswhAKB5r4b5siT9NeVW1iU2C0n6Jh7544L2ZEqKy+6asyydAr/5SJQWQnayWomiwhlvrYgLobGaGbStmggeZg57SX4LG7GZ+0q6dk= 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 TYCPR01MB8658.jpnprd01.prod.outlook.com (2603:1096:400:15e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:03:28 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:03:27 +0000 Message-ID: <87fs7glzj4.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 06/21] 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: Mon, 29 May 2023 01:03:27 +0000 X-ClientProxiedBy: TYCP286CA0293.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c8::11) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB8658:EE_ X-MS-Office365-Filtering-Correlation-Id: 9fe9a095-f275-4178-728e-08db5fe08304 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VAy2YfkSzys3l/3baluRwTi42T2Fkce/EtoqgUN8hIWBzhOXrn2GfR6/QNNLvfvv9MClJ+g/YG1FmnAbYZhwaT2JeV1Yk6qPi6w+oTDtMgXaBlyioYvJXFKO/VVPpD2RH2QsHHzvlCpFB0vS9766YwFG12dcf6SNU33xU/MIhA7A2UdN50G4xpg0X9l4OZdl70FrFTvW8h0Bi2HB/ZCmWIY4r77oNWzz0ZPXcxGdcj+Yn/FlhZ/hoH+833QIQbIS747d9keJfQ14hdDZlG3soqVTVhtJWEShrGVYrEdL2jmhB57DQujf5eH07u71X09nzD5aJ4uTeRjHvUt8v4AgFSO/9y88PtV7owdlX7vYtgxkvJW8/E+QkXw6l6GD0y8BmXFGyYx5KOxlAm596l+4HReKx/7plKGjmF50hVjWqIXXxvMUYAGVBQdMFKd2wHeodRnORe47xxBjZi6ShnVc/A7GPlBxH8x3l7GXGXLp1LUk9ltMqzqTYtTGOBMMBjncY4KPgcOTQ/KJOBICKVWlusmunbXVs/ShKyXC9GF3+sWyuyQAoMDwIJMehuipBXfQVeDynB2baNAuMiP46l0AO7EVS+7Ih9m1ByODtIb8Wsp4i8VarsMh9vluVHnVcQkgpqKdKxrD9lGCNcQFz8kJWA== 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)(136003)(39860400002)(346002)(376002)(396003)(451199021)(26005)(38350700002)(38100700002)(41300700001)(52116002)(6486002)(83380400001)(186003)(6512007)(6506007)(2616005)(478600001)(110136005)(66946007)(66556008)(66476007)(4326008)(316002)(2906002)(5660300002)(8676002)(8936002)(86362001)(36756003)(21314003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-2?q?WOZvTT8Rgetd75L6LxzM+Gc?= =?iso-8859-2?q?PiLwc+xhXen2B8ZLIFFxZnYzayBSbi50qSNzT+awFnmcmLi1x2//Fp/crpf1?= =?iso-8859-2?q?cdTZfpQ7bzMXh1z7+AlDx0AGdkNHUkNvJw2Rksmji/RrhS0vy3O1mFEyAK9B?= =?iso-8859-2?q?jn9Eln7PTcFObJ7C8Yx7PddyQuecR15Ld3dNeRKT8MgEFevZVRHXmpAu7aH+?= =?iso-8859-2?q?SE01jLdhwroR8W6J86mdSdvJbaJ6Ku4cRmFIMcOvu+sH+6KQCdjp6u58IomM?= =?iso-8859-2?q?HYQLpdOi6DsVdLkgwJ0Bzfvcs0VFPlfll6Cqd8nm3IYm4+cLFOexolGvIQyh?= =?iso-8859-2?q?dv8+GeWDoHFwPtEYNmZe6tfw3t+57p0wcvyt3qS6mfqadj6LKmFzm4A+Jb8J?= =?iso-8859-2?q?7VUL863NajtY+lQY+HusqUXWGhomYAwqjQkK6++2IDuPR73Vy6zek1TiRcG/?= =?iso-8859-2?q?C9pN3TOFXMlk+I/W4rPqabk+XGQIblEGbFwzGEaRmXCR1fsz+HKnqiSMyM6e?= =?iso-8859-2?q?FXxi+WaRdE0eiQVuT5Lu3BCog4FJ3DWJTqCRRrUwmx1t50pcZTaKaxwIxolL?= =?iso-8859-2?q?TZTtxISkBlLhY9EBi7iEyAqsm4W8R5zlUSp1skcn7Bh8JzTAH8COjKz7aytl?= =?iso-8859-2?q?h0KGMgnRpqVl4f2gypvHhHkuCw/oJNZXouem7ZcbaZkmW6bKJycU/3uqPp3Q?= =?iso-8859-2?q?tucBLl+1E9tyzgoB1NIJNYC10qa99z6lHBAWlltU0tafxIKIMxTnATzwptGj?= =?iso-8859-2?q?kPEN4wN+o1I02TNNzTqMwkJxhoUTvB4Cswv4zOR59wqfub1xERr2Bnb7SF/a?= =?iso-8859-2?q?mrix5PAKNFruHFbtha4KxYLRzF6m+fUO51uz/Rd8GK+9QVj6/F/S5e+NABJd?= =?iso-8859-2?q?zc54qcCEV1d0eLEyFXrdIOJDBVd0XnE6kodC0Siqag+IOapUMDd2zgq0GBqc?= =?iso-8859-2?q?Dx0T69Hs++P8SNNOmms+h/OIyR5qc/V1FL6wlhJ59Wd50DufjUzD9i75ZB05?= =?iso-8859-2?q?bJrvxfnbaQUMIcYBx7ACWzKhBuEynqFm9klc3VEpLhfNV01NjbSJxW6DkYBc?= =?iso-8859-2?q?GVvbmbv13FpOrd22ypNCaNBUlk63HURApk4TjWXBHr5x1m2L3c1dXDyO+NMZ?= =?iso-8859-2?q?CEjEhwHxergrCGUiulDEHLQDSnVdAb3v6xdfjeOW2GDLK6wXEsb09+BXZ4ch?= =?iso-8859-2?q?dMHZu0+3IoPF1d6RXr/h4BlzLo79QDE2skTgxHIFwkx8+y/hP7u+9UmQLtiS?= =?iso-8859-2?q?a1xVhUT+uaTE+gmeS4/oj9Bn7Pa3pjWy3phPlpOZ3gHYSdziR5Lvw+TY2LA0?= =?iso-8859-2?q?RbEE+b3RUjjThcGK8kPRn+kDuf8jbXCvrpP2HpBg55TqZ/2/uLXx1EF19V22?= =?iso-8859-2?q?8KjW/fM0RYY45qCGe7zcyNJGD4Zt0DiBB4MqCqAmXenwnbeJqY71Qh6ipPyJ?= =?iso-8859-2?q?M1kW0edV9XTQMoGzFjKXhoFJQUID2oJspUeYDZpRPMP4EeFXh6PF8h4r9KNk?= =?iso-8859-2?q?890Ie0VY2t4Hkl/45RMkBukrIKHAyjcX2zQzpV7UUZF48h6CgJjgY+i7Go8u?= =?iso-8859-2?q?nxS09qIYPYx+TPdUb7Z5MpDd1NJeyG2gy7ZjEVhxReZ249TAGFc8kdRcvsO6?= =?iso-8859-2?q?KD7MWbtzw9bh1U4+zsnkMxqpe9IY9I8aO0RfqnVSeU5aUR0lmapzPGQbLmE0?= =?iso-8859-2?q?=3D?= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9fe9a095-f275-4178-728e-08db5fe08304 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:03:27.9230 (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: Q9uKVZopn2OBXRDQ9NegN0JNe+8cQ/r2WvOBLCBDwhQoJ0EjQPn7CWbc0Q4CSj5bTcJG3YO2PA7EYUU4ZYFjMSaYTltkyKEnSiv3EEYPdz7cUEakhaANy8FW9DMEEJ6l X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB8658 Message-ID-Hash: F3BONPKVAXBYCKHHTCYHOZRWVOKW7N7F X-Message-ID-Hash: F3BONPKVAXBYCKHHTCYHOZRWVOKW7N7F 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 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 159670612de3..b99c0aa98d09 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2742,6 +2742,13 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, return -EINVAL; } + if (dai_link->num_cpus > 1 && + 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 +2799,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 Mon May 29 01:03:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257971 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 518E0C77B7E for ; Mon, 29 May 2023 01:06:09 +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 4D5A0828; Mon, 29 May 2023 03:05:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4D5A0828 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322367; bh=KXdKNrzhck/fp+xORiX62UuQBuO9vS2JPbiHYgG+TVI=; 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=D7rolX54GQ35wkTeRezgLCPaqOclEqJje4HUczwyqYZ2KYYiT96APwUzQYOTLqUsP XTSOW+rgrxNhH4Wc4DmJm+LBa/qqlP57515q0rMHhEStevR1iyBtS9Yyk1JPdRfj6s vmgPRJgOSd255OpauQpxWx0W+ywPTKn404lc82jI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B91D6F80567; Mon, 29 May 2023 03:03:50 +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 5F37EF80549; Mon, 29 May 2023 03:03:50 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 21EC8F80528; Mon, 29 May 2023 03:03:47 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072d.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::72d]) (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 47F41F80548 for ; Mon, 29 May 2023 03:03:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 47F41F80548 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=oNaLVAXU ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GARqPf9nPvUfajhJjdTv42Ym82OW+kQuJ0whrzDmV3BkJLYRII56Q8vuRmUkv25Bsa8eAA2F9kDeZYhgW+cfV86huc530a0evmoiRvrjsZxYcAVmsCVirLVoBLhwPF52pxxDdUIsxpFBGBmm8j4/UzIIA0Mm5KUiNKZz2BFSdAs4vVyQ3zjwtcTASdAIxj2+ohf1OYgXmF+5X/zZ+LEPGoyEqMXvPDw079oCa4TuUlxUJxr4w9ifQr8BMGSQbKI4h3BTbbtnnIlArd/ssWPZkWEsRXz6ONnwarjk/eKJ1fMJm7JpAFgemLbq1eth7YBBg0IfyiXeIB2aKp7OSR3iXw== 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=50JwugO19/gRdobJr/03412SzOgPQ1qanBVHOuZGb14=; b=G3gbEsu4U841tw47zz52+T89VsAVfxAYnX90aPOnA7TF/ZsF5PYI221eXIUz1Wzo2dpUkTOOYTvEl9FaHY5zbUDj2WPVyLy5FWeI0WcK9kf3PkdcFUbF6PoFPuSMFvd2IQ7b9qBSo2a731wzfsDH+XQ5hcoaFPzYDxRxrfOQ1NlEmTi1FKvh99ejbZD1YMh+DKp9dxT0Cy/PZvLsTCDDtbkOl8LU9UKG71CgqUOfUvJTpI214ae7J0t84H7EnehdVSd7Ml59A6pagE6roCByFWHYDpwzKNjENfKpyRpqlIN3ocjFnpJK1zmJQmyzmE+suMa5CDnbT2oG/cZQv3+Wzw== 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=50JwugO19/gRdobJr/03412SzOgPQ1qanBVHOuZGb14=; b=oNaLVAXUq0QagB4swylWJh2mSvzNxhtxaBzbDi0x7RxEoS1whtKs+Rq5L5CRP4actIGsyu0rwcOj22h7edfsWWeFkIG5eMRl2bOEGA8XObIIXvdDnTOCU+8YMIfCRQulQYi8fjav9Pr5UqzRyLXJ7TeDrPFsn0VP4oyv3Q/wNOs= 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 TYCPR01MB11557.jpnprd01.prod.outlook.com (2603:1096:400:37d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:03:36 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:03:36 +0000 Message-ID: <87edn0lzix.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 07/21] 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: Mon, 29 May 2023 01:03:34 +0000 X-ClientProxiedBy: TYWP286CA0004.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:178::6) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB11557:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b0f7460-66a0-4878-7986-08db5fe08743 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oHS0SVJmxO4wls/lnJ8cxGLXYv5IYF1kgZdTSX++QwHHgw8iKcwRbMX7kw73BIs+bQ1s/vu57T9Qu/a5PTn9UhC9aRVVL3GmZjfB0hvX2Ib1JRsLCMm3HWJcqqsD3XkFQVIykQKdb//64arjanc4V/jN4qqHgdFfelB564XS2j8TigUPwimRscsLzDfBibmEo9Z88FMVEEQZ19pFhlwXRsqrsMC946vgqIi0Sh7scFgiPWA3ViPvYPqvVrKkUQ5rBc7nKHAENDgMEqLxzQdCiLIxF0I0bFrcERAOZ+iDP78aezICMDUPRbPAaVoBfpFnaFKlho4b/G3qTy9JThCj8VkIX7fdsjmOJm6CW40MQn3q1cywrpU37UxVo6FRwHMzuZWbndLNod0DrPjMVBsLDzHo8OLTmK/Gkq7GnZC7G/yQXaN68KYzOw0Dht2RWLdqz4E42lcsQX8TTLv3/B3U4BEHu9W9g/rQyW5GvGLnZMJyOjG89/YUijSaGHoYVFfmt1fJ1qnYgOv1p79a0Lz0Bzt3sh+lmUOjDk6+E6qMqOYEE334h5lYMvvvFHlOCWi8MGGHWUpfTuSbIQKyS7/0SsZAv1zxJm4iz2cMOkBi1K4kh4MgnyWMjKHPEZHtlaV3 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)(366004)(346002)(39860400002)(396003)(376002)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(41300700001)(6486002)(52116002)(86362001)(316002)(66946007)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-2?q?2TPUG4umRObFKgp/EsOhCS3?= =?iso-8859-2?q?qeSZZjByYJcuYTizk0+mHHwaa4uutBQbtNrMuEBtav2p0akifUNU8ksVIwPx?= =?iso-8859-2?q?io/GVOF/7xRMb1MQKUQd5Y2vrti7/IYA0zmz6kFMfVTl2a1WuaOr43qMSjYz?= =?iso-8859-2?q?kBYij72Iep2DoDNk3qvthlrfAUQyFiA2EMnGhMRXfFCJrIIP8QleD7kVCeK5?= =?iso-8859-2?q?67/95HUtQaiPgEn2JOdpvdqQ+k8bEx/XjcdamoQD61iLfwCDXccvaQMLTJud?= =?iso-8859-2?q?oQQ0j++rPdl9rZoTx/DI660n4mWP1mGGQGfNrHbG/ONYAUbhJrL6bDNyQL1O?= =?iso-8859-2?q?IzOP9Ph+GbWTHs/4yE3bqwy6VZfpPUMwle4cEolBX2IlEmbnlC7huOjD+Z2S?= =?iso-8859-2?q?qYK6MFUJGzNxWn8QXC3w59Gpu0IoziRBb8j9ckIIRLJLLZrYlLH7VLaNrPvN?= =?iso-8859-2?q?+IAgSmzcUcOPxuAKliAoedrBiNCe0/UdrTmnJLE/XLaJ3uJPQIBmQyY2YOET?= =?iso-8859-2?q?raggTL+biaHAasp8GeMiPVVjyIv9+NESDAoQ+pOSy/Io+Ff2qzyBmcMRK6gR?= =?iso-8859-2?q?tj1XDn8a9f+XYTO5b9/9CcFK1+IXrvCZYt7CrFfIir50iqyKY2yW64LobLKX?= =?iso-8859-2?q?y69hv764KZfrQoNTM1DFmtYYDc7jtlpJBl673Qn2g3R95XJPWqB4McpAwUIL?= =?iso-8859-2?q?/krlCBWnRLL8xgxTBh8FpR7hYVQH5d3emSxJ1JHXII2EsC5LarZd+juSoZmR?= =?iso-8859-2?q?N9ONrJ/xJ/cjzZOTfN9oSiALaYXxnOZ+O03CqR49RHSgFXLzq5iwIb2PfDMd?= =?iso-8859-2?q?ulp+Cn+8JOAxoLn9trzuCv8qzhXGErgdUO12An3nhmZRsFcwilsKACnZKHMa?= =?iso-8859-2?q?oqIoqfh6N1jODnpLIzpO18gLa+qrbqueX+FzoL8srtiteomlTUBPJuoU/ZNE?= =?iso-8859-2?q?/7NpmCj/S5mDcRGdVEp4HVdVbvmRFtgkejUnce3V0apiqiDEM9SFRKRY17vD?= =?iso-8859-2?q?W1BiBVqXitgy/fhob2xYIqMtu2t0eoaHKRbMLLBqVgWp7jIlGkuloUe6bvVf?= =?iso-8859-2?q?VNEh9hihR6C5s5cVzK23fQrAzSIBID+qGynXIQQLBR0akUSlzw0zbn3A+f/e?= =?iso-8859-2?q?alseTWf2y3Zr5wIuBdzVlN4AztD/Ty94T0Y9OQAeuT4x0679xmeOqbpu1qzO?= =?iso-8859-2?q?sSBVlDp0xwmrMFdTRZLmynGQP6cPa8sFq+csdM8WlIINXOaBGG85JT4+GRU+?= =?iso-8859-2?q?SB3z8p2g+bzNQSgHgFjmRk7zudrXfHB3WMrsfIf55SsahvoTv//q8zJsxCX8?= =?iso-8859-2?q?l8/6RsE9Cuv0AYZoHRUJJ7d2wKlDSbWQ0SfUNZ9YFI4GbPzDasc9ef56DOmV?= =?iso-8859-2?q?Gfbqf0BVw3QiGJXSpWOM4lPB88kIKyf05xxp4ivt4QZTSJZHpaJzBjaTlyQ4?= =?iso-8859-2?q?dt14o1M8si1+MJJUgHtSJ1PZNE50MCVwa571mZCxES/4VuP/YE3h3L1tvjcf?= =?iso-8859-2?q?W6uwEToFrPYDyeqw0EvljeOPmt5CsvTk0kcMQ5HSS2ckEon9CSoTEfyNWuoM?= =?iso-8859-2?q?fvkdDXJQPNgoS3caH9kmVFtFnrxPtr+bNl8Su1U6upXDjTFT+jW6vOcBGh/h?= =?iso-8859-2?q?qv+4doXMJWq7aT6VE/AX3h35uxoCSVt08E5Ov1fnfPX3+lxThaArg8I83snA?= =?iso-8859-2?q?=3D?= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b0f7460-66a0-4878-7986-08db5fe08743 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:03:35.4310 (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: kehva/uHLdz4yQQQSCKaKadrqT8NN9rzdsqwDEysEXYHF8EEFvOyl2tZl0etqS3lzyY300y6J0kz/0VxX1kJKzq+KavmA1q3zvSC8SOJPtDVxdBp3LWlgBkkTqMm/b6W X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11557 Message-ID-Hash: J7KQ6KGDHL7VLTD5PTVCBRP2GH5LSORR X-Message-ID-Hash: J7KQ6KGDHL7VLTD5PTVCBRP2GH5LSORR 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 Reviewed-by: Amadeusz Sławiński --- 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 b99c0aa98d09..c1ddd3fc71b0 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2795,11 +2795,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 Mon May 29 01:03:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257972 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 13234C7EE23 for ; Mon, 29 May 2023 01:06: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 47047836; Mon, 29 May 2023 03:05:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 47047836 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322374; bh=uRQ8TCjDDNb7JC+dQBrtep0rjoz2d8EgH5G1BEqi2e8=; 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=hYOkWtO8Qr2CTY+5yv5XiyqEmOGl3zGWsG9A61ONa+wzzdpyO7Rul8lG5Ch1obaWO 7D7g5rbU7AvCnqNhGuMXbQOVYo9RFqhSOxHCF7xXEv2ZcFu/428RuGCOhzdcHWTrrt eAq2468meoKIP5UIOG85rYeW1G+fT4BVAKAf8mag= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 33E6CF8057E; Mon, 29 May 2023 03:03:58 +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 C836CF80580; Mon, 29 May 2023 03:03:57 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D5061F8057E; Mon, 29 May 2023 03:03:54 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20706.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::706]) (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 7189DF80552 for ; Mon, 29 May 2023 03:03:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7189DF80552 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=OuFpOdBd ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hD6BM0X/vCErCAKue2nB5aORMPs7z3eFE4grEy0yFuKOrkpuG6WB7bN9JS/7tCjFrCLAYcIuG09pddHHGoKP0sn2tgh1BQsaTGnwEwHrVQMCVo0dgc90yK2+HXQ7e/f7ZRiNYA4W5/zon/2sF75XqUf4T9wKszyoqg4uTW0iwBg/zEXHFvA9BiyORSC+is2MyM+DGCTJ95g7bzLj2PfF991hX9FMTit7ti4pXzGDXcvLxZRc2wMDBorPc3bfdMnzCQRk+n/7voCt5R+lP7TSJbTS6OQoK1s3a2D8qMe+JkUBYegHfDQ+S9+LrZRcn8qWMI+2DDcm1VC20vDfCyfsdw== 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=QgCmUKYOr2cJWLuBvqa8k/SYR9tr6UmuFgf7o8fsLmY=; b=FpmDpzikA9LQkuSbe8u9Zh3AF135OkYosp/+RQGZ7ni/oeMiXYUwxscN2g8L2fgaf4372C29Q58XB/J6K4iWjOd82oc+1kWcXEHYEqrGrpEacOZ1VjJ4HDCITgAu8dWHhiE7KlUSBlHS/LJ/o6FhL3stRa+5Y7JsuWFc3MsIvZL+s/Z0oXWYXsT9OzYZ0myhLN6nCsFbfblLb1bstKE99XgEEk0RFs0623/qOihj7aLcnKeuiLWmVOQojoq138+7kkSrvNpyTdDmT6rt+7d9V3Qawa44Gq9UQnrMQ0UA3kjEWbSVTmyYHlqCu/2ePeUUxRxNMvOuFtmrp1JX+yC+Tg== 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=QgCmUKYOr2cJWLuBvqa8k/SYR9tr6UmuFgf7o8fsLmY=; b=OuFpOdBdvjYFhetl2W+kCF3VQsISvrbub83liW7mqdw17xnQFuz9scrroRO0XxuvhYOeFLzZr3rgpKPKrgxP9fwkJaKz36GB3wGgZC1JUzwpRQ4Wl98fB2wmi9j0NjgmKYPe4gv7V9egRfFfy45zUp4A8mc2oJFdFrPZZ5Y4JEY= 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 TYCPR01MB11557.jpnprd01.prod.outlook.com (2603:1096:400:37d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:03: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%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:03:47 +0000 Message-ID: <87cz2klzin.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 08/21] ASoC: soc-pcm.c: cleanup soc_get_playback_capture() User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 29 May 2023 01:03:45 +0000 X-ClientProxiedBy: TYCP286CA0155.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:383::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_|TYCPR01MB11557:EE_ X-MS-Office365-Filtering-Correlation-Id: 0761c74b-e6d6-4efa-8ee1-08db5fe08d8c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L9GHYHfXfrd2w5d7g3fmZEab+EaOAvIWD5adWJm3afQ95n0wa2u3uPEQ3BTZKz+YEP7xDX9sg7IR2jzn4uEI4vs+Dzb9VTxW4drQ7zP/oLkKXB+Wxps6HdUuBE/TlPDgGyGoEmQmmgPdhCUibz2511bDCroSKL32Y+2y2Iyx45VSIK79NdFvDO0FINaliIQ6VyuJ8VDqC5GCkZKvtDoKUt2cJW6IC/x+6tS3Z42RdIwEWijmaVI7EYmtr0QjmNHN6A5oUPe4hJgwhCzWahDJVTdhS84V3/FqdNBNvToxVs8PJBouuJS1ChuwjrtFsb+9G2KmXdv3rFxNpDX/I951dt8l2EbEpKH9d7Sdq/nufSMh4PvFgMd5dVx1QW/q8vOGAMF2PbiC1zKgdp2OgktW9ob/+lRMqEjeY1RmVaQlT9irCVoy11T2wmtz4PsCbkzvIxpbvN4FavrTdnRdD6PRo5pt4usRH83HGb2eBzoiC9a7IQU2vfvowwWI4F/Lh542rvwRu4jUIvUSsUbj+DbZ/tJ2DNJMIqi0+US+0JgqwuS31C32Pqy/vzjAMD5bcvfKuOcmfkaVLHZZFuFDB4XHiXH3e+f5StZoxLo6wOhmtGsjWJHWKiuDrprXOSXkRoJU 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)(366004)(346002)(39860400002)(396003)(376002)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(66574015)(2616005)(38100700002)(41300700001)(6486002)(52116002)(86362001)(316002)(66946007)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-2?q?ZEMjvlfEz8I9fj26RdFbb3k?= =?iso-8859-2?q?iPENstOEP157PoxU5qFG/O+ldBuD2bkbCapYJuNWNLqchNaB9hRLDMMV0nAF?= =?iso-8859-2?q?5EDs//Wokc8d2wGRToBFRxSHWvVicUn/3SkadynoSN13tOt6fXhgz5i0Q1K4?= =?iso-8859-2?q?QbOVwFiSKwRk3jk/R9pVeg2kssiR/HV/0bYYGW3HJDr1G5Fs99Zus6sz/k57?= =?iso-8859-2?q?dZ97U5scRFuZWH+qz5pJFxQsSi8x86bQ9hzoD7tklfOzxG9Ev2vXs9l859mJ?= =?iso-8859-2?q?5hz5AmLDXaR6rllvRIaIEBO9NBXLzU6fUTV8uRxfj7j19gyFUjxw8jdmbETp?= =?iso-8859-2?q?d69ldUagvEC1lRlTLdtMgRAjo+7UQXb1lrTjXvLMETcN8wDZPnuK93ATVpEB?= =?iso-8859-2?q?k+WcWbpgUSXle9o5FdLtqYIsi25rj1PwbREm7PV6i0Yp6/deqz6bzSUuY5qs?= =?iso-8859-2?q?djlN4hjbmEkyCmVCQac3pQLDr4ls+l4bscYGfc4k/Eny34WkDgS7gAIf7ZWV?= =?iso-8859-2?q?bPshAfo4KW5fvo7/KfF+oa+ybS49obiYyzbFrS8RdFirFYIQ9saOzvSD6pX6?= =?iso-8859-2?q?QEYcDjKEn1Tz1YtpwmlY5RbOp/K2Rnuz0HqiX8ejrfyowgiZFhtJ8g4vwayx?= =?iso-8859-2?q?s//5dGVNM1ha1JpzYsdu0055/XBWARKCdIDcuMDqg99pIlzIfa96lAEsNI7v?= =?iso-8859-2?q?kR6Q1N7yR5hqFjyWXxsMceEBRr8q2kexOjOB9VBHzxWrbdG5c0qxknMW/9Wz?= =?iso-8859-2?q?k6bTdQUCBm3AmjfFAXlFfzY7u7mOsbuJXhENXYzfP13dXbFuz5L8Rhovwlr2?= =?iso-8859-2?q?ZId1c6tIJvmp4jc6OXx49N3b49AHo5Z0g6f64f2fyRtvFYTlkqoOP+RaIBOD?= =?iso-8859-2?q?pRKiQc/fdUsXcIOQJS95m13FWExfzone1cO950vg/xnAtcXsJQJST5Gg7xcf?= =?iso-8859-2?q?396N4XnT5K/9UZpZ47BIJ8uBHw0pdW+rsT7O44w7Fz9tghWpIoPu0FOjk9Tp?= =?iso-8859-2?q?CSwmB96sLDnn2qgdzb8NNXsOJMiUZykavx7tKKmAo5kKNqB+hrxWHnIJrdbT?= =?iso-8859-2?q?+GBkOV1pmOL1s06Ez8weV+8MuPW0Q406I27lRT2T8WPb/QiRAya7RFOnw0v/?= =?iso-8859-2?q?QjBdzlcEZtuuZ2j0vAa9IiqOqzXAOsoT/P4I08NtCEaZnVS90/2w/c6ZVEHQ?= =?iso-8859-2?q?U+nD98K3rCkuvPSBznip/DiEY3vioK7H51scK6gpMMaBMZLQBDWd9yuLMhg6?= =?iso-8859-2?q?vE9B2saK7bNHrlaD+KolB5XH9Vzm9N3xfY7BApVcHclOUOagGqVpXHbvYFhq?= =?iso-8859-2?q?MLy2RktET+j/qHtpqcKt58p/G6EJpLSzPFcRa5KAadz1jZTiDSvSWdEyDjDW?= =?iso-8859-2?q?fHJcG3WE+g0z85RikYKpYCll0rH1aUFFR7XgFDz8kOOHj6GfO85mtw6i39/s?= =?iso-8859-2?q?lEHA9s1PbPesBVKOnmfZTyDeyh3NzgQgw8R7Y177BLy8Vx4grLgPr/BjNXlH?= =?iso-8859-2?q?yBjIZdjQ3eynukVxyFt3WMO19NAZbApQBXFHQ8Ox7rms4ZuWhhqqnVmGszoz?= =?iso-8859-2?q?8L+FMRPnxYeR+AdPVWTlI4zVMmLOxuN+ZHpekhleKNwlJanKloRlLQt1aICD?= =?iso-8859-2?q?o3W7n/sLUijX3c2gO1KL8N68ruPKdJe3h9RwNV2Q0c6C08rGs46DGaklnRbA?= =?iso-8859-2?q?=3D?= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0761c74b-e6d6-4efa-8ee1-08db5fe08d8c X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:03:47.2719 (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: mrG7ZEQLFnESYtCkTokalcrS2dFsa/Frv6mHoEi+AM58JDF7aJZs0ejCVX4tKIg0MI74v1R5AH/Owh/NM5RfksjoSu5TBIz+GOIjILHRHDueTpvGwFTSNZx47JYCcJfI X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11557 Message-ID-Hash: PZLKHKJUNTQXN7B6HQQ3KSKA2AGLUSB3 X-Message-ID-Hash: PZLKHKJUNTQXN7B6HQQ3KSKA2AGLUSB3 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] ^^^^^^^^^^^ DPCM part (X) is checking only CPU DAI, and Normal part (Y) is checking both CPU/Codec DAI Here, validation check on dummy DAI is always true. We want to expand validation check to all cases, but unfortunately DPCM BE Codec validation check will breaks compatibility on some devices. This patch ignore it with comment. Signed-off-by: Kuninori Morimoto Reviewed-by: Amadeusz Sławiński --- sound/soc/soc-pcm.c | 80 ++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 52 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index c1ddd3fc71b0..923a66a51b18 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 has_playback = 0; int has_capture = 0; int i; @@ -2749,61 +2752,34 @@ 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)) { - has_playback = 1; - break; - } - } - if (!has_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)) { - has_capture = 1; - break; - } - } + for_each_rtd_cpu_dais(rtd, i, cpu_dai) { + codec_dai = asoc_rtd_to_codec(rtd, i); /* get paired codec */ - if (!has_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)) - has_playback = 1; - if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) && - snd_soc_dai_stream_valid(cpu_dai, cpu_capture)) - has_capture = 1; - } + /* + * FIXME + * + * DPCM BE Codec has been no checked before. + * It should be checked, but it breaks compatibility. + * It ignores BE Codec here, so far. + */ + if (snd_soc_dai_stream_valid(cpu_dai, cpu_playback) && + (dai_link->no_pcm || snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK))) + has_playback = 1; + if (snd_soc_dai_stream_valid(cpu_dai, cpu_capture) && + (dai_link->no_pcm || snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE))) + has_capture = 1; } if (dai_link->playback_only) From patchwork Mon May 29 01:03:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257973 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 6C387C77B7E for ; Mon, 29 May 2023 01:06:28 +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 4D55D3E8; Mon, 29 May 2023 03:05:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4D55D3E8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322386; 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=JZA9+jwoHbowZL5SxkcnOXA+xM9UXM+c+1I43lMACqBbMCg9/Fn8pVcjZOTEcXeKs IaICK6vR8ICg/crlpB/YU+rv+xh+euBxkIxtovxf1oubNf9oHYwpJhaLmj580M2DN4 t36zAzAEb8dvSJQ3DZY9rsnnryE1kUrgTMZTLLnk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id EA630F80568; Mon, 29 May 2023 03:04:14 +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 50FD9F805A9; Mon, 29 May 2023 03:04:14 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4C971F80568; Mon, 29 May 2023 03:04:11 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072a.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::72a]) (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 A5614F805C8 for ; Mon, 29 May 2023 03:04:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A5614F805C8 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=Y8IJgJwr ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zxf26VB3JTn1X9+dXi1SKB0CEEkHYPI8ScgW8ZeIv8AHAQ1jolpJoEVkqr+omSjn4hJpKlpRb6lF/f5mbPdYWAwcZMLp2WADC0qgysEA2uL3vgxXbaI1ZAxU2Vr/4H0xzLneukEUJ8cFPoBiJwsPPrJ+BrXM2poYWESpYz/4JlWysK7PlVmmnOdC0Hidt+IQ9TlJaKIfjX+suETbEkZiyCAPv8LxCjzOuqXnR+1LyAy/PY/gubbwUoL2NJuzSvrORsklUi9R8Osn+ez7XBx5FvH/i76NEJIt6GnEf4ZRYh1zsFkwgf9TeJeDT5XrWNUJFLuVW2OurOobA8lVJmSzjQ== 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=c0HpNbwVvufKcopBeZ+aotJvHrTzV1r8A0W97AHuf2rFLpF3ntvTsEs7IzVYgjZx9AlALHV0W9xSUHcjYYwfSB7Xeg6R8M791LiST961paqM68PCVAQRjGDD1pOFT+34lAa/7UlTZjcDTsh2u9BdplqUeJO+tPmnAW9Kk6dautV4kpcgsNXR2/s2w9ItYDUm4mmgYKujTNsJUsT5+AZS7iVep06dOYrEulFLtCBlNlcfHCOPuJbOjEXma9SPxGhiNYeMXNK6ClbTWBImdvucbzm0Gnnh+7xSPIPVGt76hYJgo0J9i200/aoD33EOzmHA3LATVBdzckim3OgKzHYF3w== 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=Y8IJgJwrMk8lYGNsjcENMedTNsnSw7xztmKHVGuVigk16qZ7vhj6O0s07EPNbHEb3oMsrwAIC+mt+bUl0Ba6hQS3cQNreKDbH8gxJnCxudEAQQahjKNv1KKqWE2nyq7Ds6SLZTEePXtUjkoGl/nsDJzlo8MnX2MduDlcb894kAs= 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 TYCPR01MB11557.jpnprd01.prod.outlook.com (2603:1096:400:37d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:03:55 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:03:55 +0000 Message-ID: <87bki4lzic.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai , Vijendar Mukunda Cc: alsa-devel@alsa-project.org In-Reply-To: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 09/21] ASoC: amd: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 29 May 2023 01:03:55 +0000 X-ClientProxiedBy: TYCP286CA0160.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:383::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_|TYCPR01MB11557:EE_ X-MS-Office365-Filtering-Correlation-Id: e47540b1-13d0-48cf-8212-08db5fe09390 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dWajB0mHhjs+V4WLKHiglBhpnC++S4RtksR/24Sqrdcg3dHV0hBnKEX/ptNbNLW2SOpFNFpx31NA3Ei9dg9eKo6ZAqQOADvwtoO4l+HlTxgxzkpLj+1VYnbqUvxay0OZTaMW7d0olkDqQbv21d+b3F6tYHygmdbVWDiLA2p0Xb+CKjmPn2mgZaIPFCzYgx9JXIq0Kr6hDYMHSVNwy0P7YMeBd+g0FD1xc+I8tDI/4Htz2YtvtQhhoPX6dT3Wk8IdeGGGufQCmShgTCGsGU/Xr8njtAaIyK3FzchSjwddVxSuQYY9jbhRpz7yei6DX/d5mUSi+DezNMOuzqL2FJOoHUnMxtgw6Ue5Nlomv03+EDqhGYFbTzNfMVdgmNemkQqT3iqPumeLYp8oCCv50eRLCPPPCCCRwljkyZO+jPMPB6wpOv/YVghfnLDM2bITlczd1ruKDgYQihd63vto9bPJ0LFZOMoXd5F2QsLrcVfS0xWcflmw0C83tiJodRWf2xMLbhkM8GoiFA9t/bxWSudsKbvSFo3Qj0AABDqU4c423LUm8C+6d+M8RUqydD0lTq4ffsqoc4jFZ9Qhbi7SBYNkyEgPPP5OwEdwdx+9FmtS0yL9wo2beq1rhqqtCrJzjx/A 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)(366004)(346002)(39860400002)(396003)(376002)(451199021)(2906002)(30864003)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(41300700001)(6486002)(52116002)(86362001)(316002)(66946007)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yRPkIFMQvQF/GSrz5Y+ZBQvuDpeIRJd4/fXqlnqEzlI4x6Z32sgkEz1imgAx1GD6NczhhoQwikQoH4Y4ysydBEepH1cm/P6JN6x+m1+Sjpta8hzZJNKOjDgJ2IjPgUvQEOykWSj/bB8+6VsPsT8LETU8mWF8/oz6hZX3SXz9WE2mCUkzuKQ5/YlZpZGp/vWh7+JgVu933DxvY4yxpqoNmM0wEJPQmDru+AzH3zs6Q4GCWY4aPoEhfRnHYje1BwB7GiDAKJOLOGHpyCUrE/N1dSsxoCcksyDVkP4skSnZxkrdRZ3CONeXZD4yGiI0usd6Fatu39ch2SpIXIQRJwkYZ4bO1nC93e4W1cahAmQsifV4PjYAjHg5rWNEEYDQHk+FfvbxO71kx5prZ7d0s2zb+4kmvCiEB7hlZfCj80vU1bk0fRJ5Sp1Fknir1KXr2bJpN9KWOPD3WyLVN5VhMB5Xzt9HKj+YbSRMuHC+/JqG7m6zpj7JuJWZDMA4l+IqFkOZO6NqIBeZ/ZAAH3MhEBL0Wp1EJ/GGVE3z/q30OkatYJmtaMMhNHL0vWvdjE/5+nAlbyKtQ6FmeI1jIT5+ejHw6PnClM2FZY9+i+IRr8dPjOuUdW/DY2EtOWnMLPhUa5wBEwUGlDTpaji6mK3BY39JwsFffjdss6Z3jUYlXbSsRhwj9aL3qqkkm3IjREWn1QsZO/p1dbfsRFZho1Pv4fDGgmyY1l64c1NsGYkCUvEilR/d44sexGbU7opWjVWnYPG6zjVgZA8Yb05Sep6qoH5fO9nxwLqsamB6HF8Sbr05Nnt88upMLblVmSY9TePkcTA0eid/Ermn9cWPJa2DTLGeHih18+uSb6usiT59+J2sFjtkF0wEJ/mxUqZtK+mYAkvOf1b8bmPSL3rYWhgYAdOIOHlO2lnYCWM72QbKHgJ6PUhmq/IVL8SyTe2NJGig3kMDCqoTtxVCQ9YHL5NWnvOAQgh7944wVOc+R4fjbTEam38rvK5cbkoGRCSEyA15LCzUrPj1gSNviD4lEOyU2LMvVqLcgfLNoD9A8BkMC3J1jKy71uFmukztm7BJMeJMoJ8J9BZzjjJd2WlW67s/M+TUvrTe/cr0SYZiTB5cNaYLNvZEG0HvPxZVWQS2mdAhSc1OKyt9iXxi5uPTDrSuATqa8gk68uGZ1iQQUUBvRZulCqWWVXt7INj8Ihq0FNbzSf+yYadrLuyZHpc9RMBVbNeti8TulncMBLBTLWuAC9ulGEHE9C/J7/UA2l5Hzku5mtwcqvUE8K99eLRFoMI00LyfqhXhzvwgoBJhPPejzqp5WDZsn72zj/owyCVex1eRDeaeFstgS5TZYtGG9JfRcISfGORFL+nsuXOgWCmoUa+ppAEHU4Zb5UTfHoaXIaH2SCLJD5oTSXo4bRrzLUwmia51CAhgv9/SZDpIunsLcpwu1xHgZifMbgLqj33JzqK6xIyotOqi6PvnOmtMmdoREJWsur+foA6Fe93xxbIH2LCiUq4mo21tZjNOvw6kqoo1e54YWJTztLwSCUYGYCveVzMmqJZjTPm8rVAey1UVDOQfJ4zjm+UNmbi0zfR5lhcCC1KnpKlw5yTn07Vi0+8N4ZjVv4OMq+RZS2qBRu6Sogjzz+A= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e47540b1-13d0-48cf-8212-08db5fe09390 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:03:55.8605 (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: 3nEYSNIkvqeDb78UDaqovKaWn05Bd2w4BrIxSNg9xq8GKQi+gMPckA2lpanF/i2Zgbjxn2J37gkGrwYSIt8E9Owkv4gwuGIK2/mm+EhXWIWeaKUu6fQ2MZttiVxZoRqw X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11557 Message-ID-Hash: WKI6WYTNXA2JS5KDEQEL4ABY4RBZBIU3 X-Message-ID-Hash: WKI6WYTNXA2JS5KDEQEL4ABY4RBZBIU3 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 Mon May 29 01:04: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: 13257974 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 B2A1BC77B7E for ; Mon, 29 May 2023 01:06: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 8D425207; Mon, 29 May 2023 03:06:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8D425207 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322412; 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=riX39M4ISEqBd0t2AZqVyWPFbyyom86lXhBaFup6M0B2FEOHRDGKpNnExkbA4aPo5 oVWc982XbFPc8Vrucgny/AI5/5BQkxGjfllf6nSHgKOd4k6iRZAYQ7eisMxfdfbiA+ GqdH1PKoxrD14vbYguFUqpqo7tXb1VLNIWhWebXc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 20702F80587; Mon, 29 May 2023 03:04:43 +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 C4BDDF80563; Mon, 29 May 2023 03:04:42 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 82D95F8055C; Mon, 29 May 2023 03:04:39 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20706.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::706]) (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 9C513F80551 for ; Mon, 29 May 2023 03:04:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9C513F80551 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=X6IhkrK3 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QLls10CTYyUtfivA18OFWZ2m5V+2wOSMUtK/3xrYTTbO6rJXkzRoRI1pMeiETNbjpOQjruvE1t2yhVaoDjSbj1+PPVjgafvZWnPxP2s6QmjUypS5fNqwLhAoeLrr8LvV+FWzaRhLFlPmZ0xzaEdQgf2LgxRCPd7ulWkLsqFUDLD1mBgddYspOrwl+5HFsZs70OQUb7fjptqMy0dAdIZbMf1nISTu6VLvLNPSH4sSXI/E1UtkQoP+b8b27ScQUy91gD/7XTMB8E0nwNJKArmlCOERAZgyAXdI61FniLZjheycDqX/s30iXIrCHz6DpxlFmUlC84J155IHiXrzmESQdw== 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=YHS56e7gREx4q8paDHknZiydjxUbID5W3AUKWBBtIaEVRR1UZr7OlD54wNhuRUmP7bM5yDGyfgOWoeqsJMZU39vAORSD4wY4mlHZuA4YR1F5PYT/Bz3Skgc5ZZqDGxdV21ZP9BqqjmM0TR5iE+cCc9a0uFwElQGGYuGQHlZ/xdkAbwwsFp/CoZHtivkv9iBhgN8f7h7jdZADR3VPOQdsCzks1l7MCGuNdNot+Agted072DY2vmJsQDbuGo94FklJAG1Af6PJLbvNxYFfWytPKH7KvYrpGOWmgYfrS7xcHcbnY204+4LLB9qEJeKJ+OhlDC9BmaudZBQkDIjAGe7Bkw== 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=X6IhkrK3aI7aoVxLSNGz1shTCB9n6LjAqLRaqqpKOfgd1++gXNCFjWbSvOoFwsvirrEDOs2/5W51j7zlkGxd5LAtdMP5XKiZvQj5oEPWlukqXocXwLd8nDoisdi2FsKnSEmPciVsXuu3X4sK/Kk1nAAsW4/NPuNC88FFhC91fc0= 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 TYYPR01MB7952.jpnprd01.prod.outlook.com (2603:1096:400:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:04: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%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:04:24 +0000 Message-ID: <87a5xolzhk.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 , Nicolin Chen , Shengjiu Wang , alsa-devel@alsa-project.org In-Reply-To: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 10/21] ASoC: fsl: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 29 May 2023 01:04:24 +0000 X-ClientProxiedBy: TYAPR01CA0193.jpnprd01.prod.outlook.com (2603:1096:404:29::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_|TYYPR01MB7952:EE_ X-MS-Office365-Filtering-Correlation-Id: 55982121-3ea8-43b5-58ee-08db5fe0a4b0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gWaFhy3P3LeVOdhzm60zH9VXYFjo8jU6Ohmz9tQ3gs5fi6qWUcO4PzTFEZxYW+523eRQuJspf5K2wwGyp1frAQ9zTBv2jJ4xHMcGOiYMu5AsOUJAsON0X74BYvQvgHYHUN1n5Hx+o81eFH0Sidt/68m2EyFCK8fuTcJGCwq6R67xaUNIfDCPTTdrf8/3lp+UR7/H3tNQp5WpkoDNxwoWYF1uqf6suCVM6AtlLuVRGU0jLKJ5/0itNTCUNQ4XOW4lVeKu6rHm0hw3K29T8VBIRcN/Dxoe+vo3lix7ECptEFjaraGrI2RSP3exJrLLEbNk7Aofn0/PNkDCBLqsk4TvDH/UjomZIBheTZLedRL7iPMsMwDw6J0wpkjAVCF8zPnVKvGjiMIE1t6Fqh+9eU6Z7rXD02tM+vBxY+89DSMdK8nOl3WZKEVe1Vofqw7vFP29bJykRw+0X81PJj/kjiZZpTOQx5Km8zMfeHNa79JFwnNnQya7Sp/WnSrdrfYfA4S2aGI4bTUx/UnC8M6uz4J2AbHAyVVrrbD5fuuRnAi3cLg+1MKYTIyMf9+gnfJFZZDVe+tYsq5mWyhFn5WuDASbwWKJAgc909Kgzg76GGjSKOv09ihkkbbl8TWOhqrnfiCO 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)(346002)(136003)(376002)(39860400002)(396003)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(54906003)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(52116002)(6486002)(41300700001)(86362001)(316002)(66946007)(7416002)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +x7rm1RcMPVhkt2uhgSAfIzY0JUhbolbxX13/9ya6vk1Ec72R8kkHYW8+GFzL5xHbd/4SpVPJJp078b+DfO2y1S5K7ZyG460pNnSJ9Al/nd3WH52mmmWpsmH0oolF1KWcrwcX48ARypjcAUxLYQPXPQY0/0Qm3nuchfRl5zralYaLuwN5s1JjW745OjrdgycfPAyxKhuU02M1o5XtY8qwUasW/VVrxSRQB851NFDdjOVs9Eo7V5xY6aCBiAmkaM0dWGXpb7kGu57sL9GszGGXkA/vEG85Z7lrqChrqsC9tiFijS0RLqdjMHcC1tCk+mq8AH34nyMCLSwZJFosTw+LGS9RDPfrVNN4lvvbxcxpTdIhrL7pNiJoSqfokexuvjznzrJYqmWcp/4qHDqdOZNrcOGRmpE7GY4MiSYiwDulHMZvYeErNDJvUwG9v0o+Yqq5FPZNwcmJO9OQl1FULVzfTsfQtKXhwNLu7t7XRtQht+3/4CbIZrwSpdjaKEQUgg/h/1muNraEXl9PXfeYwPCrvvKyZZ9UEHEhwy+JXnTi3nQ4xtg6HW3YyoXGYep7kBMrWqYYfcV54+PfS0oT1E7ybGFFv89prwX+dKO00SMVogks2t4NCynmJIf9t6gqby5UN8dXialA8kxtU6Qux0fehL3HwZzdbZOQfpn7RyRvt7/rrB7NIIgTm64dOMXqW1jmMOqp+bptF13NPE2xQIQjz9gCaspE1hp9yP6b5GZjKzGtcl09dELfzmULLp5cGZrGOcVZ4dNbxAifIJGq4/4Pjp3QKrY3THmRfcqa67KXFBmuTpclQ2PRdBDDJTSjz/4yj8lXfQYwZOSolwwe7jGHTTzQvZuufSJ9+JBQWSVu/HyqpVI5Y8KiUznQOQ9OjfViBmJwAHG1gzdiw3wPbv5nNc7Yb1DYe5zesz4qXp4DUUHvSEvBnTcWpErBJWLd8DMQwj2M3DfoNVEugDtDPeatqR0OxtIhGORhNATc/9UoNifQjFh6PorFfBH0nnFSOA3XpqzGfTPknA7UM3z6N96IgCkAUxEU3Op/IuMgVbv4OXFPXSinaBrkLgdOp+l6XmV09TGzLWgQ7bM22F8VYosckqx8yQgW82t4HpcByJmGmffkEm2LCcPXPK3Q0e224sRItqbpowLwUZzhDmaX7y98IYDFlz1cij/eXOENgSK9gkTNAgIsfRjRPIgqZLOacyOEDcLvab54+Vnc4U924qxbQyf/yJ9vjruugMDrXHweNJJo2FYRu84jg+tIfP23zAethA2F+sIUOrVrHF/s4ofPRDi5VLNLde5Xf2GRZUfgfnfJ8lI7rh3fqjd2pX0ZOiy/GmZtti10hNHGyPm+iyeMDdWDa4jY9HLq0dQvS43JrP0ZD1Q8CBLYiEJCJSPd5ghms6nR7S1pqqbfZkJMuA0EN/qB9uVq+QcOpgb9r9zB4N106SmE/0l7Kmx/xbdvQddQs0UzP2Q/LvvKYyiYrFrvCJx60sYQ+sFGOSXbJJSAa7P+z+24R89JDSZv+tbd20Ln5hBW6XMbsfJ9DJkXNFJnwshxwjuIeKvkOrR5gHEnj17p6RzWC9aN9mHp5RHrp3D/idmMekOzVXlC9lC5xVgnMT6wy2ViRp03PBNXh1Gcaw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 55982121-3ea8-43b5-58ee-08db5fe0a4b0 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:04:24.4461 (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: hfbHOYczDsAb7bq9g//8MoBaRK2PAv8sTdts4qGZe8zdnFGqVFEHTFaH5/RqrKsBVepvRuqHR1/AwX3s61Tj8Qo3kLcJq/7agh+2E4wCsYTG6mp0ulapJRgqzt7jYfeo X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB7952 Message-ID-Hash: IJ5R4QXSWWLP5VG3URTNIBBGNEPF3B3M X-Message-ID-Hash: IJ5R4QXSWWLP5VG3URTNIBBGNEPF3B3M 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 Mon May 29 01:04:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257975 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 CCB28C77B7E for ; Mon, 29 May 2023 01:07: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 D28E583A; Mon, 29 May 2023 03:06:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D28E583A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322424; 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=TWCfPCvTk0J2d5f4FVZdHXgrda4EtRaVlkhKKyvT24ABlZF4wfKJddrEjsU1bLey6 fElCo/IzLGHLcuRZw7/OZTwIsbnNkucVDZixpIGykMu5rsTQqgJXsDTeESlPzobwC9 yUV4zg9hz4sW1mAfLjrWjFbdVLYeJMJqwlPSfZjs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id BF429F805AB; Mon, 29 May 2023 03:05:02 +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 50944F80589; Mon, 29 May 2023 03:05:02 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E6973F80589; Mon, 29 May 2023 03:04:57 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70f]) (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 D856AF8057C for ; Mon, 29 May 2023 03:04:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D856AF8057C 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=jFziqqU8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bvCFbzvvfyyJc0T+oBemvvXJxpVoLykm3Beq0pwx7BZB1pmh1igk1synfGjBf3h1S5OU0IKuaPes9znQgdhvugnFsQcBZcHu8eBmISWepSYzGzvB3KHx9Bolnw7yInXC6i/Pay67YYr5SSpnfGeQK2r3lX1SFDhgHjpdZFXVPnDdiNbHZTChk5j7E0ARr67bkBkVZIDGebIZvkHxSanEWUIEyMvUOt2ZXJSlxPOGN2ZOARe/auzDAk4RbsYYWiZQSP81smUVNKS/W3UKnnO/7aP/RRpDYmrkfOtxlktghDJ6dn0vLzoN+UudwRDgdsi6e+HhNVqlfkTG1HoG8YGesA== 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=DzEHQSi0kvVDSDhcUY0cwhsVGYfNyZgQ6Kx4WcijMBBo7ML8zR2XLnSRShB6ftQdqJwKG+dR/yjcBU4qJXkJ2ctraYcCTYd2OkGhOd915a7dOCB4VWsNIelpW44ypSRItFjsv7qrbTKNgfa8yN7USw5cDgLz1q7cZgGVKzZGc3OREWzCMXtTobyJziFq02ZeAnS+KR5TtbomP1GGp0SQpHTN+PYj0sFrJBrwKEshXcrl9O+tYlmWOvcQmGCrr3SDPgsrWwCYjEITsxvu0yt8NDE1LHPowD1nSDFCQq/UpzdNfguLB2U5nY++WKeK59XladQIbTeS+ZpX7LVJSctu3Q== 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=jFziqqU8EFe1R/6HvKrWfWFHIPwkoZJgnHtbGLOYEHmXADZs2lJpb5p3Eoxki+SRFCWb/xlpgz1D9b5960FOH6+70pXxruAiQPWEGwtP4cZCasx/k9CCueL3leeepassUH4kTbC1GFqrVQNFQUZAw7Kglv1vUgbWolVo+Qdf3A4= 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 TYYPR01MB7952.jpnprd01.prod.outlook.com (2603:1096:400:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:04:36 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:04:35 +0000 Message-ID: <878rd8lzh8.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 11/21] ASoC: sof: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 29 May 2023 01:04:35 +0000 X-ClientProxiedBy: TY2PR0101CA0009.apcprd01.prod.exchangelabs.com (2603:1096:404:92::21) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYYPR01MB7952:EE_ X-MS-Office365-Filtering-Correlation-Id: 32b2cc22-1f4b-4154-5dda-08db5fe0ab94 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P0ZL9qPhwpNh26Tm9F5ilC/E0sdGCIObFeTRxcp3uzhucwJWBM49ppf++UKTLX3gZwt3MQ8l0BhHEiG3q0Fa+C5RY2B82h3tX69ENm3TyJ0Jqxg9RTDhX5UenQ89mJLp/U4eiEWp5V9TONMkp5wpuPOa0TNharZJYzisQSl9yDeV+lvdCTfrlLYbqhCRWayooV32E2mYHBFuFsvl+SNjK7UsQF2G0AXc68zAeH+yAfK6N72fxMeETqllIgBaffn9/XhQiUbr9Zn5O1tJGUz/JOMHfMudQgy4BaN9uhTfTbysNwgMbSqO0VKFWyK5BV1bXzAaCfFmWpCe3E4BX/qYFte/ivOgX1jmFJATZH0Rk6eXP5M4sSwkDqFHQc0GaEw1xGjYlzFgu0DF1kR9gnO5j3c/Zg6BPtRsQ3nMEqRE3VkGHXeZB98YuPjDYBvDe0L47W3+rOkhgn2jIf+FWHJd+fE7vTdqmQsgBeV4lNtvEM729l/mR4YCOR4Dbh1q5662WYoIPoPeBZLh0BZ+23Arpk212BMT5wyMGhsAhoCcnJ6Q5SrhnYN2zrsEHsr+K+Gren7YMPaCkbMmrN+ml7ex3x4d3JZTSGDDojx74sJA/BxlNJTyzHVNIvK/KLxKc/Tq 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)(346002)(136003)(376002)(39860400002)(396003)(451199021)(2906002)(4744005)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(52116002)(6486002)(41300700001)(86362001)(316002)(66946007)(7416002)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fvqs+Mm5OD0YESxPQrLzvSPjoNrT3udZ01vMh+9kIi3vOZpw0w34fP3P6LXPasUKMW1cE9D55AyPhP3w2XDPtxDE5VyEsPZAcJDsmf0GHAEfMPc7iZ2lDEJ0HbqPsHYGVIjt5p9nMZf+BX0cjYHvJ34m0AMVdot4ku82n9ud3aoI3LNZXM+WuCUnu5Gi+veVkdnImIwz7NCFdCnnhFKySvymP/Bkn0KNhF7KkwskcJ80YBVx+1V1nV5D7HD8700tv8c0Mhto8+nRaTfUbp3Aa6cXQioQ32SsOZT3utdWC2x3BPy73oEl2HGR8o0BscpYda5jBjklBwbMrxWCIH5P3vhxojBJtJh7IammNO0ax0wT2cOdb0MBLFxliLoDgZLgc1FzUqofhhg44pRSAR4Dvx03i2d/h+ClDYqQ8l2hIZa9MVqyQTILE66NCXvw6bocnuAP3+R2w4MJrOw3XU8bulMRi/a2QKAqq3hoaehyCR60O95qIyNYpbcuVXRfzICwbh0fvDZxIfdftlnQ9SWf0Kb9LkEzVG03qNOzkbJcMFvF1GWHqrHpPr3dsJ2WknmIz2PjPTjBllv0R2yHoK6bFAYdoVMTeC+8Dh2HunhfU6R7h6ZUSBsUNQM7lwUAqehMuGjjzJ5YygLtrDqo+bHW+dL3DqgUOzClX8XHBblLEdklzPAJgbz0Jkr7anJsocmugPphoOXoMxtL8RFenG549KBPDmh/MpE/NtYcJNpKiMAZ0v1kZ7xmhvFc4ja8EZ35DXNiXE6MM5d62InR075vCVvCYHCNihnrjB7I1fSO+JycbEdixF9Dnpp28+2CNdXcfLYS69TfZVxSfdpjDj/kShqPwij3/mXtSAOIsaLaoQREhIFTtZD8dZY/3Tf/5GaimNT4fMdqiPvj9GNkHbUGS/uQAujkGdLA5y45dYZRT1pMiFb4jcTIyJupM1RRYXE5gxg96+YDuyizQX37ZP9VIj/kIjJRlog0hTx4Ph/dK4zh1BHOhipb0oU9aNrIgkIE8xzw9fYaZs3yMCZHsAhu4F//iTUA5DQg/Wv6dBJglUgfHXtVM9N4vjnT/UGfqBsI00Q9sgJAQb8mMkDRSLY8gaQiAlBYnlrV/ZGsiW0N+a/+FpI1PtQFj+fWyxBKXRDMBgH0bxwOysjuTmwksD37pXtBVtlWa3xZKVDYkfdaANDrW/qZ3ZmkiCXO+wPqW/DnF1yPLn6AXvyGhAn5Ozkh+k1ugKGYbRADsUGVLI/s/KErYzPR/Sy5qhierqX8AQGXZiJ4lbaN29PDbfT3zR7EuODsF/RuOX7dhI86nBtMSAfVIWI4/FBikuz2oDJVjUXqNQWYLH/YmJ+QugjxLMAs1GW7HKXsxn+0doeM0DZ+y8mH6vXeUCa2OJhPdJXiHsAjXdYzaOFMBm78y2/E4axCYN11ZgylMTsRlnkjA48pIkgmoGhIjU+i9K19YIeHQuZ7vtFjCZy/vhX6ra3qdC1f8BLcx2RY2H0sb8KISfsCPYNDB8w+PmVvOmNCKP1/3SfxsgDtg7ufmeL/L4MyJ0ixPuOAO492S9CtyRqh5Dd+jeVOnSSIfz7/mGwX9NZPjO3Y8NgmxNoisW/oQsaqFD8VZ8MEfsyZRaeAFqsQAXNcT3k= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32b2cc22-1f4b-4154-5dda-08db5fe0ab94 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:04:35.9728 (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: JJkNo4Cgoph3fLapYtMmTkkMQKd4o6DWtNQbEmfcl5X4D82kua9N27TkxcgH4WAVpPE9hQEhKkSkSYmWb4f7HK4UezjAf7KfHn23CsBYCD1y7Pt5kZc9IRpY8l2Fujck X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB7952 Message-ID-Hash: FWNPBAOWNOGYGJWF75OPV2EM7KLCWBZC X-Message-ID-Hash: FWNPBAOWNOGYGJWF75OPV2EM7KLCWBZC 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 Mon May 29 01:04:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257976 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 B4E0EC7EE23 for ; Mon, 29 May 2023 01:07: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 7FFF0857; Mon, 29 May 2023 03:06:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7FFF0857 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322435; 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=ffLLuKD6FZRflomHYaHDsfDikcBy0MU+DnWymYS643iMdhRJ4AFc1sP0YW5vQLje4 +XeAIZdcHIOsxzL0Oz63BAwaR5Wo9AZvgwbA96G4FBjixzhNmOcAi+ETR+mGz/D2aS TnBBgO8854CD25iO/AkYeuFb4UQCbn9lP96WCqbE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id A8CAEF805B6; Mon, 29 May 2023 03:05:12 +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 2004DF8055C; Mon, 29 May 2023 03:05:12 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6C1AEF805B2; Mon, 29 May 2023 03:05:08 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070d.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70d]) (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 9DBF0F80557 for ; Mon, 29 May 2023 03:04:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9DBF0F80557 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=jPTy+KnH ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TXWNkECTIV5Bwwdco1Z5tO7nUGQwUc+R4FySMvAJpQMlOHHQZMPq6lq7HhaVhvF0w9rVWgLbVJcekTnZEYb5yIryxMNj2ypOn7glklI4kSzmnOC4bmU9sKFa4WX2UnNU8R36mxP/a3GKDlJIydJBZcBSeUxRRIyPhWthk/sKHdMeok4JtEzrcdZKwgoMEtAavW2ZNchRYy+29BhvZPpU0eoDIIc2COeCCwElCIz8R+3hIJU7EuUs+IGr7evfWWQhfqedfrQNZMobQ9HC5XcxuEfEC7plpEo4H17l1tkz5XFmkCz+obS9Uq5CyTsA3UTbbTV3bDm5g3MW9Fi5o/olew== 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=Uz5eonhkc1MvTCnijJa+bk4VLJw9sLgE7dlaFE4gz/1/OEBNAuZMu/bsJ3CUny3eaPdNsrYEnP3lB02vvKGuUQOuP5g/BCGZG528WWic3edLvc9R1V2V3xf46sYJcYqooil6ABIVE8pO0JwzN9MH0hwDjSYgJ+zRlaBZnqecKYF0DFzRLOAI6fshYiDf5Dmtvf2eixa9astInpKZ4xKBCdKn07tLoWgKDVjTPU7DOfM55eqgaGtfYVQKs3yDa+0jfDOcnyPkaEXhONRupPD1VhcCs7IgGK9bbKN5G7AuAF93iqE2bahWcMyw9lCQbuhRur5d3kFn6u0lBVG6985RlA== 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=jPTy+KnHnSAob1n7kBM674S8D4EX1Vfit7Xd/Yk42grEuvpQeWQD3Lr3xahdL5XILdeYyyWZh54EnkD/QUOFLpC9QUpjmALpTsXT2D75gsRW8vNf72p1jCVontpZ7EypvCLeA2tRS5wFll+ja6z5zFkM0ir0dJaOgy1LRWxCSRk= 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 TYYPR01MB7952.jpnprd01.prod.outlook.com (2603:1096:400:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:04: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%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:04:50 +0000 Message-ID: <877csslzgt.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 12/21] ASoC: meson: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 29 May 2023 01:04:50 +0000 X-ClientProxiedBy: TYAPR01CA0007.jpnprd01.prod.outlook.com (2603:1096:404::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_|TYYPR01MB7952:EE_ X-MS-Office365-Filtering-Correlation-Id: afaaafb7-de89-48c4-4b99-08db5fe0b45c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZWdKJ8wZoQuvWjGkTclG4pixtV9+OJGK5s2Iu0p8zgHUh/YYmTBBmSzwlV0ofv3u5NbTP6RbaB1ptFjOlV7Q+to4677JKZek/ExHId4AsH4Sl5JUCLvxb83jq3rgF5pCYEpIHF9D6+buPXGJmNoOCvxdTE0tdh/xmRD98KOQsC5uo70UzM6X2qUnRJZ9lCFTruwrXDiccogH6zZXWUDKxA7vgZunOmOP9nQqOEarL2ColnmFB/VNKXL6/fihHOidCbfsYI1vzr5JBsumr5Ztusw/rIEKaESzvV90SvFELeTS2GbwAfQlSiGKvQrjT4SQaX3S4KjTxvFaR4bczGHwCSTmxkQG8qoNxFaXTXEz/zZglouxWptEGORQ71vKOR7HxVK3SypNy/cI9bAGEb1CKh7GgrtI5aI1u25U3Bmhry2iyOVG7Zqg2qyvCONMZ71GDi7yL4ATjbWLDLhsNnnMWFUehHosUKvLlTByoy2/lfH/tXZZC825guY/X4ktXooyq8dcwt/CyUJTiwcU2++QwI0NSp+Tg9EWuTJJI6kGVxCtUVLPKnlKMmtJqxXbPgVzeZm4oQus+lJfciYYTolP7wAwpOl7I+MPe/iMdDl2MhWIez3I2ZP9+2d0kPsOBG4a 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)(346002)(136003)(376002)(39860400002)(396003)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(52116002)(6486002)(41300700001)(86362001)(316002)(66946007)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RN6ybt2KvtdCUM+uOkaKQzQZ4HVPLsnoJDWNqfZz+A7ud8luARpm4IT1Tesh65q+qto2yzv4iUDeRRjBhfpgF7+c0qyI6smRCjuPANTxe5tF99ecLo9P/08Y3BObz0y3NHwGARTJOzUoMYXkAJ0qiZV79iDShhuAzX0Q0452cg+gR2VLS2GDaLbfKBURFWA7cBqNIsquSj7y8nZwE7TUSjrzHtQhf8Lr7IrqyD8SWNQsPyVpsUI2udRw4m4V99XraY6+DkF8yP3ihklGun+T4A18ChZJkv5DuBUNYNaEFGU0RTF8OWBhOyuDfx7b7GlwbbqQnK6oQgh/vc8nS7Ris2vkuYVzFPUzOE42rnbZWpO7JCng0fzgls6ArhkfXt9/VaN8+iXMrfcG4GqDpzJHulhWu/MEfYyNAuONKQLnYPTq+FYY0WoiQD1LtQLMv6DE//Iv+fMGO9PhZvuR7/JDbFmfEm9QAhJ4GOPxfN9wO8nBzytvF4SOnzUW86rozb5V/PCv0llSWm6gZ+P8ZYODm//rwC4S32NcsppjV7+z65GG1KAz4ZG5LsbKvUFPG6Y4uYpzDm5gXlKBkfA2tLNokidAs4OdDxvbdXJhcmIBpyJ1O0MhaYI7baY8/It7VgZ3WwYwtwLx04sQVTSA0zh/TE/8ybaqAmFt23cAFRMf+T4MEA6YFtIcbDWqpeS/hQHCFXBr0wkyXxPWCCieND6suAUAOobn2FHzUcJB8QjkuLmVtWveXJ3MTXaDr/d11gzDwVKEykQ/yQeBitXvX4n0Nzu7Sjrq9antQrsRiLBO5zcCQyZs/DptutkNahfwvA7w1E5a4xfBGeplNaxhCwa0H2vqjYzkgtXL0vP+SuVoKLOHxhsZfk5r52xX6vyzjBvrIHfB9VomCXxx9SyBV5vlScpZSL2/558EBgdqiK2yPmnH3ATpZAtX1gIoR4KMNBXELm5+qRlfV3ngqHX7Z5uXTv9/+RPABGzrdHGQuZXAA3jpMUUaq0QmAJaM0ZdOxR9HCiEh/GjKC8wUFzjkIZfRVVPqlujiZ4wsyme4+Gc0yIskGC858BqMbTi4kcwfcB9PfgVzO/mQ9DXxMfdzMGFxPrU08LqOfvDA2VKyMnNV0aj3ODT4xHg99XvR2Zqwzdea4JU6kvSS2TOA5deqXIY3h7P8MHuEomtaR4bplaPtXBVxhdna7TcGxwIYZPVcIYMawZ4l+BmijpATf98gz2iAB/EiMgrwWH3QZ2dyE3zYbmUxpDtyuizOKVdSWg+PKVI7/wJxAqH602UNE8k31wkVj+DNYmLyqOEC07amPnu41c/jm2fqrXnQN1RQdiVTHkHYhReNMyCaH9691UUegPjxKxWXtDvTnArTvZTwX2lNdhv3GBLtjY26uS3TLjBPL5tsvPFoBM/ySMGfUJ4KS8hOf6JpiQIi2REfUl+S7fOuYd4CPO3TcaqKmfO6rKLdXUSZm0QolWcaDPAsMxI1xnzEhqjmgg5SFkTJSh/+ABH0IVkQ0EsFbbQS9tbBF4mDkP9hDmtIYftGmcDPIlTEnQPDYvANanW9eTGI+vZY0CV49GtCRyIGIwyG8Sq8HINwd0EleVBGTNlBtu1f7VqIMonMrw8m+3VoFPH2EHBV/XrFLnk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: afaaafb7-de89-48c4-4b99-08db5fe0b45c X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:04:50.7143 (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: JX9ZW7ycvfN1YIqvZ/G+rFcWdhqhcZFmbyCBwpU06Z7/LLHjmCs9a2Bw2eRaLaxty9VgLPvp4pU7sjEEv/EGCVfoPxiPHNYO0hIT76pJOOI+KewJkHKqnyi6QmiJUf4u X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB7952 Message-ID-Hash: 4HO5ZUW4FQ7SFCKCJXPCH3AF6K3M4QXX X-Message-ID-Hash: 4HO5ZUW4FQ7SFCKCJXPCH3AF6K3M4QXX 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 Mon May 29 01:04: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: 13257977 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 92DBAC7EE23 for ; Mon, 29 May 2023 01:07:39 +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 900CC846; Mon, 29 May 2023 03:06:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 900CC846 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322457; bh=4RPy0dDdZdLQggfTVQW0tsnOvk/Irshtn2QIoq9etu0=; 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=dENOKIuRcQm/MV8x2eAbLgVAS4t8h8DyYRGj333+ixGRuqKxkCm8AfPxdP/7NG3qQ 7N+HeSsM7dZYdrP6cWqv+qO7zD3S0V53AIPUw4MEPwB9SGnHdPDCVACbkzEWQNc/Yq agSB8kRaTVS+LzgDKAXlKp6SAKRxyPWFstB2kn24= Received: by alsa1.perex.cz (Postfix, from userid 50401) id F01D3F80589; Mon, 29 May 2023 03:05: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 634D1F80589; Mon, 29 May 2023 03:05:30 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 92899F80557; Mon, 29 May 2023 03:05:24 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2071b.outbound.protection.outlook.com [IPv6:2a01:111:f403:7010::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 ECA83F80579 for ; Mon, 29 May 2023 03:05:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz ECA83F80579 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=XzPHZKkE ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JfvWGWSOQc58yyaarZZllGPydx3doIgWTIbjN1pvVlM9W5ac/kcourybwlpksaTUI1uYql3gRKqQeoQnlEpPl3JDjbxKm4X6Br924jyTJa3xPJXJ+RQa+Hq/Xhbo01VNgESDBPV+z6dkNiUGnPbdxqXcGsTbDgRaZmec3aZLnxM8pBD0qhcrj58x7FSmHiRsBLNMY3gNZ9E/DOFOReTdCZ7+CM8rGZ/D13JZe+SJYOWqlxFms3oco+3T7g/T4JPlIfSRGONbVCw4h4vjncqj/oyD2V7NjETHlMlw3SOoB7qVwkEcM6VSrCyzx67KhnZCDHse6LiNcao6uFoRQxw5Lg== 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=nS23yPI+YuADLQB4NhLFWnxUm7aKnkF0SlrBhyMY0MQ=; b=PbS31PytH9qNbSLrKlh/QeYyrSgdkjbchbOycu+05h2HjOC/Ee8kcZDb7kSrzBHsOfzmvVcjsjgQ4KRyzXFzfLTphl9zNpyDLF5cyZVcMgofeXN5WJAY960+QgnYGnXbw6smY92An0YUntttSNn5LU/sThMpRZ0mV6aFDhvzYtDpd0Id1MeV45ppnL4nh9iOyuvcVPBUu4IjERSqAQkIBfHGRN/Zt4rzmXojIibSFedk93Z0OlFwpFR6EoegFA5jE9cCwhSMEF1SpTc82b+kS2C5k7hnbHFWSvnnSuyHmcz0+Ax+6UFobFOULxUY4A64uLrzjw8Or/55F+QPDkHHlg== 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=nS23yPI+YuADLQB4NhLFWnxUm7aKnkF0SlrBhyMY0MQ=; b=XzPHZKkE7PptjCWqPTn+s3vSXKn3H4xmPhG82OjcuCklumGqJ3PgyVI+GdW7WGlkryqOs+ipkOWD4suG+inFFXIj8Di137bLwN7uQ59PiPsot7e/rYbCyJBnVwAUw9ygYVUpCNw1IHzAvGmaC3lENcTteqUuHlr2FgCW5iX8fz0= 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 TYYPR01MB7952.jpnprd01.prod.outlook.com (2603:1096:400:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:04:58 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:04:58 +0000 Message-ID: <875y8clzgm.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 13/21] ASoC: Intel: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 29 May 2023 01:04:57 +0000 X-ClientProxiedBy: TY2PR0101CA0021.apcprd01.prod.exchangelabs.com (2603:1096:404:92::33) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYYPR01MB7952:EE_ X-MS-Office365-Filtering-Correlation-Id: b4fade02-b825-4598-d756-08db5fe0b8c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l5lyovgDYgVLqacWYWAyEFlipQKtGj3H/PhT0sfpL+fhQYc2gN0vC1A03PZUXRdV8VXIEHcbSIAVvyzJxKykIoRD5TxXxKIHojIonjBtrvV8UvEScuA6ViaksnsZ0C98u2k82HDa0HhTd5ETtFaOgDDCOBMPXvtgfFB/IltwVuYIaunOulkh99upydnFUuJpQuPb9GcPFUqafMMQeltg8CYuEv388vZB1OU/TBHE5W14k7XA3vSduIWMKD+1K0vbUqNLLh5P/OvNgdIDH3TcNx1d/d9yjLD7ngL+Uoey4l/tUomgVlh7cDzYCjKdlyq78BvxVp+YiWcTgVvC9I4oYokvrXveqTryFjBvXkvOUtSzj10VJQVj1ABsmjkO/6+D0Wn4bErrZSEmktc8xb9ahbCyWYzfU+QS+SquIk3Wnu49l9HWFMVR1uq3CNbWhWOTlfDt+wBmXFUZhF0EKd+n2OAgOl1gcB/1I90iUnaieEmN/6MU9VblE8rRinTReuLCPInAWcL+97TNYxI40J3ZGbca2Xz1DtObMK1XF2gf3FNWLUtsT9GbACDLaB4WslURGBJZqFN2MReB9Y0qiPxRKXG40FEwJBZtsPdN6T5UZNv4QaEH+E0T1zF8WBp3Lv33gUTaHcWgJO5atrOmyCGX+Q== 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)(346002)(136003)(376002)(39860400002)(396003)(451199021)(2906002)(30864003)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(921005)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(52116002)(6486002)(41300700001)(86362001)(316002)(66946007)(7416002)(36756003)(66476007)(66556008)(4326008)(579004)(559001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uOK++ijh0btLJ70B6Z7mQvRzd+4PQYIN6KCwuf8AEcf90HouFqMvi/H4zfdKGcxfWJrAsQEK3eJOQi0UOb7dD0o9ReScrwc4mizamjpBk8eaRAsVCqm8VSnWo0wl7gAXEwRPqQmQGewNG9wODvrR1yZIUVgasu/LJUwjpgVAyynQps3c/yYe6b+nr5aPzy/RQbc/e3ETSCzjdVWQBcyDqWx2emX7SeSc9c/J60As1Mi8Q/F0zyEOky/R2FYfs1RfKi4oYKLxy2xDDODng1njNiKJm59gyRVMi9B9NTrsH00bEuQ/Tt7YE3+aSCzQVe374pZ9IFJjXnl4t7iNbpRrkbkelZWEoQi3D/KyRbaxSTZpHjN/dwWYX1xwNobQwYnOReukeRZnqfn579X+iGUgRVnrueSiqPWnWam7MZsA02WjmGsNOSJXul0cISSkCd0is/D48l+j+sXPjVaeDTtAAZ5VKJloyFhFqyyWw5bJHoNiJCForKC3B7shXx6gJO9jf7kVOlxqZYhgpK7N3V/D0IgR8tnbAQN6AKDLekWsuyscqu+qIgOOfx+ccB20c9OYY8r9EWxHGX2rLnRl9bYdLaxqLvqijFirUX/eGbA+0e7P7q7CPY7sEae6ZJrjLiazAjoj2PbramV5kY97e4b1CamsztD9MFwCqfOxO7y5bOjlhDcUhqrHtJL/ueFNdQcLCN/Z6k/uwYB0ScMrq3LMX7IkKwGOScFX1nQoZ+M+wMM7on3HDqpD9PX7Ev3MixAtnyg0qkLG4LUeB2Qlcf7Xqa2pQfFsFSDG/pEim0K+k30FL3hxsCy16T9BKYCb+dWELgiNcZKFuBd0J0yPXmEyVycaVgApub6U7b+oKX1HQJIYJ3KJXshG/HKSjQmGXUqOk0aSxROwzyjNMaAFXDpcjkCbw6srrKHvkZqCvQ/UWkrtqexVszibX+05rE6CZqk6bzjVpl4yna8ThfYOdojncjWc4DdnsDAo73Yzh6HTBJEtUqvt3QIWnxvhpC4D+cP4BtR/yWYdeo3MbNi/H1DOi8h4A9vGUNhnJVzmLOwHF2kpupJExCUIbaWVeG3qq70wnHRV5dkejYgSotcTe6FQwn+AAuAWM2YF0GoFASaWJyap/JV2M91RZQKVF4CEubnejnzJqDUnxtGWrCLcLY6KWlVqNdSJq/7aw4Mh+e0g0YTdSaP1wwXAKSyfIDDKL4Uu3qh415LC72YC5kOy+7W4oSWzj7LLe0k5F0T0f5mzwfWA8/X0+rx2LZXgoA+vJbKxuBIbXirOzBUwuVpbve3nErxf6lYBdFUv5US/qGKozAyc61EcNk1Ki4JK6v3LFHZJF+adHLx60vIyAr03jY7efvgKx0JPRgAwpsBPzsMGEjlDKyAlNwyAu3ubmUuG382AiZ6aw5fd36qEkTQlt7vpHmkIfCf0MDO6yZ/w61c8oxjtSRvsY1nOvEJaqVqaow7wSIi07vFi8NNR3YKEioegrOtc/POELx0XIySDUR00jmIod7zYs1BWMdvH3z2zycP4TsqN7wO2ISyPhvU4F6tSD8GCCOpu3xfJAGxyutUv4HKQ3oupwGIVCSrzHDTlxNgLJaaYxx7tYk0pSl9OwKj2NRS7k11pyS5+nYzklkWY8p8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b4fade02-b825-4598-d756-08db5fe0b8c3 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:04:58.1585 (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: VaiqXJylMXNLWrsTm2tp+lqfaWTl9IN8lt5mfYRjcAzJqXZ6YcOvvYD/yrYxx44e+DDWgFleQuTKDVuvStd1w6EMMvRjBoZnt2XM79ZtngsRFxkBT+jAmQamvUJIwt4Q X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB7952 Message-ID-Hash: IP5TMAPWKCAM3QCMSNBXUIP3C3U2VDIM X-Message-ID-Hash: IP5TMAPWKCAM3QCMSNBXUIP3C3U2VDIM 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/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 - 38 files changed, 206 insertions(+), 345 deletions(-) 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 Mon May 29 01:05:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257978 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 8C11EC7EE23 for ; Mon, 29 May 2023 01:07: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 883C3820; Mon, 29 May 2023 03:07:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 883C3820 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322476; 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=IKfOfNqqD1n2unZIuIBo4rRgLJb7njLGXMAuSJ3eP03DJXAOHHDXD7sNWldg6sVgn Oa2r6aOk3V8+NisjHXals5JaISnQvYmo3ERi5Np+LiKoN5dFBLO9+H/551THrTWFYO QNmLC/0G7znCrdaoOj37zLFyRYpRBwXffygOFn6c= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 61850F80557; Mon, 29 May 2023 03:05:33 +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 573A5F805BE; Mon, 29 May 2023 03:05:33 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 45CF0F805AF; Mon, 29 May 2023 03:05:29 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072c.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::72c]) (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 5FD94F80589 for ; Mon, 29 May 2023 03:05:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5FD94F80589 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=iWrXBpaS ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l8Wl0z5xrqOpI+oAmSZoJ9kM39hxl5Vb3eWRZK/2NzAqqwQn9f9fUwfEGwZOnVOK1fU726lFGum4RpkTjxnZymR+0bzZuaVuPgHWjbXC8qna1V2EyMNwADfZ4gPRZ2Iu6N1w91xMNJ0o5tM/PzlFh9rWE7/v+6jWPAGwnutA/M45fCpzz4c/HLxsYafSySYztYu0NCId7DRZyjiy0gbGI+I653brOBc6ObLX5GrLKSIpIDAS4losqtVNkMzgcfqawAr+oJ8ROD0aS2MSOQNFbcH07bQzIDQ4NJYoNrk+eNGGyJhSJzSxnN+x7O4D+JdB+FW9Ct4OgekymZWVGANKKw== 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=LQPHroZZ9d1AmfRmfCi1V1m6G8NOyADQ0DmRBoeJb2MoDt9zGXo4TqVFtSSEQADGyNQ1p5AGLLxB7CwT08Gxq0yrbrr4xmHx7G8ORhWmcB4uxtviY68tzJbBuTJwjwPH/VYJGihCIxEe+4TjlFKVENdj++xwPzijLJvxnFrJE/auPxeqBuxcoD8JCa5dwq5yXh4GaiQ6a4sBvkodTcDx2wyRCqI0onFZnV3fzt27UaeiIJ1dR+/UQM56Mfzc7/3MEGQqRUfVL+rpS4W3IV4J+s+aw/XYWTKZ9fDkK+KaQYLLRIdLEPOVntOlTiIJIhMDungwzG1lQJQwWof1MVm1kQ== 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=iWrXBpaSOnXvkvkEUE5AHSjhX3MYhW6OU2tWqD6y6VXi9fgkBR3NUu+Tt8vwLMUpPKbYPWcu17Aw36MPzxzhZAQzdz70g5cbIXyVmYqm+P9NbxwwQ9opH48QDDbH26ZDYDoq6M+/vBU32HAvKmyxRhPbtMuSD/rTNys8jY3NGuE= 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 TYYPR01MB7952.jpnprd01.prod.outlook.com (2603:1096:400:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:05:06 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:05:06 +0000 Message-ID: <874jnwlzge.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 14/21] ASoC: samsung: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 29 May 2023 01:05:06 +0000 X-ClientProxiedBy: TYCPR01CA0176.jpnprd01.prod.outlook.com (2603:1096:400:2b2::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_|TYYPR01MB7952:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a584671-d898-41dd-544f-08db5fe0bda7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1NxmaOoEURYFnlwWITMwru9f7mdXr0uoI1CLtlffF5ca+Yru7LP1LMQhv74mJZ6QcccnYNysCN7lFVTpG4dxAtJE29OSXxBN6MPlGujG04vS/VuD7TNRh+YOFYmCZWoxLZIdCOgwyiMCAv+8G58/XMixC/PSDzZOEc+uRkxvcN/4Iy/cyMZPxc7EILvFxgP8hxXyiKHySAd4jvFtvVVDnmaHuTaa7r4h4ARd8HsM6W4U3Aw1WnaVGwfSHqj84FIskXFb/8H1wLw7X0qgmnfNTeNzq+poUeqLd3qr2mTEzOit0oL9WHqV4E9za/GUrmgeDNgEZf3X2bmi+olu7j2LHumJ7j/OzTwgbaxb8ykPhwc9CqgW8VF/zjRrYGoV34MVS419fcaHTNKkee16x+yZA886IQmSUrTTSuPgkR6fFi7reppDmMmsJiXTLAmd3TNRZEDBwovNMHfGN9cgfDEWML3AkaNlwQ9fkhe4Aauk8BrZaeDM7n73IhoFMOhiBzAWdmlUJYq0CEbMVW/Qfbbe16Q3afcYeAv+N9hKR/5Gv4hR9OzzbUB0VwWvnDGc4czOixy/WKbc1RtZcsmgyWdeZebeuu5/kYEICkAtOLJcMpFk0YSAWeYvu6ti/DZ7xCCD 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)(346002)(136003)(376002)(39860400002)(396003)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(52116002)(6486002)(41300700001)(86362001)(316002)(66946007)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kUYzBngNvXvMlfEaCfuRHQu7luBdKMBhmIxyJLQAhxWazxiI6pJixM4rVv8ntFT8JColGwWNAoYsz43Hx7cQO+6+UJEahjrSWd2q2+p4IfF1EHLQ7qnpKeQGdcUQJpTt7VmDnTjiSviM+tUjAyvOmd19v2wh0mvydpRl2v5Z/2g0naqVuPl2OLPxsHHF/bmdQIzJtaTg2Q6DyXLBMz9BUZ8U1vcAwlikygrG5fiOMYIXAj9doSYLTeQmv2jhE07nZn4hrbi9LdNN4G72UA8PcZn5JuKcLacIK4DuRDSSkpJk7vWXBiV1/zrs2OGW1sxfmIg1FyIabFXS4HHUGPkSUWSbRGaJPP34XcZNNa4eRhDzaKl1XjtIIGQE3picSPcLNWpmR+0eexCdRa0g991vxDF4go8jh0vWvkxnDIm8k3Eoo5PpA41EH8abi28PsTKxxoq8FpEJ741Eh2m6l3W9DGzkxCJWEC44LaUbesDnKqC0BI5jydIfd9aa/NCSWbE0iApBnDDUHBDQODHcfxHC+dA1aCOJeoYpHluKHiJnEBYlPVWpyRiPrgxxojbKX2YqV+R/KeM2OD5L+uXtTiAJCLxzB3x/QMYibwuc2lEVyv4ak6e8ezU69fz2+rxU9VqPWJk+szD+pCUWVCi+IV/dDKILPe4iHIK6H+QZ2x5yYU3dCnDVGiAahfx8r/U52NmGiWruuulzKgeP5HGfyZGx63EOF5gT85DtmRV5NiqAGUH/6374dWpe22zC1aTLQRp+xtUMBBks6Ybws9nLa0POL1QZrVnsZMs/mDejc+mAUIAxnlkY/kReA239Xi9PN8Mf0XxODy5OkzQCT1HrBFqp159v5qJF5EGleUERKbBqI07qiFjd7YziRt1piYXtakD1zMzwpGJJ88fjbpLQVqL2TWYKlg72RFJSYcSuz+OruXrdICxhNSAoqaFTp9sqQOeSbqafHpG3KBTHYm2dPmyjayyEt3qcxQBwFlujBDX6QIEa7HVj6U2zPOKCsJe24t62kpSp9oxU+m25eCBz2ZXSrng0OzgB3Qjr9RMSRF2qrVGPN80PK65knSbmrIgYwVBVlC5K739ihcVRQ3KmtonQ97K6OY04ES+5hNP1g6IZi86addvMzodqRGd1mVXcb3wAyOQlzwWsz8NAH2F+VCGPd2V1UWw+cvWgfRkCQSlzJBHuNITa6MOpmqt5HyFEMH+UK39bAsbj3qOdjRIZrxROaDvsjzLW8bt8o2OETozqx86M1M+7HgIFEnVWq4o0v7RjGuPiyJ57AYkwCIbgNOwpbDOxr6Zvcw1/WD7UvbxAx/qyxx6b9x6LJS+KMWEee2E1ENzwBW1r9mG+fJNmG4O5VnKedXWsXINd4wUBuJtewT9Xscd3si4+NhcX30ePkHF7F01JmATviHyJ7rKbnLG8OAmkswgMkK1BiTMgIO5mLkPJzfkXcW1EprPwnQ7PFMu0X3NZvuadDZKM5mfKIhe/49Vx5vOzbkh82er0Kb7jcmwE3jH3xGuyOJNmTg1Wj5K/idCqhoGJ9htiWAQjSWXP/124rkdXCN9Yyyt02Sn2E84W0N/UtK1/H5XreKdqYkFv6MOcYjvfUA4WDgaYRAgnKJ7PKVNVZKkfGD/tO/ibAqA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a584671-d898-41dd-544f-08db5fe0bda7 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:05:06.3244 (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: hDskkO0zI8VTEq74qsfhwKJc+TNI5PKLeFhSfJd8QQ6xjanngHwY2abFiBm8T+uVRrarnItIc6+TZxKUnSAGb5ssjTCO4ygV1RohhAYGZYrB1cbWVVtS2vLAtq+Z34cC X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB7952 Message-ID-Hash: 4DC7SQRU3FM4HBGIROKGH6SSB7FEAU4H X-Message-ID-Hash: 4DC7SQRU3FM4HBGIROKGH6SSB7FEAU4H 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 Mon May 29 01:05: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: 13257980 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 90F24C77B7E for ; Mon, 29 May 2023 01:08: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 1731C82A; Mon, 29 May 2023 03:07:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1731C82A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322504; 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=kAM7TQ+iai1OKBs5lfPwBc4HBYDABDFXvQPgaInT0PjQIbvrf5JFfwxagQe1XbvAI it2eLEYLxR7ziOcCnyFRXuvyd2ymcN6cIwPltB5EB9WNVkEihZm4v/5PzN78rJVZEk BSWLWd+EdrW+rsaYWzgZMCzBNyIdZqE2XCicK5n0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E5380F805E1; Mon, 29 May 2023 03:05:43 +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 47685F80549; Mon, 29 May 2023 03:05:43 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 24B04F805C5; Mon, 29 May 2023 03:05:40 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70f]) (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 7C945F805A1 for ; Mon, 29 May 2023 03:05:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7C945F805A1 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=E7G+p7O4 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dbuJgVwy+PBRYroLvz6QkfXzPjhqZRlflRrCwmoy076FARmlp2cgUZco68bJ6bFCqQWvSWYIRKCtV4LYWkAgDL7sezIvtULV7vSotPP8EFgR/diQJjujI2lJbZZb6Tw3hJ1X+BKkoop+UBUHQxYT6vmviYMv67gQS+QAPHWrJHzZ4+3zaIfOEKR1mCddo7a++eQ6EWpWP+vuHdAzTNJg+j9QQjTsBXvVhKDND7V/eMinBMqnhE6tD14+vXOc35qDXzymXqZa1OakQhWuAv0+e77q+9xiI06TcZHNsuaJSdRDEslK6/H1aSje+GyvcA3oFTPlZSICcUC8DBv0CAwyKw== 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=arObKf1g8WLsHUaYwwZZn4RCEGrRMr6Nc/mUK8d7aT17F2ShxnzTz+JZMGFNoDe38hJjdrGYRleyqA+ek2x54cLqB/fuNXT/hpxeKHcx65jdISj7Xf+MYVMTEPT7H4qxWyuvnVZQIytVS4v2n5wWwfJOMKVzzbG9hgZtZreCo0ovTtOTsvB/2RpeJDAwgvdTziEcVdUOU3+1fFU0CUiNsuJ6psmx9qy4FrUh0M0bLpejNC4VJWMY8TXddljpQXW6W9vsKubCHOkkmsHdvPNlYH0hcsKHCv/5F2VRpGb21mO2mkoz/Jpejo7xDE1uYg4/aZocJhwiTHDZ3uq1Jurz+A== 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=E7G+p7O4DbgdsFJcosvZtAXLUCE+5Et3QGlwS/wMUjqPqvzJXLgLs/H9ntE5NYZ4HCcTiNUYHNNItK7BfpeqHbSgvgm00035OZ49O9TnQwdBiJ3wAmLNcPUEF9U6r4arSz/xnVKy4hgWbB7O08tDInjmK8XATmEgJu8Gfdhk+TI= 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 TYYPR01MB7952.jpnprd01.prod.outlook.com (2603:1096:400:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:05:16 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:05:16 +0000 Message-ID: <87353glzg4.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 15/21] ASoC: mediatek: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 29 May 2023 01:05:16 +0000 X-ClientProxiedBy: TYCP286CA0284.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c9::15) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYYPR01MB7952:EE_ X-MS-Office365-Filtering-Correlation-Id: e17c9030-a9e9-4736-69fe-08db5fe0c3b2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w8yuIaGyzvb+a4Mob266Fs4GOpYDy+O6BKJ26WYyVAg8MFFeJ+Xc8oqleSRR5KXl3iPeP33bvilQxzHdO953l5YaQfRZGwm436emUm2r1igfGpDHmmsb7ph7ndTnuZe2okMz1Ej13WPQ5sv2A1AiQtqWuBwIQeZFEcf7yznTzHRGXXPxjNE50yRDnPVckGdZTVHRMgF+LpH4K4T10aVCngmhL4ErJSaEjBsDq20O0R6+ICSHSqdZK4GsOFEp/eepJWP+C9JgJL/zBP/vfxehJPZt7r+pvnRmETk9QsHkR04CYu2Dax+BDLUGDwMwVa+9BCOK+//FJyimOmE/F7VsDtOI/Uc+tNuqWHeEbIN/QLbXwFQLX0YnBsJGOQceeG7gAlEGVGEpllWLVVm2/5XFGylwR8NGOwmhz4u8B8G5kFEtjDO/Wmrx5GMxYT2aeaAPUbDxjhUFhddROAtPHwbi6luyvxiAI8rP4tBeJ5nS/VLot7ptEbrFoPclfiAJqP85BelMF2LQTuKvKxvI5Dzi2Hj6xqr2fA+p5xy/mwdtJEQ8GnP27BeiwhS4izg6+Cn5m+YrjkYWq+sClnuYUxGAtoooWgTvYC8x+rmdJZg627yV+ZkJDIoncGH12kMQjNlywhH+Pe3PVq8yFmEfzlXeaA== 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)(346002)(136003)(376002)(39860400002)(396003)(451199021)(2906002)(30864003)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(921005)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(52116002)(6486002)(41300700001)(86362001)(316002)(66946007)(7416002)(36756003)(66476007)(66556008)(4326008)(579004)(559001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1g6kkZfpnoec0ey7uotFdldTlaApzokyh7PQmoc7oR0hAAmpy4eLUuT0OBV29VU4pkDMIFkaLT4aQdldwmx0tA8wS3gyOe5lGRXMbJsyq2omF0gDCaNWrjGIhZRyitUk9pswemxWtbg9Q+tHdDoiZFRSWC7527dkSsEwgRYSFHEWhPJJWxjDTXXWAOMj+1lvh/pRRL1aHE8xArJRhddFdG/bsWFXwgJhazpk6UfVVl7FgG26p72oJYnF4n5anv7fTQUWSetXBpR13QzX81m34PnJ75Pad3Vy6QP+ElHmHfUoaMusAeHrQnyJ71XdxjMrQrVPi6lXAEIowKRRHK71KVOxjFwxaeo32M0MCwLjlF90BU/nwq2T9T0ir7icWpbQcUjs2zAW5gDca5lApfx8AMKOxuJ2sr4jRF4yHLde/LH50JCwH469RzziJgQ89WON3Ra0yChYR2VHV9n8nGqsgjvoDcYrMSGEm+I93yVfRllYkU+fABOAYOTSm4wAvXfZjKyt+7lS3/pDVfZ9yuAv/P1DeSEe6a8BWmNI35qJFcuHmi/Cs9b5NJ10lFzrFZWrdJB9T0U6Fkt6I/xsLgwX6FXdbGMxyVglhj4TlC9iv3p+XaxMZc3wUZz21bjRZo3l/YgpTHWcv0Pn8acWXNDmlb7aN2DSPGNWBLTsT7zWVM/7Uky7jJJmDxKWujYlLBoBfrfhBeAfdfNV9C8EDXImUTufInzx2v4v6UoZwpE2KjgKOOOPENq96cSXu5Rid8Eu1X2SPp5TrMYJHpjwOWpCSXLftGK3O/gPSufFuD6qZX8yaBTF8M7qD5N1HCj13U+p/V7x+IubuXvKLf9v/sFb4m7LOHlH0MzM68lhWh+K9mFuThn7FltdcQPyIQDshFM7OPo/bue23naKg4hddnIS9GML5WOrhRmJbGwYnPa9CNdXILAaqX2S04qM/EGpHtiOv4QzyG/Kgk/DtxT+NfNv5IEgYuF3yrQFE2rvAS4iQTlZJeNe5k77rJmK+HPRuEMymTDi0zvnM2YsF36TgCbgZEHLdt2BYa+L6oAWQkkhH5lnVE6953UGui2mX32vs/96kz6ad67IRLoMl38Eh03oS5GirLKyfvlHkaD5RxjC/VNc4o4vcI92jMmPaTwKab2/3nZDgAd4qv2vl66oluMtv0Ay9hIN3/nfEnxUadvloCVG8XReKgyhaa8QAubQejE6gWKQr5PtGDh7y5eVACc6zNPX2a+pm0s1GiY3P2x85jMsCPyuGdm+QwjTdDiSZMRZ70SepDKk2vYbv9kLZn8EDZ3xD/a1cc603WCT1V3/6laSEXcddQeIOOh1OaPRI/jAeZmMnYUkeRRR74PFSTEbvR9TL3yB76MMecmLEJ3ODnQQDECx2gCjJ7aw3tz+LqaEgM/4XmNmA5CTWSbtAIPtxt3JKADK9pZK3MhdNW/iQDyxa9UyaVo+lxLIXXfmtBeFuHNHEi+i7UsMTXw97JPGlV5zmzN0oQZZcS1FnGVdyfs1J/c3/9QcSMY2HCcsEQkKzzv7jxalRCiJZJtK/4qJtHzp2Z65q+9METOKPzLPtMjJ3bEdClnSbLD6QPILiJUzFDLawDoB1nRmjhQ4qBlcZTa96dfk6gAZJBvaE0hl8iA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e17c9030-a9e9-4736-69fe-08db5fe0c3b2 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:05:16.4655 (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: qLkPEFKAvHeR7Ooh1L+WoIhfQpgS93ATHQVhVTDsFd6RXNpP4hZsmBjC25bbmneMoQWTEOzcwHQzmjahUMoIgmRJdks3p3wmeR7H61S5Dpaa+Pwe+g2my2wbYo2SNeVh X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB7952 Message-ID-Hash: 4L6ZQRU7JD2T2ADJWYFQ2WKQYN3DO5IZ X-Message-ID-Hash: 4L6ZQRU7JD2T2ADJWYFQ2WKQYN3DO5IZ 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 Mon May 29 01:05:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257979 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 06666C77B7E for ; Mon, 29 May 2023 01:08:07 +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 931B9825; Mon, 29 May 2023 03:07:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 931B9825 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322484; bh=YOfXMtp4Xd7w7VTZDZzK8IKEFvxuS4daQh2h/u3zUAQ=; 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=bLZeU1wwalvemRZyTAwJtYuWraD0IpZ44E/gsAB5pvIHC9CWD4y9HerNcyCuWnim/ BlLz1l/9wP4tGfuYMnHP2ZXB/4+4RMfT0KFNthOx9Anw/f2mgWrZ/k1VXGD2vvALcS q7fYXxaPGqNePDtxUQeZzUESNQjCN0Q/FU/bMMI8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 37250F805DF; Mon, 29 May 2023 03:05:38 +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 D7F8AF805C8; Mon, 29 May 2023 03:05:37 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B2B50F805C4; Mon, 29 May 2023 03:05:33 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::70f]) (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 8A4A7F80579 for ; Mon, 29 May 2023 03:05:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8A4A7F80579 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=QQnSsitD ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fQhn9leLCOK5w5/nQL8+iWqzCoMxz5XW7/+e/ghJ7HFU8jY8Xn/7gbrT1IWvLbINQuVxec5HxEAjAQefHdyGoJnlA6jseZODRo97pq9xSXobE1Ou+UIjeOZYt5Plv6CA9SzhbXeX0KF2hybsEB0SXlKSeUmABkfuePQ8ly2DXQQowYSuq1pUglFZzOPEJfvLvpd/aWsDjgeOBGf9vOKpRCxXyVmBbMjrF7kCuAjZ+I46fT3wDujZWhNSmN12J5nYgk18rBLaL6hDm76PNp/ePVHiR76teXfOTNGw1uR1+SLtuniS3z/I03oFf1N1x9yXBZO0cR7TXHUIB8dwhhZrJA== 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=L0MBxES8G7KqJnqvndkCwJeuWMPog7wEcaBC84kjtAg=; b=c4Q4xswICTYkwf8GDuKQ7yDRQVJ6Xi6ABWOcL2JtGBhjX2/3iWUKFwBxD+TIxOP7CilyxGSeidx4TNzLXSnSRL7gbHIzZXRjYUVzTQAsaL+AGjuYUqFovpJSIEZfs1qDFuSXjxO45CIPoPYe/TuLEz85ppw42hgydqCqCebWE3F+5pmlkmkbHwOrlZvGKdThpcIUtY4ZIrv0IRAgbp61Cjm3faLvfkaJmKHqpvOMmPo1PKk2OpVwFplyytpCdX3YQe52g1sFehMTY5pUJWajUU0zpC3scDH+A9+KOCld2OatEbrPNHEctHm5Q7tQpW8CrSr381p3J8LYlwv+1B+eDA== 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=L0MBxES8G7KqJnqvndkCwJeuWMPog7wEcaBC84kjtAg=; b=QQnSsitDnUzqAXhF5+5I7QRKgMfm4TZwG8Fyt3NmTR7imeMgIavku9/nMl4fl41cuxlW8EKsclbJGwGKeeNouLLzlDm4PCWDP5XaBZoRD7Zeg2YgusMuwUxFwUQynmLaflt5PNRDEF97vzUm38fwMgv4A+uEJTRtY6GgiN6TYT8= 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 TYYPR01MB7952.jpnprd01.prod.outlook.com (2603:1096:400:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:05: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%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:05:24 +0000 Message-ID: <871qj0lzfw.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 16/21] 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: Mon, 29 May 2023 01:05:23 +0000 X-ClientProxiedBy: TY2PR01CA0022.jpnprd01.prod.outlook.com (2603:1096:404:a::34) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYYPR01MB7952:EE_ X-MS-Office365-Filtering-Correlation-Id: 43ac040f-c5c9-40d7-b4bc-08db5fe0c83d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S5me5yYqDOBBzWlYRdkEmF6lIHDbZ2dAUROlXFTZRB3qk4gc7itG4M3z/byPCB52MZgVh3dGAf0kim3UNg2uFF4P5HXdRIrw10fx1ps4Df/toDlnEsCl51gLpOA4E18Z0v2kYWpVKcwGhXzuQBx5VKdh67eHq4JWNKgJGVYlTqwpeW+Poy0SY7TepM6ftZXTYekftZkzFdyIn3WUBx4m0ohbvTIpGB1+BLiacsx4FxjJk9q9tQacqLV3pZSjItRbpp6H7PbwJIhhT+anr1bycs6qdj222r6shD93izKtLg3YVZdLfXAeEt9wYRU+1IV20NtdKeFtGbCPyRi0C5L0G821GJM8aWjDs+Lv43yy/9jo2L4RxoxLqehOoQLpuFUgDpof+NUe9A0f9MqIkxeNwDmyaYAcQt5f0jwZTuTk2L7exFy1A68cEaiElPDmLoXB+0REvq3p6jxAbVRa7EDBzD0zMYWc4ydbyxWJxwVqfwzlpYbgPa0Z+Te48EtY1grAWAEye+2755QE4d/lVEVthheRZyOPeXKqliuZkwURxshSOmV+c+bBtqtWt2nranro5CSCtBDbkU4KE+ZXsbiocm1Jxu13/Wxcdw8JxQE7tZPJ7CGfJdcuPT9ATyp5YPQE 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)(346002)(136003)(376002)(39860400002)(396003)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(52116002)(6486002)(41300700001)(86362001)(316002)(66946007)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SEWgH0BX7/hS494icvpFagmu5GHO6HDelSz8z6PN83tQtXaz0ytBppLu+engT8evR8cirUd/8X0Vzwh2nEzC4y0BEHFWPU1JtauC6w103NFlZ200H9RsQqP3c9GIutOJIK8i3/dqv/zmwcC2DoQMC8b95Bbe+FZHVcyzJbqCOWB15sMqiNEmfVcJh/7dGmIItpFH0LjZr/rhm6k33vpaPEXKB0ke+vUXBBPDu9K51gI8uTyCRPQuUQ5X5UHlJjj0u1p/LaYcVNmJq3gxdH8dOD/+0R3URCMja0i+3yYTF0gsGAuIFeuicom2v8tKpntxmSEosm3pDAiVISBpbysAr8TQ6OyX4Q2+MEvI6Y8wliTgEDTOAHUd1+TNqMG8c/ewVV+hWBKz7HMfyYfxHm+A7SbOcpsl+Vq1lpGSN4Z1ybIhw/jwWXNiZNrMeIEpZk6brEtsWuUfcISJ97jjjatjYkV/7Cq9v7qQN8zHO0PnyHqzeBYN+5lMXoiS9N7bl/MSFQ0GUoWIdla4lt3h4gC7PRtfzPyrXIjpWl5RrVsUcL5B8F4vWyhggCFyDNRMeAOMZeClIbgiSlK8abubyeEjx4LZJAI/4UJAGhNT40+60u7e3Sy1HF67kL4yjcWkUDGBpJGFXompJhmM2m8JoXv6xmRt5e6p3aQfxRlrzIWTIBWF4qBjxwxR1Z4peaSwSA8JtnYTTCdHOA1CGf+LLk9afLOw6B6mJpEUtstVCPJPV+7aq0KfRctn/G7unn6kx0wZLZKmhhWDpYM8HxbmggnSoVaQmLjt5seOOb3GoQbVjcMLfZT0qrTPPu+d/QicVef7ZN/AnaErZpPJ2V/PI0QNcpEFCo8fAzcYWubLl2oBfI7EghEkJuEYD/6Fb9keJQp4Ai4d6m9P/1eL85clfmI5BhXy7f8iL70zvNQCNruhzylZTaeninuz7SwmTxZKJX53mXrjfG7/nA9yBjvPZSTZWxR/BBnjvluY+i0N7wzKxEiGlDZaxe4xtACF5o/YiTttztojhj71iYf2hlR9gjXZnN/wySJ8nOFFsYFjpJh6gZb8Yqok2Phz5klyqaVhb0xN4EPHFj8Lk+mx6T5gu0VWiqumGoBg6zr0YDncUPCZMXIfBO2E9T3e4VcM0BXCIevvymvM4fh5G8kSwPpLgqaBdChyhAm9Eq/IVVO7ZdwtGVbZ8ofbcVdGzefqppy/wv/vHvfKNTx/sKkVxYxJyPxGSNG+AKUGAXdkoHQ7rXVEi6n15QSc9+w5DbFH0TKAokrPi+H6p+Wq+xTqnCfgR9gAxbBGzxugxuRd2yr9hn2xL1lEXbavnLKscydi9Ue8/Eh8IqYKRRKvT6typgG22vnqy/0MLUJaWflaAGTfx5tW5VsaqmbtJIi2H4mWySfRsaIC6g42IjQbDXiApB7t8DcIuibj4y8T4n88EWh8xqO7KWrOlUVuec6yQf7+olTsk2gRb611uG4wj8pTKiTYAqLvb/6o/GmEJ8dadjWTIYOKgcmN2fy+ug5eSW9Oy/FsZUbPNGzTogSlilTFKbd96Xgj7n4uuHtcqDgoqWCLAq4V5N1FVM386x2rrIYalZQKGbKPIWzscM1KDldShTZcRUOmR3kKz3h/teEMp9SgSac4lGs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 43ac040f-c5c9-40d7-b4bc-08db5fe0c83d X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:05:24.0817 (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: mOv2wtImR30YC000UuYaAVPyoNxqvchnEDSzuJYdlXp/C8u0CLlJ4d5ucEsXEJUsVGKAd/9O0YiMJpL/WO/7YKjxHZeOngNCeh93NeXuEuzFdXjtTG8WK6Odp59oCW8B X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB7952 Message-ID-Hash: DTVVH7THWPAR7T6GOQDICRUGLPQTI7RO X-Message-ID-Hash: DTVVH7THWPAR7T6GOQDICRUGLPQTI7RO 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 02dd64dea179..138f71ceab3c 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -505,8 +505,10 @@ 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_PLAYBACK] && + !supported[SNDRV_PCM_STREAM_CAPTURE]; + dai_link->capture_only = supported[SNDRV_PCM_STREAM_CAPTURE] && + !supported[SNDRV_PCM_STREAM_PLAYBACK]; } EXPORT_SYMBOL_GPL(snd_soc_dai_link_set_capabilities); From patchwork Mon May 29 01:05:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257981 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 47229C77B7E for ; Mon, 29 May 2023 01:08:46 +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 7B5BF827; Mon, 29 May 2023 03:07:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7B5BF827 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322524; bh=NTihPacCARdgs7ZmZ3NZZDQvL2AhsPs6k2G7lqNOfZQ=; 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=QkbknWkqo5No3QQ5ORXpi17Jfywo4mfKl/JBdezd0eTMc7gQDoJ1B5eLaQR0zEGfD PeHR+EsXYQhO0aXfyfUHyfsvHuNP5usjDzojcsx/d+IJL9DmOcWOo581ZdqxNprEwI syWaWZJyg4P2HhJ4SgWchEr1/ZaIuzJZlC0T4f78= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D8120F8053D; Mon, 29 May 2023 03:05:50 +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 CBE20F805C5; Mon, 29 May 2023 03:05:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id BD9D3F805C5; Mon, 29 May 2023 03:05:46 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2072c.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::72c]) (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 BF7BBF8042F for ; Mon, 29 May 2023 03:05:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BF7BBF8042F 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=QDvh7Ofs ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PrptImtx3krq4bQjJaHHu9vSqGe5RocIS9ziq39fAK1hdF1V/rQZpjTxxyUhQgUiDme+XyFUgQ4Q6W01+xGXVjORzkv1E1FVAq/CysvxayO+Va1lmPLZI7X2zY78QJGPIsf/jkGBNQ9sxq8w97k8M9l4ljdQTx2R8FCgWF4Vxx7tHwbg5oZVL/WaycLkQwHoEceBkq/TBF5eFBjKTMosrCVgin8tkHDCC+Gz35P2UOsHLLpRt0STe7WhaSLS/uKimoVlrs7kLXHj+/EsCdlnmt0PONDTiU51fJYJrRupqP4b3wjGRb30ZfVS1VLna3xYtVnTXnaGxIx2rMLb3RDm8g== 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=HLM11tDdg/Hyz22W+hCb+fuMD+nqtJa9WRZyjI1olr8=; b=kLaMnwEVYrUO1s2RIClbuGQ/ZeGhS5Kj6ji5i8IwHPDxQKDDoKngetIe5VOBD5u80r4Gg7ar23b0Hc+cgk7y0sGdTHvQpHcqWCtjXflMb0LMLQMQxIhNrdzfSsMEjcXXbX1MMQe8h6X8xnZeFzQE0v8InxhozOH23sJj3fbB+i9zIhZ12/T7lIJmVzZYhM4HOVah3MYZAdUcFQgkFys0epVQ1C3TcUaCntYvC5aNRqArr7uoQCY7pgh8rM0YYKZ9ICkxgCM6VX8R3oGVEtzQ1hkMpGQYZtLacWwupx/wJj74WvikBZnkIseAttjs9tF1hMPp3O+t90n2xPBPt8nNuw== 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=HLM11tDdg/Hyz22W+hCb+fuMD+nqtJa9WRZyjI1olr8=; b=QDvh7OfsbAsVVLWUtAPNEglMX6+IEKCegxyzzjta+2vOC8lD/yo3NDPWBXz2GBCsBBSCXD7VNC/Dxxkp4FViR/AdYWaAwoNA+lWmx8r3sJQjBl4xHy4fuZt/iq1WqT5l7G4PEDCUoBuA4X2seX8F/86375IvhIYruwOa6EL90uc= 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 TYYPR01MB7952.jpnprd01.prod.outlook.com (2603:1096:400:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:05:31 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:05:31 +0000 Message-ID: <87zg5okkva.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_Cezary_Rojewski_?= =?unknown-8bit?q?=3Ccezary=2Erojewski=40intel=2Ecom=3E=2C_Jaroslav_Kysela_?= =?unknown-8bit?q?=3Cperex=40perex=2Ecz=3E=2C_Kai_Vehmanen_=3Ckai=2Evehmanen?= =?unknown-8bit?q?=40linux=2Eintel=2Ecom=3E=2C_Liam_Girdwood_=3Cliam=2Er=2Eg?= =?unknown-8bit?q?irdwood=40linux=2Eintel=2Ecom=3E=2C_Mark_Brown_=3Cbroonie?= =?unknown-8bit?q?=40kernel=2Eorg=3E=2C_Peter_Ujfalusi_=3Cpeter=2Eujfalusi?= =?unknown-8bit?q?=40linux=2Eintel=2Ecom=3E=2C_Pierre-Louis_Bossart_=3Cpierr?= =?unknown-8bit?q?e-louis=2Ebossart=40linux=2Eintel=2Ecom=3E=2C_Ranjani_Srid?= =?unknown-8bit?q?haran_=3Cranjani=2Esridharan=40linux=2Eintel=2Ecom=3E=2C_T?= =?unknown-8bit?q?akashi_Iwai_=3Ctiwai=40suse=2Ecom=3E?= Cc: alsa-devel@alsa-project.org In-Reply-To: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 17/21] ASoC: Intel/avs: replace dpcm_playback/capture to playback/capture_only User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 29 May 2023 01:05:30 +0000 X-ClientProxiedBy: TY2PR02CA0064.apcprd02.prod.outlook.com (2603:1096:404:e2::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_|TYYPR01MB7952:EE_ X-MS-Office365-Filtering-Correlation-Id: ea3bcd0d-8541-4dce-d17b-08db5fe0cc32 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rHoJ0Vq2cv9/U5A+iRzCdi43aRM4L8fzrag3cx7UMuodnRzN58iEGyfqGO8dunA4P2ifRUkQaUrVbcFxqd/o9Z1LckhcoRwzI57o7ECOhHgdrKGoZJl91yQ5zLVrFt9ottGLx8NLpNS5ZXXF8V1VljCPwHFiOjzi0K9oGutmYmW9OVfZ2qkOfQ5xbW3zQKn1DU3s4Ze6KSH3MRxXaN/zaT2XBh8O2tPzOgSURCkImLQVWVGrgKtegekxHcqVPz2QpDUgtKd+mrl4/oZzAhjtBoBiNjT91GkKB4wHXSxXbegW3+EFZ1iZJJy1ZfgMW597GVzROVx2dZCbVIWyEvrharjOW46EtnARG43031txjZCSwRKhOZ+554HT80RpthyRwHZ7S1GCJhwRhgRFAWsiXQT4hTzHYIkFi24bv7cPJzBzciWl2+i1dR3SCx5ShGbXNCT3hVYfyfMuyAUoA9MsLZ9Hc6/yD1NtUlNTRhr2Lnlf7I5wmZI8/Uy5E76T8NAybplo0yO9xejVWgzA+h6WMtAhu9YtXMoBysvZp7eTjmUUsRSQqR3wxuUDQfjPu/JV91DjflgrZxcoK4jEkcRifANOuSM9MsrQwnw04VWlrQsU+gXfu/I36M4DWPzfJHLCVltG2aIkE4aivS9Tx8kX5w== 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)(346002)(136003)(376002)(39860400002)(396003)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(921005)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(52116002)(6486002)(41300700001)(86362001)(316002)(66946007)(7416002)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Bw049m9eVZbn6mMZRGPJ1uHD+p2ZFKlrJVrtT3h/sU9/hKGdgT53rT8wfGJxuNNMWQUa/SyiDwYm6CSmheb80pR4ttznl11wwD9SF5IamVvVC8ATuSfO+o88iXEj02TSg6nDF3VXImh3QZs0fjf7FUZqWAijKDCvkIN/VkzawsG5mjeE2p0v1pzYo9foGmJSSo4KLu9+MrrzCC5dzFtffPOd851OmKxIcONMPDaTPS6AiFc5S8za4u/uYZMt1vF5v7VZPLpg2ePjJ4OuCk/K+06zJ3/nXHGTkOuPUHgIhnLm/NC8zidDyKOVxBzBNlx2TeGll3ZZ1cyNSIqdG37/XD42TjJMXJHIAT4V/12WmCdZVHxGJWM2DjXPFW/3UWnIveqHv+vjMbB82hhZKvf4HcXzHINor2vB3Q4ytomJ2yb0c1cJHH/mSbvx0pAgHBMUY+Su9oKc74ro66kYUYUHYM6EuJy3Hg5QstSlufACwXcBjIaDFzeNEUvjwOBZNuqGjtMC9YoL0xqpumu72dpn6fQsAZ1FVNn4qaqHil7FI9yBNLFMPCEnYafOA6KNrAgYdzCKGXgCzxtbvXfk+d6DNaW57HOIgoB0WKB6n5Qc69zI6h1g3fjYAk19ojfYdCzNg04jL01tcQ/5Lgpxa1fVk1hJMLuVZF+KAQVaJ7QD5opKV6LG9yp16KSYj6ITp1pzY7PIEMrSkZqs/AewXrFR78BY5OqZ/JiEkl3U/96iqwWZ7WDOmbrXO9iCY0xr+MQZYTOTrsdF3sX2AlERFXCPc3uu7kyRv3fDhb9BMmPT3zG6OcrB8argcjfPtrSGn5Def4cXnFu4P9nTgsdFvVu80kTy1lqI/GiEcEm87Ko2weSSM0nIJZyH94jtbZWGvQ50DnhLMY4AY+sXReQcB4E5e6U1PUnucPGu/PxhhadEu3a+42SDlCR/gNoT9FbAFmuV/l6LV4+CZt5CUVwn7xo/025rcZgM/AjAOzE2tyoFEvEm5//rLfDYs35P/odNDqPS8zHcCxmCvxpC9fGkrhQfYYzcev1GbH4EiwzMlFNEXuwcomAQrdgMuauTwmQhnvXk8xGlbDAnxP5EK17jIlSHfz6vbYA2a8mr24ZqQ6mYd0cwy97NwzB976XM4QLvcP/LBYNWKrxG9jK7MeYeT1GfxFakjjA+nRhtFyAb7oq+Wd/cGh4+KrCOPZ/sgtADrG+tGdtliVSGONlcaBrX1vr2CbegfpnJFOOUF/lt6RFwas+GUKsl1aYp5ntCna1sJ2uRxcnD9Ly3CZ/hFAiKiYWm5jT5cPo7xcvmMu2Gx8/YCkDkUiWyT4gFlzAjvEELS7TauFfIb2wcG8vUdbaaXV2gTqbSinVc1CC0D54lpemRCwl7kTBWOF0zOthyhGB54TQkiOch2TiPtskvkW2yDRyXsPrhE1PsY8pwrL0e/1R7NORm9bzGxcDyNMGH9mBU4QXfP3wpeiV7ISq4xzLebz3GoIUqh6Eue37pU/zLn1nyg+zloHIGvTH0fVxXAeWX+N1WynfnS7SVRikTljdIappyAJdVK5FMOms1uq2t6rpmrazVgRpVFGnlGPg92ctrmhVH5lpU/WkokMUDj8um9Mp5ZLsbx1bKxFw5b8vtDUP2peQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea3bcd0d-8541-4dce-d17b-08db5fe0cc32 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:05:31.1775 (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: 2lrO068Rfmv7NUezZW/3kJCmzKBgNljlaIwPDKxRnmX1u//NaJz8I/m3AFo6z6APOl+EPXnwOlAydFZKHk8xfnWJRisuVJOZdjiky5XrcA0xMyAxIPce5cp9IZ8Bf5aR X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB7952 Message-ID-Hash: YWE3QAFDTITMGLLY265KZSO2R44ZILS4 X-Message-ID-Hash: YWE3QAFDTITMGLLY265KZSO2R44ZILS4 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/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 -- 13 files changed, 3 insertions(+), 27 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; From patchwork Mon May 29 01:05:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257982 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 66C5DC77B7E for ; Mon, 29 May 2023 01:08:56 +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 C3B39851; Mon, 29 May 2023 03:08:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C3B39851 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322533; bh=N/B4Y38hjWN36QyDhxmBfVcYZer2SdQFwlHsfgd9Bco=; 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=Fcph6lW6Iiy98pznhM09K42hKqcv9lVS+tlSxccKD/GOvL3MvixwFPkFxZDxokb3z TEgOdVGCzjhqnXTa5Rta9U/6JQfAgisnDdovjlVH1b0wxS3KXJ8JqVhO+mtOEAjSEa Y+ztLWXHS8mQCn2DoLG0PdF0boMkj2KeaXoKtKyo= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D6306F8057A; Mon, 29 May 2023 03:06: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 F3B0AF805E9; Mon, 29 May 2023 03:05:59 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5514AF805C8; Mon, 29 May 2023 03:05:54 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20726.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::726]) (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 5FDFFF804FC for ; Mon, 29 May 2023 03:05:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5FDFFF804FC 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=p7ts8amz ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UmXYU52Zf4VoInLkot2c7TDbgcRERdlngbjbPx0ilOtOmQuxJDyIOxdTucpkFw/KTRRmdaqhqRwTjgjyYhdIEc7X/SM1LPqFmvrbnWbYsGZ8i0StaqPsjftuieKi1ZbajmcRpKAHgmGrW/h3IxGU22YZ/IFxFa9JBBk4qBYKTFthgRzfQsreRu2NiJsA9+cogQ8o5fQpm9PdQWjJqSdg/KamRsDI6aRCt7qqopYcU+V+yUqLVKo1tl0T61dh1OFdsAvDmQlunCdk2c5tepTBqp7p+APWfgRdCBQvjxeva/ioxeBo2jOwt6PBddBuB6/LFk0iEP+PhyveJdgSWyI8Uw== 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=ee6ivP1wWvXZ4wj3pxJ8Yls6cXQZCmml9pEsGukaNPs=; b=HDGBn+llgZ/F1Suxf8zOfmjADDhMF0YDoESRp8V1HKRxtqCgvL5/uAfGPQW3phNH0NlHFd5adls1DOn+sm3fT7qG12sjOibpI2OpVEPrcmfuBFydM7pakQxY7r4dUaUycFxzsKGeKtxUg4158b7PXPqXkOB1u0uNi5+qsphUVE6taLIXF41bTidqfNCLYPK2zH7L3OrjFDiizbvUe2ug4l8r4wUvuoKJu2Pdcno0/z4ZtpQ5X49+k2Jn+4znp+A9mjA6Kajb0LXYcNMx9ZMrFX0EHTS8KnMgleO1MrbhQarqeBfkaFnDqaxpK0XwmdM8u3p9cn3t90hfwEbORKXJZA== 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=ee6ivP1wWvXZ4wj3pxJ8Yls6cXQZCmml9pEsGukaNPs=; b=p7ts8amzcmGNALq6xkomkaTUzPUQVTjgdTWM5B4tN5R4D1fP5o0d9rPZO3M44lx9mM6m27gWIXOqa28tOjUTK6RM2e6iBsHg9W+4675H6yrcxmMELBAUPU5vW7BZ9gJrRX5AyJRhYqEzbnHvHy5ZUyyNDgb7FNlKLJH+4kY6m9U= 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 TYYPR01MB7952.jpnprd01.prod.outlook.com (2603:1096:400:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:05:37 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:05:37 +0000 Message-ID: <87y1l8kkv2.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 18/21] 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: Mon, 29 May 2023 01:05:37 +0000 X-ClientProxiedBy: TYWPR01CA0015.jpnprd01.prod.outlook.com (2603:1096:400:a9::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_|TYYPR01MB7952:EE_ X-MS-Office365-Filtering-Correlation-Id: c9f4c4fe-9703-46d5-ad05-08db5fe0d06a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZauE6QFccjAtgPOIF5jvdLFLCqH7fm6pfcRvDZazWZwCiDdc/BWqXsZ9n/xR+JlzldqsVl6ii+74widNaIIBPWAUA7jBc47bsR8J8sApG35cSl/smE5xgkDq3SAXrqvUA/TpwBu5b1hlRaNNS5LVaRPN6a76jbiTLZHRoB9p/RC2LOQ65BtlnwwOLgn15o82raG+6Y9fav9j2l1ni3zglLZMchMlDISP70FqzK2aw5C4XIFOq2C0rFzI5rYlc+mEX+JohiVBsDpjovSAMeg2sj0AzyysZxsw0PgahKbqQX/psmPoaY5J7i8xtW2ruKaCQZj3YgQdejvqIX3QIcYZQ4jqoayHhY2xwWeef0gNHNcWCLEgo03ivSamfmF7sJVyhlWU+IzjR5BzZbXIsCyN5OqqRz5SJ2u4OGhhxe/gYBTACX+fkvo6GM+55GeIFz4av5Jf9/x3YKNBzuoLlwgrXw6/S2A2crHm4huw4qd7LfPdkF0TtN+tjNcipgxSWzYJP8Hhshrrn4OpbYZ7irxg5RMTHhxMXqdfg+rc346PV0Hdik36QGBNzbsU8B6wzrYcElFEgQDyYJGZhrkuMua7vMoF3FbhELlBs2eAysEBkhkoO2yPf14E6/l+mUyQYmOj 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)(346002)(136003)(376002)(39860400002)(396003)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(52116002)(6486002)(41300700001)(86362001)(316002)(66946007)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-2?q?+FJEIfRE9a7fMrxv2RfoqeR?= =?iso-8859-2?q?wqS6ETFmq8HERyET/L3HUWeQ1OhoojB46uTKDEb357XOMkcrJCTest7uW6tO?= =?iso-8859-2?q?mdrmXyrVa20E30bWyiur1fSUQ0YxoJgeF+9zysAzFnWbEehHnLgg1epS/jWC?= =?iso-8859-2?q?i5ns1Uv7hc5FpqQlKIg04wQ+EzEjmhWPkDfaL8b1XiPJadXBLwtJVzPr5TUO?= =?iso-8859-2?q?BKfXBRjrw7qf7kftJpu+yQyZqdcm3IqbAhARRpUZkwvH/DQ/P4v0FSj95/Tv?= =?iso-8859-2?q?0JfQs0gda5vwc7FQnCqfAnDAxDEAbCUIj47QUAnsW62CqiPPrYUQTOoVDSxp?= =?iso-8859-2?q?p8qNT/iQfMPr6T3NiCD5PMTqt4ueOBCdCdo8qoM/iTa5FU9kjF4uxV3S+UHj?= =?iso-8859-2?q?VOn07Q4NQPzAu23UXIHiJRxaid5MVNU7r+rv7t6Tjdp+sm8nSGphIB1I3vtS?= =?iso-8859-2?q?HRYovAI9buhjFEmchVOYeKcMcHIm45csMKCuKz4CJRU57WX12JjGH32cFoGB?= =?iso-8859-2?q?KcK0sJ/PLVGnNjqVj5H06Ez1kGBSE+cHcAvGNM2+HsvbspXaPQ8gIshIe1mF?= =?iso-8859-2?q?2syVuAfcc/UlMstjHbJKMjBmqcQifYgh3D2E07LPVwItWK+xpq7Ye5KrQ/s8?= =?iso-8859-2?q?Y7xDnD8PJgSLgppIaOlvPbjY2Fm/jxV6Ds2nCoevYLjkMsKmt3iPBDddZSR+?= =?iso-8859-2?q?v37KeVZdSjFc9woOXJykUyMrmAaRfxCZqYZq3JpxGZfna12FhNYSvIEyFi+a?= =?iso-8859-2?q?BVuCpV3CaeVdMefOUTYdMr4y1fm8a1du1Fk9s28h6rD5EYO82rjkAmhcHOau?= =?iso-8859-2?q?BEU5RYwa8a7GznPZTTfLqfJF9GnM2JutI/Raju8iiYyB6HS59o/aCj/p/RZC?= =?iso-8859-2?q?IFGSe89zcmefgf4I2rUiYKA8QZgCKy9iYFPeE6B7mvAqKTX/rn9VRpAUNrb2?= =?iso-8859-2?q?RO3wq24/dP87l4UkMKwFj28F/bKf0X+011FKBVUHIDiZlsutxWuWM7+DBbUG?= =?iso-8859-2?q?Z1m2dECYsbwTGrdfmjhiKRMOSqCUq3ulTvUBKBRVOr4T4ehrsRtJN0ZnOLLq?= =?iso-8859-2?q?0xRDHcGMHXtXQFaE0tz8CB9zP59vMJzzY1+8F0pJI0cjtjHxlRcXqIANvysu?= =?iso-8859-2?q?PWxU8MmMmyDsnFynL3DyYoansS8KoMxKVh8Uni95QreocTXVPuuI6qSOk1w2?= =?iso-8859-2?q?8aB/BeuG+EIte+QUjdPJv1m7iZs6wXMI9kU8KAsE7Xk9N94B8Br3M5A1COm1?= =?iso-8859-2?q?O5A4AeDqpzJs9iNHIJ1EoPiG8F0vTmnjHKVjpcmWMIZDEM+5GOle+KORqPX8?= =?iso-8859-2?q?cKJL1gxraP2mQ5gI0rE3ddZZSGPQmUwsxeYdRFhduG5eQLaVxnZEzk1KvN2k?= =?iso-8859-2?q?k/DZvTikRh2nY33hkN/D6Dx5zsI/JqW2aHwWXoKm6eU5MLBvHX1GOFQzaBJF?= =?iso-8859-2?q?d6fzfzk01+0zstcouAEDIYlq0p3vpiEijLztkx7X+D5rsroMtw8XL7duWQiE?= =?iso-8859-2?q?/EBamurgSvFuzHdTaTkt1PkCVfhTG5VSg65y+d0tygzSrxs3Yc2xhaMINBqp?= =?iso-8859-2?q?9uC7CgcSX4eEGsLc3FDFImXS7fLxYrAoA6kM14Hi4kH1FBGITYofg0iM1/gk?= =?iso-8859-2?q?XZTBue090Sxz6eayiEYBC52NFrz0vrmUkSeSD0GlVh6kfgJ9B/d3Uob8H5cY?= =?iso-8859-2?q?=3D?= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9f4c4fe-9703-46d5-ad05-08db5fe0d06a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:05:37.8106 (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: kAVFvmY9d5XlVj/kIhoM6IPQdTBTIEaQC+iJCUSUXb/nDktu0UNrmm+FzfGdAUTssJp7V3D2V7JmwMFMPikuAXmdgfHpYTXW24H8lC5I37DmMkUCA+mqN4krrFtb6hNx X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB7952 Message-ID-Hash: AI7FHTV4QCMDNA2SJWVTJJVOP3VPTE7D X-Message-ID-Hash: AI7FHTV4QCMDNA2SJWVTJJVOP3VPTE7D 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 Reviewed-by: Amadeusz Sławiński --- 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 Mon May 29 01:05: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: 13257983 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 91858C77B7E for ; Mon, 29 May 2023 01:09:18 +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 70B91950; Mon, 29 May 2023 03:08:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 70B91950 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322556; bh=YqJpV+wa+eh/1atWvJawt5Z+jctdtUxKrhSoOn5Ob/M=; 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=Ti10ZOCY0Dqdc/MWA5/WM77r+dbJ3GSQRSNYL4IMHYbKGP6FuLPiRW6xN7Vc4Eq/r hk0K681ZugpQ6251Acn6SZmwtVuwihH0adA1OCPMmB6mWwNDPbTfQvGRVAgL40gK6Z MT7ZQrJrN5BbTVx5douRSaWjNip1gRE8Tw5VmXio= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 761BBF80607; Mon, 29 May 2023 03:06:06 +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 898B4F805FF; Mon, 29 May 2023 03:06:05 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DDA3AF805C8; Mon, 29 May 2023 03:05:59 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20724.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::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 CD8DBF80549 for ; Mon, 29 May 2023 03:05:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CD8DBF80549 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=pN1KZ5fW ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OhwY0YeqH6kWJv/dyx3tqq6nCO6dSl0r0ra2aN7FOmK3UunvXIjipqkapQecgwqNX4oqDZ3eA/+xlDb1FpbP9Sin3zwhO5/R3uxetXQrih8aZhb0Kdi73g1fg7NdSiXso3PNF9vRzebZx0aBbHGEO8FDqa6WktCPm9OZiMi6k/TnWZaCi3ily9m1yBBTNZbFNfwLoIA3fIIVzhB7s6XnOOOtu7cy+SBJ8hJ5AxxPloe8BC9K+8QKjaRB7k3RU6SN0pfzUY9bO4QqXbLfp9Je+nCwtCT4J8L2i05+Y6j7XWWFzUErbaxJnyx2mP4EHVGYg6K3vA0FGfgPrcPDSQPuvA== 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=hVk8l+qY3eox022LwdgTxhzFUmt3NGvSxT+SY2a5z1c=; b=ZRNiERPAMrZJ7Qp2f2+kysbyx7j6qvp3RiIUhn9HE0NgoRJ/l6zwWfG23IUai/DUQ37LOV0koJ8ydwiSTgwAudOVE0+RPe3qqVOED5ED5PXaWUCVzDp3t6qsabWJn+PyffLA8jb1RZtGA+8Z89rJNEsjCyAxFBHlaA7p/mbEpvMfIgibZZCVhTCXQtmV15Mcnz8G9VE5D4e/kHKrgmq1y9gM4AgS3e7EXtErkCqKYmzCP6bSrzs44IvruB+LdXhAjBtV8wG/hLcPryFM/cs7mWfitMRFpT5Bu3XdB1y7PIO+G/auHyc1Tab664yCFVmN55DdF305u7W/R3VkHf2LVg== 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=hVk8l+qY3eox022LwdgTxhzFUmt3NGvSxT+SY2a5z1c=; b=pN1KZ5fWtllN0dW4t5AMk16J8qW1C1idgBHOrkPC9O2yIXRz0UwAmyIVt9kWVYOoY4qrM0vaUyF8M+bnCc7bWmtYAUNmjrZc19PjGCdcfinU71esJ/fweQIE7X6JrCEbVpiipqxietDaQFRTqdDt9AQAbxKB9C2I4jAwhFs3l/k= 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 TYYPR01MB7952.jpnprd01.prod.outlook.com (2603:1096:400:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:05: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%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:05:44 +0000 Message-ID: <87wn0skkuw.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 19/21] 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: Mon, 29 May 2023 01:05:44 +0000 X-ClientProxiedBy: TYCPR01CA0029.jpnprd01.prod.outlook.com (2603:1096:405:1::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_|TYYPR01MB7952:EE_ X-MS-Office365-Filtering-Correlation-Id: 7fbd76e5-e5ca-47d3-c6af-08db5fe0d47e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0ci+dkmaPXsSsiVtbHDHp89xhPLBGBr1pq1ciKf7/ijlkOEf7aY81q4XQ1cTmtsxY/XypVR9+7URy6GaN0x+WT/gLCdrUusdp9ZeaJty8QcCGpBUTC7B59sGqXmD/epXWMZwy2HCnv79VJRRQxHA4HgT36Nbh0MsHnzILriVQwm4MVx+RmNCIGuis2jXZ3LCCJi1+HTj5pnkby2B3aX7v6CZiroy/5uhjokxxCmjTbxjHn3/ZmSEH084jj7vo90EFy2kBIG948iqc/CyHd7M6SoKMNdaXoTgx0gFqBMFSeAAC1caRSMp1cCgecifx7Ash/bcXhurmD9kIEMLT9twNLnthyza+myeT03rQ5ezRuwIMu+vM9jkzdc1Bs5Fi0KPXLOmdxKtJmf5U2qpitqmENmbn/cmtvQpLdc2MwA3vcFGqQI793yl9uhP/Ar9uNwRppiftOamgKYrMnaQcWcmNtWfqzN7OP+CjgwGHW+aXvBEoXLka4BaG7/uyU97PWi+TqLW64JMicMqwkq+yRW3kjvQSYVyyryl7yxlO9Owp9R6DifnnilWLNOuC19NG8exBv1wyBfB+BK1u715j+PB0TlOd0J+2HvVA4n1P+v5NNLtl+tnP4EG/wmzXbuanS2c 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)(346002)(136003)(376002)(39860400002)(396003)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(52116002)(6486002)(41300700001)(86362001)(316002)(66946007)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0X2ZWQhlp1dFXrm0QFxqAJ/RpqB1d19lf/+l7FlTaWVoWT86KDLNjyeprhXkECnp53HmAhxGek4txEADFxaM9baJyPmjR+6vKR3GLeRcCqjxc9+BH4TLk3n4rYZjMNt//HaM6Z3bs4A7Ect0xVQ3IuZ2y9nOC8aHBz12BQLhDiCNCWIruqu+3rnjIcffFhpNRGjofim4DZirqzK5/T3ESyjScXpWFMheV0ipZtCufXbE08ZRor3F4yfnDVWAzG8VzqvSCvLV//Ba54W5y9ShPVZqhKVIzHXnDAkJ5iPKOU9NyI4G2KyFPLOZDh6IhEPRtNjn6nohk9zcYnj6/74vrCy3pZHWJ2STUra46y80ebyeWZjr7CUlb7X8L4aluslqe7qg/meK/LPvPlcYpIJFGj3K148KFnvzjM6YuspiN2ueXLHWA3Ux96RJ3wI+cG/q4DDaqH5l9WVrAUzhAGEYUerX4IWUxww7nCNMIUZGWNAPB1xUEbTykYfX7kkX7Dq67UP9N34hmGjZrXSN/AYKGhvQ5okL9xqPj9M9GYiHd2X5mq+KmDlEZlik7IN2XMf59tJY10K0yJa0h3itzjDJpqPo6z0vm6aNTDUFg68z4bESW4Pohq7Sju5W+6gOYEwVjCtTSi5U1MyidLF1xTM1pztVraxyZ6wqXE9P0znKcZEvkqCwxKTvC/0dZDlKXbIrhViITnV8ET14JAwEhi1/7JErnjtQ2pQB1pl4tX6cdgWgZOZqKMC2iiJ5jKlPWzk70WwTYRmS12OXsYPXiE7Qt1SDYw8TmIZBZA3Pu9FtNgl5UHXsx6Jo16xiBLDS0z8/8SVId9rvA6zvqWlfWTT9S/S/8NNd/fWqbOymMgbTeo7A+FMmHpbNpUuAxbPDa7fRwJTrM+LSzsPiG62+S8TcKCLC/nW7QRa+5/DrtCp6M1W1Nb8EBeF+ifwqfVtwc+nYqkcz0XIjf5MNoWmLvLMp3HxcoAG+czMbelD4YeS3XVJ2ieG//79BIRkdOko6/eP6S4L90qlCtHHHv501EAL5zGokxItI/w9Zp19YE4OOCFMdNZB8afzGP9doS9Nhh1S5eR1XLeA0TmQMdZB6Pn+8j57UIU94+fJnUW4Lb5HdjGvqCw+rq/z8hSelmZaTNqUQ2LxOc6uin9AVXsRrkyAFRe320m2R+PcV6+0GWFMour38qzY1t6qKKS127BGVLhn5Ovc/63cYoB9aMVMgxE22GcuTe2D5ttH+oSr9DaOIZ/Zbu9fw2E4fmAlpinnmud47MLLeM+HBXocRdMDJVt13zWD7EojwWJztY1OhWp2AjG+mS6y/WXE6SyUtLbypY2ez2iMaRZQdJLqSqD40DEXjKNPm/C0Bpi56WSvIW78cJJTaj/28dKu3xtJkquAwDtBkYeosW3PbRmdbgJhq5inVt9+0MFHSgZbdvYK7R+lh0BMXDK6C75VO9qDSI9/Ovwnu+PLKYcXfP9LUtiN/bqyRRPk3JQegoPXhorHX9u6XZleLTy7M+ZKfVtn/Rt4dkvsgSoIJi+ttoNR0DGAyJ6uNweWXWV7FgYAknk+AjbUBSh3ZkTYTSkOOqzy1c1OxMnu4C9Be0YJ5Nhflf+3/4zEhNerUjAu492rk21sD0oAwCTk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fbd76e5-e5ca-47d3-c6af-08db5fe0d47e X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:05:44.6114 (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: wv0PnoyQ97/Nbda2gqfXi4C713FtFhj4TzPwdw+sWMAM00goODzUmacM5No0cIyANVeJgln8TZkhjic/J8GASpAqxMJEwXpIwsAZ8+lMNatpUgd/v1pn7muYjkscZg2+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB7952 Message-ID-Hash: O7ZLVBEOMX5AMBA2HNANL2XEIRVIR27F X-Message-ID-Hash: O7ZLVBEOMX5AMBA2HNANL2XEIRVIR27F 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..cc1f08f2f17b 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->playback) && !le32_to_cpu(pcm->capture); + link->capture_only = le32_to_cpu(pcm->capture) && !le32_to_cpu(pcm->playback); if (pcm->flag_mask) set_link_flags(link, le32_to_cpu(pcm->flag_mask), From patchwork Mon May 29 01:05:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257984 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 9FE11C77B7E for ; Mon, 29 May 2023 01:09:38 +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 9512FA4C; Mon, 29 May 2023 03:08:46 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9512FA4C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322576; bh=6xB7EQYzattNpDgPEkkaA5Rf27rpG9qFS5ykOi1y318=; 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=ECK6beRCrsIN/Cr8RnroT1GbYN8OC6NL3+kHdv8OWpVOybd3atHQR7p1RjL0tSqiW k3w0wZztS5YZXgiDHqtrs3P9MWG9Mr3SgzqYidRz9n5aYaKOtOozLQA9gywV7MaPJL Cjx/D1Vc/Pfs6uk0NSCaeFnDwBcYsA0zr3b9GO6g= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5C8F3F80588; Mon, 29 May 2023 03:06:14 +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 AE73BF80510; Mon, 29 May 2023 03:06:13 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6F2E7F80612; Mon, 29 May 2023 03:06:08 +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 8C4C7F8026A for ; Mon, 29 May 2023 03:05:53 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8C4C7F8026A 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=hYe8QOz0 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AU/2lPZGD4NotSQIiELzUb3kVCOUBFw5kYzZndTKye8KLDpECo108k8JUPTY2SEmTkTJNiwB9/67a8turfwlosKmEJylGpwNOVD2uO4avHpZrYvNLmTNqTyFEfXkSxfnLN/zIzSncRmmMzPmz1N8Ykqx8tJiWgp9KmsQHFiYz3hwP52b6Sov284uYyewoIU5e/no8hn/I5gmAT9X6mbWU6l4j/wca7YkIwHzspz2f9m6lGjonW+4/o8W5TxEz83wXgIf6Zzmm88OoXqirsW08yUlFdXUm3qfNiE8nHL+gIsXd/oVkFmhh8m4oj+RjOmMYhghcHUzGl4ZA1DN0vQPNg== 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=UEa9MSp/pEhMaa4tNifWlD+mJo+k1OHTpkFn9Br8cNM=; b=iTGd6wRyvpEUuNGqVRiLmvwiUaMdw5VJC0s3yXtmhvBOK2DuoO2vXBE82CBe0WsQKpGmmqjFXmQwj3UjYQMkTLLEz5UmD8YRt7NpoLeuGpfCzu3Lnmw3RthA97OmNRD6rLh3BQFMf4/eZVUo9JyKuAz7emwnXe0K2HSmbin+gJtC69tYW6Qm0EXpGR89S1L+ApJdwdd3LxN+i1E/ecyK4tinaxLIiAf4p9hRJY7s7FwfkOQzLdRjrOWh3zHEpPnUgPh8lEOPTT0JSKDzt2Mmdxv3RsOH/TWvj5QeoAvOaG6oVoJP9bAfHW42BTXWgz6/V65ftwnZYe6X0+64BQBcag== 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=UEa9MSp/pEhMaa4tNifWlD+mJo+k1OHTpkFn9Br8cNM=; b=hYe8QOz0MSCzrdrX6kplSE48b86FM5OLy2Nt2oli9QuMtoComkocFb7PWXqMb9PL5onn79XvyWssIiAoch/y8pe4OfYN9fO9F9S+uY9JWjCeviw2uoJBvnmHT4K5o8MZ5cNDk6ArEy1sUM87ojSFnZVwg2vBmvZ/NgDX6kfQm/0= 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 TYYPR01MB7952.jpnprd01.prod.outlook.com (2603:1096:400:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:05: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%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:05:50 +0000 Message-ID: <87v8gckkup.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 20/21] 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: Mon, 29 May 2023 01:05:50 +0000 X-ClientProxiedBy: TY2PR01CA0009.jpnprd01.prod.outlook.com (2603:1096:404:a::21) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYYPR01MB7952:EE_ X-MS-Office365-Filtering-Correlation-Id: ab4e18ff-d2ae-404b-ffef-08db5fe0d80a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ty3aGlzgCJswppBBGnv0Eg8qFVvFFVGq8VxZ2KsjsBRYjcHH7sZXzX+rJ0f9Pe4x9ZrLJ3W0Psj8hTOQY669GinCZp8IhIcpVFmFFECOK+kZSa3JbHX9WyMoDCX1U2Ez6VWuTB3ri1wqqpQEx4MFSLc3XwOQChN50/mhPL+0EPg49SD6cFs+lCge0WB4+Rt73D8LmFjWeHrHHzbJctMUSTCDWHXEcj8+6Sdsh2q9v1tyFGozJvdiQkhdWJoepwYZb2N8dnk+3sWgYzy77NySyPjpeFxaNpH4ynBMhCW7bLB4VxMJv2BQ0yxEgbdcBJyusLyNS/UMdzMThv83x+RHA6WOTJtSXfsW2YfdpdysET0nqsCLE8iNm8bC5R+kA04pFZhH61xo97nhRyCCyaOUScWv8hdcEkiEPUNtwLVLS5YfjORFj3dBF7ktRdsc12p36FshIjh0irlSOzUhaR+xHAND5l9iFWDENW+1jnv9F6q38xHT/qJV91RM7qEevajH4TryTJg8R2P+OvWeSdzV4LhbgB28ACsukvWUVG58jjDF9mkvz1ws+a7ZzSQhaDS0ElXLujGGq/rm3uWracgvPvUUKLtUYw5DUgcgzLt0pxmkF9KVbtRCUDPMgqBHsbrm 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)(346002)(136003)(376002)(39860400002)(396003)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(52116002)(6486002)(41300700001)(86362001)(316002)(66946007)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-2?q?9vY2sFDf/mbsAJOlAGUF1kc?= =?iso-8859-2?q?XUyjU9ZuBnimkjJdiBEnIkx773JVTQQElXUenNrlpdOP6bCDiq9Teny//SlM?= =?iso-8859-2?q?0C6/EcKf314VGfj+jSe7BNiJLCHWwz3HDxudIofxlakAiLSWLAdXDS3J+fmQ?= =?iso-8859-2?q?4VabQXtCNaA2GCTe0MMX/3095IjuepKIgkLibdhFnVSndeZImrBjdo2STBIm?= =?iso-8859-2?q?iQvSnAIe58XsfjQKCFqfi0u9Pw3ry1hP3R2bSoq0uLZoAmK7mhSPIR7h9Lmv?= =?iso-8859-2?q?SbY6E72iCttdzK6OVRRAKdJ60TzgLha7EEbDXs0A0VhbTeKCzc6Iu2OXT+64?= =?iso-8859-2?q?ksiG3juY0pEpsxoCFX/ucdOov4ppo5Q19MGOdalmPsz54fP7OSSkvc53h73R?= =?iso-8859-2?q?pP9boydCHv2/39/LVuDNfHUbYiJ+2QhrqfeSkbH0obKN6Cukb1TsilgZFUcZ?= =?iso-8859-2?q?XFPhvCQ4EZ01mU+rrYkWv8QUBMsgffD4z7RfPSvbBDPmXlEwS7wN5RFun45G?= =?iso-8859-2?q?NpsMJQt4Ke/t0MP+XrRjyedt73FJGDNFoG1/QnTuoT80QU/beTfkItthSaCA?= =?iso-8859-2?q?D1B+LiVs4/IiKLVNOFugJPKH6WT424YiFAwZYpu6unuHKzZdmb5gi2JeCOQK?= =?iso-8859-2?q?561VPmi2dAEej0TONrVKXwm8mmIKnpsY2/IHeOSTpEzUfUtcJKybn+ZJOpaR?= =?iso-8859-2?q?sNjh5RZ3O8AcUbgEq1EMcW7/0jM4rR1ZO0fncz/vdKG2riGgi4RpnxexB4wl?= =?iso-8859-2?q?LNHs30QweWVnGDTyrP1xlKwkvSlE4ena/qHu2kCcZBK+o0CjK8SRRx7WIKMq?= =?iso-8859-2?q?ua2Padmvo/1qK77lNNbo/nLwXxF57HHTUAXggYsbVG6giDuoQwenT5NyMxEp?= =?iso-8859-2?q?3YiMMC6wiM0xCecQmuAFPtqs/3NV1QrcgyPd0IV4PMV0e5Ad/c7LiBJU3KNy?= =?iso-8859-2?q?AtPlCHuR/fqbVmx+xcpD9UvP4FAvoKqVmdsQ4JFxp4bzeo+/96+0K0wDAvC5?= =?iso-8859-2?q?o+UVXDeepkOBEk7TvafG79/ckIJXT77maDs9SwlZc4kbJfyGBfB2uwPl6meo?= =?iso-8859-2?q?vcOwC3jSsS3cZBsFGM1v488Y9kaSMeFbXhOyD6nmNuok2+Diwbc8WeZEvZ5i?= =?iso-8859-2?q?ZQbi8Jqz8ovcRRQgCKOTaQEBgaHNPPjvDOXjOw6kbJAkb0WMUptjQbZxUOju?= =?iso-8859-2?q?lIECEksQx+ajSgaPY01h07BmFZZXQsAJmnnSwlhRls/bEr8cxiDTVqhecDa2?= =?iso-8859-2?q?gLisXR6i+WytS/kfD45b9O1PY0eOZmxE9OsOgtc0hWtmO4BmyFNGSWl/3Lq4?= =?iso-8859-2?q?kwdXh8r/dG3vEkINdToAl8hp67MC6y2ZcFPvN4MX5T1hUk+zojVebyJGQhAu?= =?iso-8859-2?q?0Muc6ROeV66pjSTIqeT9R4bIeNUfXOEl6OuLv2A2Hm7wc4pi6qRCwLiDyGzy?= =?iso-8859-2?q?tR4ehu4s1RFsG5nW63AFqInvSpLvWYh9gg/ZFBCTodhBePr0mZNv/+sWlaFL?= =?iso-8859-2?q?JGTP8DeM8ctHYy5ot616CE1c52Idv95+CQg/CJMdZhg1ZmN/tqXSgoqCDZsX?= =?iso-8859-2?q?rnHASktFukHx8Bn6cfHc7lvMj+JImiLBY0llTAGX4jGZgsE0V06CETrqADD+?= =?iso-8859-2?q?zsz1O2Gl7h7PYNf8xDx6IWbc1YLAxg2r0tRQqOyuRFhzI0ulbGUn0+HBALyM?= =?iso-8859-2?q?=3D?= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab4e18ff-d2ae-404b-ffef-08db5fe0d80a X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:05:50.5796 (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: fqRIdnsqucfrCIkg2JlTaHDlFt6Ns9AW3LDaPL0mdetZGqwPwsLopKMtXfyW9BxQVyyRR9RLG4WaKBMMJ6MycYMN8M3X/VOGDk8W0rDEBVca3biLn9roiRsogBSl+TWb X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB7952 Message-ID-Hash: H6FBD6HI6HDBYCFPKWV5JLXKCQRLON43 X-Message-ID-Hash: H6FBD6HI6HDBYCFPKWV5JLXKCQRLON43 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 Reviewed-by: Amadeusz Sławiński --- 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 Mon May 29 01:05:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13257985 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 D64CFC77B7E for ; Mon, 29 May 2023 01:09:53 +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 E5A33A4A; Mon, 29 May 2023 03:09:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E5A33A4A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685322592; bh=I9UlAPpUzx5tvznEyGtgsLw02/eOmHiffZ3Gx0bZewI=; 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=G82hhZqJuNIAKWBx1e0KHVcfH5zkWhGbvZ1R3hxwkZwWVq1Eu3ZeM3CtpVsKXk4Mj SLk1d2n1g222Ygv/Lqd+5qYnz8jnCeUlyMarX+7TaOZ9PN1g9SBLI2U9nyPbncEkI9 sZY2xJDQoFlvZXuDE4IMBcinw+JQ2tTCoXPQuXiM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id CB2AEF80571; Mon, 29 May 2023 03:06: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 70204F80619; Mon, 29 May 2023 03:06:19 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CE6E2F805F9; Mon, 29 May 2023 03:06:10 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2071f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::71f]) (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 AF3C3F805F9 for ; Mon, 29 May 2023 03:05:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AF3C3F805F9 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=H9hXsLvX ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UjyvBOYHdzlGUS0YxmvQldwh4RteoSrTxNoYjjdg+oDiO44BtqDiVrXgzaZUhAgBBXYq4Juio6O4eBlrGIX+YiwhaqNPy5WA/O2uVu2HgErXI50cCPEBsMChZ8bu3tbdSdu+pLOdG3Nz6zZdZ746Cgp4lqbOPW5Xd8k43ubPXYx9hxqXE0PkzOazEWwWJixJwL+yNmfO7DpUvD5Goi6mKcD89RNtHi9Nq5nmvlux2qwIgomyuO8YUfXgNjkh39bHh36/prtxLORSz0fqur4e0B9Bgyi2dobKlNYV5m0QXEp8eAEPghF3XzCKBhMqjYcaD1mfqC9bcNQ0qCFQ/Y5PZw== 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=l/vEDmgTKC8oVRAo4LbaCKUyloXjh7x1gUrHUGN8dWU=; b=M55d5m2wDw3XYASPjVRWQl9PSJ2C/cJmMXtnbV98LhvOck7wXbUvD+kffYqy4hV54TcgLkHlUlnDpZ4kWamYDjqApQWOtCmqMmMpDJ4ZtTe4Q49Uh9lgqxNTILdfpMZ0Q5t4+7XrZ5Lgw5SKRCEP4u46ZrXemAmam5Km1z/ztgWtxwWE3TLzopoTxRpVF47hHvOp+7CstHVl/I+ZzAMBHJHMs00uqhPeKfqT9+LAwTBcxQcbnamOfpbbX4CqsX9p6AZ6Yh5/vT84OC09teEDEv2Q2HS9oWmIOzCA8Yb0y2AvQLoB6JDK5d0aYSXow7HZzzyg7Si2gxpDx1iremzKcg== 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=l/vEDmgTKC8oVRAo4LbaCKUyloXjh7x1gUrHUGN8dWU=; b=H9hXsLvXOV+XXPGXHmlxRckBKaZCvi5VR11TH38+dKX02jXB6+ENMUDs+XGANs0SvU4T/7ZDF0d7aOCW59HW4Cir89gD839Qy/C/rtIXBie3Lo6NqgTbfDCf4P17LQHREJ2MvLrPiNjZEWDq7YC2QsTGxL48uWYYQtU5TZdRFAI= 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 TYYPR01MB7952.jpnprd01.prod.outlook.com (2603:1096:400:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 01:05:56 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::91e7:a94f:9f75:d840%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 01:05:56 +0000 Message-ID: <87ttvwkkuk.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: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> References: <87o7m4lzl3.wl-kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 21/21] ASoC: soc-pcm.c: remove dpcm_playback/capture User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 Date: Mon, 29 May 2023 01:05:56 +0000 X-ClientProxiedBy: TYCP286CA0148.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31b::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_|TYYPR01MB7952:EE_ X-MS-Office365-Filtering-Correlation-Id: 958c3642-c56c-40a6-4dad-08db5fe0db8b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DJfobRvcXl9CBDuSCnayTxBJASoJEAKdrUSu1S0ufblpoLlihHNL2Kiruzo2AfNda0KH1zYN2DiDJ/LH7oPVUHk+D1FHUJgFj8ekSixHS2V/sXz6I97zb6R52xvSiDIWcTBWSG0DrKxf62pOCJZvRp8+TKF9X+8p1r2Ryt65ukF/nfOimnk/ubNQGENnDjrRx2agFolHG386iiJQ+lzgDS7OM/nKvkbpFCNqqcLBq0SbW/ZfUEaZYsuDNKT6qNelMsxJXlih30mPvPxt6tnLUxmDs0I3CveDj8BhTHFECqTJi2u9saGhv/M94wrt1k0SnwdPNcg8mzUmcgWJ4MnrZqjl9dPJOP2HmvfE44BYitD4Rivng3k5UZTu8rQW4CnGGGx/mdZJXnBRBPDjhHMZvtqe0EllAwFsFW/Q9MJzqTgIGAf6HR2grpbPWePxEP6O9sR80rDeE2bWm3iqsscFYikUrgxC4CJY2Emjsz2ODs16pja20w/5oU5EgecOSkt4wlwMUIs8cFeE6c2dFy3VU8HQg3zOCOCkiemLYH0r4IU5nebohtFX5lp7NpD90JhbW2qtSrk3IwTqt1MlJMB2/tLO1Xial6ZOBvls6LXFcM62bgfFV0RkCYuyF2wMMIm3 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)(346002)(136003)(376002)(39860400002)(396003)(451199021)(2906002)(186003)(6506007)(6512007)(26005)(5660300002)(478600001)(8936002)(110136005)(8676002)(38350700002)(83380400001)(2616005)(38100700002)(52116002)(6486002)(41300700001)(86362001)(316002)(66946007)(36756003)(66476007)(66556008)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-2?q?OSC//QQ7n1Eu/hOXYyTaBup?= =?iso-8859-2?q?XuC2DsOzQWr3WG2FZ65h+IZ2VFSJc64oAfXKwNdqA+0fP4mzEGi9cxewa5y2?= =?iso-8859-2?q?KDDdtraIyyfJ/IVjNchQv/7U7vaWbVgiJ9nzjMecUMsG3EcZtvcaMkStjyFE?= =?iso-8859-2?q?KzxXvca7MegzKFqOnudwMWui/hvyZ6PBeBFqfRwIAXHtNEqNvFZ8oTGtKCMr?= =?iso-8859-2?q?/7eQZ+VGZCVXQwERGcLdvvDq3nrCWXR9Q7/5FOlq7dYnOMcJDlNMJ7Q8EqqS?= =?iso-8859-2?q?fh0sUuoL4QZ3IJpUA7KaHI4k3TczPNXAk5UisWtAug/ru32g6NgmD6RM3J1G?= =?iso-8859-2?q?7+4VEySNfaF0fO9/MYC7UmEqVyKUTBDP3ld9aGJo5+O0VsIVQkLdiqTY82CE?= =?iso-8859-2?q?wOI0Q9S3qYROwfpE8rB46Yh3xwOfRWywyn6XCw+6iXyRulgoBrKUBdn1fzrh?= =?iso-8859-2?q?TLOhQtH19ywiikbUq+tC1iQ42wsP1d3rKz+WxFSgp4H7xIYbwOODhbZWYi3/?= =?iso-8859-2?q?eNtStcqQG/aIYmcoelw6hGNW0f06bYqUsdK0pM9RIeXf2dNeQasHq8La8z+v?= =?iso-8859-2?q?ABFRUbkjgikwDyTOun5ouncomasRlThrXxDOFTyK+s9/RQhefidnamnS4M8w?= =?iso-8859-2?q?zczwnhN8KwEPWMDPIQH8ER6DlFVNVAQ4tbJtk4EM4NN90px+Vun3W4tLglY5?= =?iso-8859-2?q?SIHtJ/n4/3kklzaZ7ZRF7bLnj/OC+FASPc6wXFCu+OBfIzPZv5xyHW/ZiP07?= =?iso-8859-2?q?hBRZdkCNStSD3ILcpirdsIpWHZkUBiby7o0SHQRHVc2SPYfNNspmWDhhw5Jw?= =?iso-8859-2?q?7ubATU9HVAQ1lHF+IwHOSa9d6L/tqP/dnl/qMlgoDoRwXZnd+i5gW1SvKRdR?= =?iso-8859-2?q?x9wLQHDT0Lh4ivWB4vVz5bq1zouQl8BhOe4nklHNjhs+ZIVIhb0Thupaww3g?= =?iso-8859-2?q?LQWfBGngy+NQyNnz3F1689qbfoOUufhLiHjOspK/VhpcN/rsImFY5h1pt7B3?= =?iso-8859-2?q?3nRFQgRe16sgRJssLj2WD1g7SVr4Ny5IBYDcH6YC2Op+Kxmvsa6kANs/8Elh?= =?iso-8859-2?q?Fh/V+61wEORTCQQPlKVtIpNSYWVl3cV7Tt65Rcbx0G016CudHT61mwJoYjHK?= =?iso-8859-2?q?+Z5nRpbkdsaBk/iajhMEmVNA6rESHblVTCX2lC3k6PlGshI/ctz+g9l99Uk/?= =?iso-8859-2?q?ZEj9e2Mo28Y7R7tvS4p4aXZQlSeoVWD9qo5cT1hG6W7kTTqVEyJC6ro3N5fr?= =?iso-8859-2?q?oFWkCbZyrlZ5EZwnT/ZTkM1ManaiHWcsy9sEV147Of6bhCek3OYyczfovtiS?= =?iso-8859-2?q?QTVvLbMosZ0YCtKHB/6Xbqrr4oSIxMwLxcmYr1V09sxFkjomNKqxYEvt35vw?= =?iso-8859-2?q?afnbMfT2umVgRdmUpFYucEM40Xd2yqHRIwXTgWOGdv8E3AEcWMEo1dnLlR7o?= =?iso-8859-2?q?q+q6k9e9f6AH6yx9BQi7s7i8Jzpj/evQGjp48rrx/BtXVv3tEI9rgeuf/pAN?= =?iso-8859-2?q?ZWhnbWT8S2RYIIFn1KsrhMEk8URxfUqg8yaeynBdQj6mdvOblaIxVEAO1AMd?= =?iso-8859-2?q?Ty7gOJZXGy2SDJ9QGlRFuSSgqx09fgBILJ+iQ/k/RxShFD0jfzxOq/d5SS92?= =?iso-8859-2?q?zECK/MExi1Rojmw4CPi4o5nzPDCEnQWklxFQukfw9rRWJAoEFitCMojyDrRg?= =?iso-8859-2?q?=3D?= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 958c3642-c56c-40a6-4dad-08db5fe0db8b X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:05:56.4363 (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: 0xIMXeRFHzOUOl0R3//+iUeHvUKNpkuRUMtT6bp0DyD7et8vp3UjS5wz6jNDa08uxAFZY1Ywri3Lmzu81bdrHPPe+nOc7owKC1hzhf+kB2faIEREu/zSgpjyLEu5lo4U X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB7952 Message-ID-Hash: ZB4QYFCPTNN7W52H2DRFADMWB7YO2RJ5 X-Message-ID-Hash: ZB4QYFCPTNN7W52H2DRFADMWB7YO2RJ5 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 923a66a51b18..b8b7cc48cc70 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2758,12 +2758,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 */