From patchwork Tue Feb 22 06:11:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Kumar Pandey X-Patchwork-Id: 12754565 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 285B1C433F5 for ; Tue, 22 Feb 2022 06:14:40 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6D8201728; Tue, 22 Feb 2022 07:13:48 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6D8201728 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645510478; bh=sIFuaD0MMcHHakIpU7+qe131ZsIhPVtTg02H1DySL2E=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=XzBK+Eq1/TWV+ucAKKjhJ3aFYnzhtO2x8eY1/AWb6jF6YL/ekWOqwvZckCmUsD6CX 1HiL7EDmyEnAH/30UFlGozpWgEF9nUAGUDek7S8P/zfFyrNiiR8B/BTItTLXQXyi2t Hn0Jwg9JG8/mbsCeTXp2cV3J+wp8MRJ7IFiY9fUc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id EF41CF80508; Tue, 22 Feb 2022 07:13:20 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EF0C8F80511; Tue, 22 Feb 2022 07:13:18 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on20628.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e88::628]) (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 54333F804FD for ; Tue, 22 Feb 2022 07:13:12 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 54333F804FD Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="MjyZNW7R" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c8aLc3I1TgUFG33OA3uQZ4HyflI+UjB01ASq7SICMWMZe24N7qqx8v4w39EflNnAkHvH52wT4g5R80eTyjKxYV5t8HFrn+UsN55NcINaWyRNnaV54zF6d6CyVEwD1R5ICSRFpJzivj3D/k9qroTlwqkZzyJZq4OUoWpWXZ9MyFi7pU17ijEfOQKb/HNl/c0cKqWvIAkvHDfbQA/kx00tknK6Y6+DyVIJRutNHmCbsbvW5FwCi/yyMSbFQQZIlmbXlORaitD2Gi69UcKPAalo6aXeAkPMqVQrmPdV22IR5qTf2o2WavwXJR1pK8V9NzDBd+ZkSNu5qwcGqVRPOoOx5g== 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=H0e5Yf/l7KLhk03Q8tqx3awfxFgaYY9GQxqf0QmqNpU=; b=eGk9ik8j9HFUZs524dGfRyo5xFrExDsTjaLznqqsdsflA7jjd2x1L54+wpRiGPzcHgEdNxmLJAVj0NpG+bC57Jl7bU/U7hvYqPLaEQ22mUn+o2O/YuOpquImfQ7Mur/j95xmnx/2o13mknx2+ts7OYHtEVGinKXM/9oR0wh+O4ZWUpaYueAXZceepSDZvQxiIKLoHLCY6zE3undhgpQmqLP2K/eekZPj/JhrfKEHRBCWe9aKk832+gwHRwNwasG848BjlnWS/BqD70caRxQUtPQRT9DKdiub9b9kUt4oo8qSOap1f8gOo0zj7m7t8Y60OD5Wm0tZMxKP4xlfut+XrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H0e5Yf/l7KLhk03Q8tqx3awfxFgaYY9GQxqf0QmqNpU=; b=MjyZNW7R9SqytB91ZHwZNZOp0xkdR0FZ7KAD2l8DjQZt4GftZ+Ttb7YcPcfDk7rUgDQH01C3sRHVlKD5FN2i+TerUGNb6v0YuUyoJINpd7wMJQ3HZ20LBTYV9teheGIof1YdN/8E4d2BhpXzsnZkEkVCcOGKuIGPzFJ+OUDYANA= Received: from MW4PR04CA0330.namprd04.prod.outlook.com (2603:10b6:303:82::35) by DM4PR12MB5056.namprd12.prod.outlook.com (2603:10b6:5:38b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.16; Tue, 22 Feb 2022 06:13:07 +0000 Received: from CO1NAM11FT045.eop-nam11.prod.protection.outlook.com (2603:10b6:303:82:cafe::9) by MW4PR04CA0330.outlook.office365.com (2603:10b6:303:82::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.16 via Frontend Transport; Tue, 22 Feb 2022 06:13:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT045.mail.protection.outlook.com (10.13.175.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4995.15 via Frontend Transport; Tue, 22 Feb 2022 06:13:06 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 22 Feb 2022 00:13:03 -0600 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 22 Feb 2022 00:13:02 -0600 Received: from chrome.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.18 via Frontend Transport; Tue, 22 Feb 2022 00:12:59 -0600 From: Ajit Kumar Pandey To: , Subject: [PATCH 1/3] ASoC: amd: acp: Change card name for Guybrush Machine Date: Tue, 22 Feb 2022 11:41:26 +0530 Message-ID: <20220222061128.719400-2-AjitKumar.Pandey@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220222061128.719400-1-AjitKumar.Pandey@amd.com> References: <20220222061128.719400-1-AjitKumar.Pandey@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7eabe6d7-46b9-45e2-5697-08d9f5ca64a7 X-MS-TrafficTypeDiagnostic: DM4PR12MB5056:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lDmgGE5G4LJiEjfi9cHnj0QPDpcN7R6Qa3BgVxOwAbbSV5eibOuw2FI6FyCaEr1yiwcgu3i9GsDSlSAka2JGQJN9IZ2jlaK8Wl9wcCJ2GiCZw1jKC+A9PIivB2hi8wRRR8CkqSygYBjYrOFWYSM+5eE+xd3KmBdt7mytntirnd2cDBzIKksiDrmttq2CeGw0hxhGeTXKYiqBQfegKSO7aSFflYuZU95Z3MNV73LLlgV0cHXZ8av30IFCENFJLScSpOQCyLm+UP2dLy7/b2xn/E+f37q5YPycmr0/DxkApGcyvcSyLcAHnC0SHFar3DJjsoLKpvPcHXt+ct4brXb7J6TLW8P/8Q74lDa2rV52tyyyuK+tpZKuET0XO5tq6Iw7CnrsQ8zp9lf2rZQ2S657ZUZNFcCDdBOEBIVIVPpcMBbf2lQOzJHc7jyd9gZhWgA7tYbYMCpXTAO0ctVaXlEBqsL/IWc2FRVUJl1x6dT/8lFF/qRv3LOUnuNhmNdEdHVsyvngW/NFystj6jws4vKjCH7N1OZZGcaPT4IZ5YLtPj4L6g+CDfnGc4BIeS1AkX5ZWeNmwLJkBqvIITOcq4xqXUh+7FtzJONyoLXtw9w5xgqP4/P7UsF+mSu4zFzEP2nbR6RbzGab1XDUeXqL/MO89cWmV1b3wzP7ns7xNbY5T66MG5bGsiYKoUv54itM7ozbtiLvkA6g5CqQ/0BaG+1gxg== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(186003)(26005)(2616005)(70586007)(70206006)(36860700001)(1076003)(7696005)(6666004)(86362001)(54906003)(110136005)(316002)(82310400004)(508600001)(8676002)(356005)(81166007)(336012)(426003)(83380400001)(4326008)(47076005)(5660300002)(8936002)(2906002)(40460700003)(36756003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2022 06:13:06.8648 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7eabe6d7-46b9-45e2-5697-08d9f5ca64a7 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT045.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5056 Cc: Sunil-kumar.Dommati@amd.com, Ajit Kumar Pandey , open list , Basavaraj.Hiregoudar@amd.com, Takashi Iwai , Liam Girdwood , V sujith kumar Reddy , Vijendar.Mukunda@amd.com, Alexander.Deucher@amd.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Change sound card name for guybrush machine with rt5682 as primary codec and rt1019 amp to align with names given in UCM config. Signed-off-by: Ajit Kumar Pandey --- sound/soc/amd/acp/acp-legacy-mach.c | 4 ++-- sound/soc/amd/acp/acp-renoir.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/amd/acp/acp-legacy-mach.c b/sound/soc/amd/acp/acp-legacy-mach.c index 91140d15691b..50a5aa4d6da9 100644 --- a/sound/soc/amd/acp/acp-legacy-mach.c +++ b/sound/soc/amd/acp/acp-legacy-mach.c @@ -96,7 +96,7 @@ static int acp_asoc_probe(struct platform_device *pdev) static const struct platform_device_id board_ids[] = { { - .name = "rn_rt5682_rt1019", + .name = "acp3xalc56821019", .driver_data = (kernel_ulong_t)&rt5682_rt1019_data, }, { } @@ -113,5 +113,5 @@ module_platform_driver(acp_asoc_audio); MODULE_IMPORT_NS(SND_SOC_AMD_MACH); MODULE_DESCRIPTION("ACP chrome audio support"); -MODULE_ALIAS("platform:rn_rt5682_rt1019"); +MODULE_ALIAS("platform:acp3xalc56821019"); MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/amd/acp/acp-renoir.c b/sound/soc/amd/acp/acp-renoir.c index d06ad5ce7fec..b8dc25a1d31d 100644 --- a/sound/soc/amd/acp/acp-renoir.c +++ b/sound/soc/amd/acp/acp-renoir.c @@ -47,7 +47,7 @@ static struct snd_soc_acpi_codecs amp_rt1019 = { static struct snd_soc_acpi_mach snd_soc_acpi_amd_acp_machines[] = { { .id = "10EC5682", - .drv_name = "rn_rt5682_rt1019", + .drv_name = "acp3xalc56821019", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &_rt1019, }, From patchwork Tue Feb 22 06:11:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Kumar Pandey X-Patchwork-Id: 12754566 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 8684DC433EF for ; Tue, 22 Feb 2022 06:14:49 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CF0CD174B; Tue, 22 Feb 2022 07:13:57 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CF0CD174B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645510487; bh=DnfhFAQmLtz7EYDE8KicN53YtrLB2rZcm+61A/PP8yo=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=R7vXOFSSOn+kUjJG4L6MQfmFARfcvVDcZc5Xu0+Kh0Op/vQ6d7BBiHz7V1oNB79Ke ulWvUALCi6KeTr72ko6uLyfTWprFQe4VZwjrUDeeXEDoG0YAaSHks1CQEqMpBcvnmX 2zMt56KPM8X1sYnz/YgmETbVdUBlNnGnrgdo/rTo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D58BDF80511; Tue, 22 Feb 2022 07:13:29 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DC420F80518; Tue, 22 Feb 2022 07:13:27 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on20605.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaa::605]) (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 A648CF80511 for ; Tue, 22 Feb 2022 07:13:21 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A648CF80511 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="wZULgDjm" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b5ay1zZ0C0IGvVnGrgTOmMbRCT3L6B545pVBBGoCnGWMFV/HHNJtqypLW1tSyH5QwDQiK3pfyOLKI18xcmtqW84+YKFt5NV+ceZQTha0kUMhvwfwW+nKrLsaWlkQygKKB6qT68/k44lPk9zsvy5b6lYQAsRSdaFgHY4WykzKKtxJIxxHYeBHJHkn5/l0xF7C9wmOdOG3o0qYDIvZYYEGVeBAiIlra7lOzytqVKtIz0M62PvNBbIaDXXHDpVD+SBQYioWdbGz8azhJ3M5Ylp7RsTW6Jsts9bUJtuSFQJozruqLgfUwI39dp4q4zgmpcV6SfoRsDf4eOkOIRHMaROIgA== 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=RKB0ilVSAxrVRVAWHmYdw037mYAIeaU1A5Th3hKnnps=; b=TELE39BygBTb6FiDHAHIRN/6/tLq+91X7o4FZTjgaZJeJlnFdllPjtj0ggIItyx8bHKAiZoqMicItR2h/9Bc0MiCkojTIuW79yqz0Wpa61uJ6+nqLWXmWqyNGJP40GXk3HGLb8V0qUfmm2U3yMq/1hqUDZR2k6wYlgZ74JMvIAhQ2hD+t7zjXOgVM2MjV4zoJBJbzv4KBBowvfST9Y1rvyphl1USNFPUDjgJSzBtaMRNPial2hxYGJ4tOj4OUCc6D9U5awhOCEKMWHBFVYH0DI5+HeCLkM0JXHZxRo0OT0e35uEJ4kXKrA3/oKDWwgAM+q+o9c5fY1cCQ3191VFVKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RKB0ilVSAxrVRVAWHmYdw037mYAIeaU1A5Th3hKnnps=; b=wZULgDjmwkO2zW5J3Jg3DbvYFHE0N8uoBGvVKddI9IKxAxW/2VwqjIECGKcjSABJTEdOo1xWQJrmSIuXiDEY0wnFlEZTieGelO7waWfWCMcJFHopUGV14ar1UK2229akpUrgetTay/YhjtTLH07GybmL5cqgY/YVv3pv+EE8c3E= Received: from MW4P221CA0006.NAMP221.PROD.OUTLOOK.COM (2603:10b6:303:8b::11) by MN2PR12MB3006.namprd12.prod.outlook.com (2603:10b6:208:cd::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Tue, 22 Feb 2022 06:13:16 +0000 Received: from CO1NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8b:cafe::ee) by MW4P221CA0006.outlook.office365.com (2603:10b6:303:8b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.21 via Frontend Transport; Tue, 22 Feb 2022 06:13:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT023.mail.protection.outlook.com (10.13.175.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4995.15 via Frontend Transport; Tue, 22 Feb 2022 06:13:15 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 22 Feb 2022 00:13:14 -0600 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 22 Feb 2022 00:13:13 -0600 Received: from chrome.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.18 via Frontend Transport; Tue, 22 Feb 2022 00:13:10 -0600 From: Ajit Kumar Pandey To: , Subject: [PATCH 2/3] ASoC: amd: acp-legacy: Add legacy card support for new machines Date: Tue, 22 Feb 2022 11:41:27 +0530 Message-ID: <20220222061128.719400-3-AjitKumar.Pandey@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220222061128.719400-1-AjitKumar.Pandey@amd.com> References: <20220222061128.719400-1-AjitKumar.Pandey@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ca50f751-67a8-44fb-6b37-08d9f5ca69a0 X-MS-TrafficTypeDiagnostic: MN2PR12MB3006:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nffm/4bPrx0Lw9HKSzWB9pLOtZw9MNGuWLVA/plApoX4YOIndbPD2rdfhHEzEruWM+Je3WxbF8mOs63E/AEZ1NYD+SF/v6zDrCJLUIsBX0xWFTb26bEztnGYmHCUvQ97QlUIMubtzxOGBSwUXnWLxwRasxQ+Zy52OqoyFE2B9zKLZQqjeblHn/WCp/cM4COjRyvTHP4Crup/caYCCE/Eq1uZTaMrxRhHJ7bjlU2NO/2T252151raNLsUj/HE+dDC34jxEGQqNy1ci/ZTHeeucGp0CYNzCgpYQOnqU35wnWkgrge1vGds8DNLAdK8mXobCXRYNoTQrbKq3Gf+Yc2Nn3+Ic+zRQhaCnzVeXMVoTKSKiJbuJ6XDUaSjQzUOINekxmfJCdfu1f9jVMa1gJZZDUSmibPfdweUOHPNRXFGvFpYzOEVj0vkzVL6XNmhcRKFSbgw2DFZb1Tt7Cq1k6cqniPpDZ+W5nbgj4S7U0U2+Mri0Gk5beQoaUBonV8J44pcm/PPVIrAjjapkw68gB4vCbFJh4xxxqJtwvM8isrOU7vnZ+AC4ZSjn0QoqgvpUFJw5SwXYmf+hl/i9SouSfjNkXaH5YIizA33HviNF2Gexy9/nQLi9HjVMv/Utxl1O3GgsIHPXbnDG04uQxiyGfjy3g6ADhVFu3teg6FCnEFX46Mg721oydz9dtVGlVr7ZVGh/K8yWiJbfjSsdtVJHauR/A== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(186003)(26005)(82310400004)(1076003)(70206006)(70586007)(2616005)(36860700001)(7696005)(86362001)(110136005)(508600001)(316002)(6666004)(54906003)(8676002)(81166007)(356005)(336012)(426003)(4326008)(47076005)(5660300002)(8936002)(2906002)(40460700003)(36756003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2022 06:13:15.2080 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ca50f751-67a8-44fb-6b37-08d9f5ca69a0 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3006 Cc: Sunil-kumar.Dommati@amd.com, Ajit Kumar Pandey , open list , Basavaraj.Hiregoudar@amd.com, Takashi Iwai , Liam Girdwood , V sujith kumar Reddy , Vijendar.Mukunda@amd.com, Alexander.Deucher@amd.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" We have newer renoir platforms with different codecs combinations. Add struct in legacy machine driver and add to list of supported renoir machine to support sound card registration on platform with rt5682s as primary headset codec and max98360 and rt1019 as speaker amp codec. Signed-off-by: Ajit Kumar Pandey Reported-by: kernel test robot --- sound/soc/amd/acp/acp-legacy-mach.c | 30 +++++++++++++++++++++++++++++ sound/soc/amd/acp/acp-renoir.c | 17 ++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/sound/soc/amd/acp/acp-legacy-mach.c b/sound/soc/amd/acp/acp-legacy-mach.c index 50a5aa4d6da9..8118577d5620 100644 --- a/sound/soc/amd/acp/acp-legacy-mach.c +++ b/sound/soc/amd/acp/acp-legacy-mach.c @@ -30,6 +30,26 @@ static struct acp_card_drvdata rt5682_rt1019_data = { .gpio_spkr_en = EN_SPKR_GPIO_GB, }; +static struct acp_card_drvdata rt5682s_max_data = { + .hs_cpu_id = I2S_SP, + .amp_cpu_id = I2S_SP, + .dmic_cpu_id = DMIC, + .hs_codec_id = RT5682S, + .amp_codec_id = MAX98360A, + .dmic_codec_id = DMIC, + .gpio_spkr_en = EN_SPKR_GPIO_NONE, +}; + +static struct acp_card_drvdata rt5682s_rt1019_data = { + .hs_cpu_id = I2S_SP, + .amp_cpu_id = I2S_SP, + .dmic_cpu_id = DMIC, + .hs_codec_id = RT5682S, + .amp_codec_id = RT1019, + .dmic_codec_id = DMIC, + .gpio_spkr_en = EN_SPKR_GPIO_DW, +}; + static const struct snd_kcontrol_new acp_controls[] = { SOC_DAPM_PIN_SWITCH("Headphone Jack"), SOC_DAPM_PIN_SWITCH("Headset Mic"), @@ -99,6 +119,14 @@ static const struct platform_device_id board_ids[] = { .name = "acp3xalc56821019", .driver_data = (kernel_ulong_t)&rt5682_rt1019_data, }, + { + .name = "acp3xalc5682sm98360", + .driver_data = (kernel_ulong_t)&rt5682s_max_data, + }, + { + .name = "acp3xalc5682s1019", + .driver_data = (kernel_ulong_t)&rt5682s_rt1019_data, + }, { } }; static struct platform_driver acp_asoc_audio = { @@ -114,4 +142,6 @@ module_platform_driver(acp_asoc_audio); MODULE_IMPORT_NS(SND_SOC_AMD_MACH); MODULE_DESCRIPTION("ACP chrome audio support"); MODULE_ALIAS("platform:acp3xalc56821019"); +MODULE_ALIAS("platform:acp3xalc5682sm98360"); +MODULE_ALIAS("platform:acp3xalc5682s1019"); MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/amd/acp/acp-renoir.c b/sound/soc/amd/acp/acp-renoir.c index b8dc25a1d31d..35d66454e5a3 100644 --- a/sound/soc/amd/acp/acp-renoir.c +++ b/sound/soc/amd/acp/acp-renoir.c @@ -44,6 +44,11 @@ static struct snd_soc_acpi_codecs amp_rt1019 = { .codecs = {"10EC1019"} }; +static struct snd_soc_acpi_codecs amp_max = { + .num_codecs = 1, + .codecs = {"MX98360A"} +}; + static struct snd_soc_acpi_mach snd_soc_acpi_amd_acp_machines[] = { { .id = "10EC5682", @@ -51,6 +56,18 @@ static struct snd_soc_acpi_mach snd_soc_acpi_amd_acp_machines[] = { .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &_rt1019, }, + { + .id = "RTL5682", + .drv_name = "acp3xalc5682sm98360", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &_max, + }, + { + .id = "RTL5682", + .drv_name = "acp3xalc5682s1019", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &_rt1019, + }, { .id = "AMDI1019", .drv_name = "renoir-acp", From patchwork Tue Feb 22 06:11:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Kumar Pandey X-Patchwork-Id: 12754567 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 4E488C433EF for ; Tue, 22 Feb 2022 06:14:54 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 8DD2B175C; Tue, 22 Feb 2022 07:14:02 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8DD2B175C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645510492; bh=SPH6cwuyPpFk50zdfv5pu3SPtsn+LgQl/1YrjkJN3h8=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Pdj09LZqfXnonF1UnoPmer2fOuHMJtB2YFFErhnmtOc9KP0Jekq9ioFc3ntGBFZwn V1xC/n8KKoIj2Jq+MU/qG7PM4w6YTTbdLcv5IPE2anqenPQi3oSJulwzvYd3DgC47+ 5GAqGNNb2d30o3XB/NgnvbYfBUnEfojgtHpIMF9k= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 8A6A3F8051B; Tue, 22 Feb 2022 07:13:38 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0FB1CF8051C; Tue, 22 Feb 2022 07:13:37 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on20614.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e8a::614]) (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 96765F8051A for ; Tue, 22 Feb 2022 07:13:32 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 96765F8051A Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="nHhTsWEy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VmE9uJDz6+aaqdBSgQ43mBQgMqWdTflhrLekf+HE1Us38acSF1ZCuH3ckyxAUkQ66hiuylBx/mqJxje1OwNvZO975xg06MRNYK4wgr97CYKfC6Zehp9crHCgfdhYvdGX9Bu4qD8VFdExr3h0ZS3TxsccAaXUQPn0w/30lnTNOiAnbSZyiLNW6GIdpL4vp7w3kTC02fZsuV/TB2r7CIwPuLZJ1Ygi7ujq+PgMynujnMm9tUjNRBYPZuBENbwuY78m8tZ7R4RYCfGeBS8+FFODN8G5+QB67PkvAjFQFqkwSM2bF+bG/a6bf4rIuQKhMQd9bceigryyulqQxzqmfzLSgw== 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=OiNSGGyM0C1UPk4vM3/QgttQek1MahQKX1tvma+NlQw=; b=JdHnI/eOZEHGSofM8FR5yLvVOG3CMU1loEM2eqsy2nPnyB6iAnRerJctB6FOsrFEmK0GvjxTBdv1VIIffWwDYMKkTSrVgGVZ+8ZzWz37AtgNmHCa1Y7e1UHsuH/Ie5bicE5oTULxVRSNYFN2ruJL+09fcjhSau6TirygKLkDXr5f/6iHk3N4Z2S0QfcLBVzAMy9SfcNY8kRybgj9Y8UsVaQrgE/TK0oQex54Iiv4GkIrCr3TaopA7OzLbA8rCo8GxCDwYxVxjdYWobGrBmH8tHWnxGlaO3s+O+ltBdgAZIrkGuVrp28/q3IxgLJspJHRJWwrkvNtlXjrAQ1tC0xvBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OiNSGGyM0C1UPk4vM3/QgttQek1MahQKX1tvma+NlQw=; b=nHhTsWEy2VoK3TZ9mpWXPoSWVNXE8wZb7+VDtSiFR0m+8agwZwr8KkaEkaTUXrEuoK7bb3/6uSmoijQRj+MUOgbyTa/3nyKZM1LkQsXJpFJL7Gi/V8CwlHMA/7D496ZP4eHaKgBCrIJtBUTozZKrwLdeSKcy0Qdss84O7/qEEso= Received: from BN9PR03CA0650.namprd03.prod.outlook.com (2603:10b6:408:13b::25) by DM6PR12MB4435.namprd12.prod.outlook.com (2603:10b6:5:2a6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.15; Tue, 22 Feb 2022 06:13:27 +0000 Received: from BN8NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13b:cafe::6f) by BN9PR03CA0650.outlook.office365.com (2603:10b6:408:13b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.15 via Frontend Transport; Tue, 22 Feb 2022 06:13:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; Received: from SATLEXMB03.amd.com (165.204.84.17) by BN8NAM11FT005.mail.protection.outlook.com (10.13.176.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4995.15 via Frontend Transport; Tue, 22 Feb 2022 06:13:26 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 22 Feb 2022 00:13:25 -0600 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 22 Feb 2022 00:13:25 -0600 Received: from chrome.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.18 via Frontend Transport; Tue, 22 Feb 2022 00:13:21 -0600 From: Ajit Kumar Pandey To: , Subject: [PATCH 3/3] ASoC: amd: acp: Add DMIC machine driver ops Date: Tue, 22 Feb 2022 11:41:28 +0530 Message-ID: <20220222061128.719400-4-AjitKumar.Pandey@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220222061128.719400-1-AjitKumar.Pandey@amd.com> References: <20220222061128.719400-1-AjitKumar.Pandey@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0b204e90-c471-4870-db99-08d9f5ca707d X-MS-TrafficTypeDiagnostic: DM6PR12MB4435:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eb/Ca0+NG3s73VuwzkKgr6SJ0dIbS2BjwQcn5ofA6nDM4rSQrtqpOvegji5WznEcHYK6EnzxUZYkeDKC0dq0VsApxURyywWbnv2ZMQ0+YU9nvCoXWeqps72S8EKMGeHnjgO1GVj3wbWjPf102byZPrdpYX4TT8XVpGVapZNjxb0tb3oGj9+CfYjfpRtIJ4x+q0JvkZPOeAmoYIVo1z4LC097oRGXytHPkfxbtdsHE1F9JqBBJOFRrTYvDtRUn7Skt1hnpOVklIzgb/x3/mAH/xt4X8la2MiLmgsqnm46ukDomSjE+bdvRQcDTdk5qBLQnN2XD0PL4FrBOMoUIqJEVee7uzfglDk8wdEwWpX3sU6M1bMVoxRejj4ObgvaJ9A9Uf9uFSSnD30xnrYyX7j6Li0VWeLu3tA1uQQzfDe6CtoNeaDqa07FxmbMZZ1y6oN/c7RvRKWrrh50nTN0RlTpNsDUknOzhJqlI49MYqvs9FluL92GICbg72/lrgylnjl1bqLLYuvvtcubGjsjGRD/iNFTbU8o4fo6OOrjUGJxP/mK4GDO6iEVEjxaRtPc2Q/a5EPUwdq6BpFyHd19wWL5XDUvWV9zSA890aqW+VF1Bc/ccpf7O9H5szr1GKF40lArz73DINUIN1o4uv0Kl5qW0Q+DJyXxtfz7dKyOFol/VPZGcaejVCI3duCYFqjPpWdR9TcMyMWuttHIuOmb3XHt5w== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(8676002)(4326008)(70586007)(110136005)(70206006)(54906003)(316002)(508600001)(426003)(82310400004)(1076003)(8936002)(5660300002)(336012)(2616005)(2906002)(81166007)(356005)(36756003)(40460700003)(7696005)(186003)(26005)(86362001)(36860700001)(47076005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2022 06:13:26.8193 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b204e90-c471-4870-db99-08d9f5ca707d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4435 Cc: Sunil-kumar.Dommati@amd.com, Ajit Kumar Pandey , open list , Basavaraj.Hiregoudar@amd.com, Takashi Iwai , Liam Girdwood , V sujith kumar Reddy , Vijendar.Mukunda@amd.com, Alexander.Deucher@amd.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Add dmic ops and startup callback to add snd_pcm_hw_constraint for pdm related device node. Signed-off-by: Ajit Kumar Pandey --- sound/soc/amd/acp/acp-mach-common.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index b45442a56c40..d3034ee2ff59 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -291,6 +291,32 @@ static const struct snd_soc_ops acp_card_rt5682s_ops = { .shutdown = acp_card_shutdown, }; +static const unsigned int dmic_channels[] = { + DUAL_CHANNEL, FOUR_CHANNEL, +}; + +static const struct snd_pcm_hw_constraint_list dmic_constraints_channels = { + .count = ARRAY_SIZE(dmic_channels), + .list = dmic_channels, + .mask = 0, +}; + +static int acp_card_dmic_startup(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + + snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, + &dmic_constraints_channels); + snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, + &constraints_rates); + + return 0; +} + +static const struct snd_soc_ops acp_card_dmic_ops = { + .startup = acp_card_dmic_startup, +}; + /* Declare RT1019 codec components */ SND_SOC_DAILINK_DEF(rt1019, DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC1019:00", "rt1019-aif"), @@ -633,6 +659,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(pdm_dmic); links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); + links[i].ops = &acp_card_dmic_ops; links[i].dpcm_capture = 1; }