From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F936C433EF for ; Tue, 12 Oct 2021 07:23:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D9DD610C7 for ; Tue, 12 Oct 2021 07:23:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234040AbhJLHZD (ORCPT ); Tue, 12 Oct 2021 03:25:03 -0400 Received: from mail-bn7nam10on2063.outbound.protection.outlook.com ([40.107.92.63]:37217 "EHLO NAM10-BN7-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233849AbhJLHZB (ORCPT ); Tue, 12 Oct 2021 03:25:01 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RlObnV4BVsy3ScX0r8w3IKagsM+uH0t9S37f5lN/4FGcd5pp5+Es+siRGNifoBqUsVVS6PTHnL+5ZPLo/sH+WncbyCqN4Q3CCQh0IDVfWOjfOhdaw32kZxda3JFhtg8NQ+MIPYG6Q1/g9pPCfW2xhECymcgLqHMqGleDr9lCX0rfvrzi5nQH/pB24Dt3R5MikZmYWnXaPU7G77hH/qTs+V0cYW8zV+PRwtS0to5eGBULj5PREZ7N1Vm38TBxbe7FVF+s8I+3DZPyOkUfgX1U5IuRd7u17wEBTWjiDSq7bMErEce3DFdkwEoVqNpDIHM/M08hO9LmWjU6M133y2ujrg== 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=rp9+/T60npn8MiDgW42oViHZIi2L3v0UHINUjZr/Gsk=; b=EoLz7aagUOUA/7Fkjb87l45aLRnHXOPBA1CQfYtX+zA+MwcbQHx4ltv06ATGKHEEfL8qgg/Uev/kI8i+j2nl7kW9Go+uXNjE9fLjm2XfKje9215wB8ck2wiEkm69pD53d+Wqxpg+Mp33JdqAF6TZIXK4zYs6zj1Pqf4D971h2idsN+f2V0qQ8j/CptlkxwDjzYi59IT+AOIBIxx2fB11ZtDz1Fftg3lW0TOmye5VNhDsvjfaskJZuAIEb4mUV94t//Yw/qRJthKPXD5FWvGti7QnrnyIp7cg3rXuW4LhnGmH97sr9rMOjExpFCXJU86/Hg+YF0QBdvMZpT+qpJ42kA== 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=rp9+/T60npn8MiDgW42oViHZIi2L3v0UHINUjZr/Gsk=; b=fjZale8asBlxH6eg3+6Km1J8eK/8UVj79E9p+1mhh19X/tuqq3MWiGnAGV4QqrCVgalyjEhp84JWhD4cEq6+7NaG9i1m+85MeEj/pXZeLIB0CTvMk22qQbp7kDNecAPwY9jV2r3VaYK1K977Md8eTcxcG18A+SmRcrPK4mq8nwM= Received: from BN9PR03CA0770.namprd03.prod.outlook.com (2603:10b6:408:13a::25) by BY5PR12MB4997.namprd12.prod.outlook.com (2603:10b6:a03:1d6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.20; Tue, 12 Oct 2021 07:22:56 +0000 Received: from BN8NAM11FT028.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13a:cafe::69) by BN9PR03CA0770.outlook.office365.com (2603:10b6:408:13a::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25 via Frontend Transport; Tue, 12 Oct 2021 07:22:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; kernel.org; dkim=none (message not signed) header.d=none;kernel.org; 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 BN8NAM11FT028.mail.protection.outlook.com (10.13.176.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 07:22:55 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) 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.2308.8; Tue, 12 Oct 2021 02:22:54 -0500 Received: from chrome.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2308.8 via Frontend Transport; Tue, 12 Oct 2021 02:22:50 -0500 From: Ajit Kumar Pandey To: , CC: , , , , Ajit Kumar Pandey , Liam Girdwood , "Jaroslav Kysela" , Takashi Iwai , open list Subject: [PATCH v3 6/8] ASoC: amd: acp: Add SOF audio support on Chrome board Date: Tue, 12 Oct 2021 12:49:37 +0530 Message-ID: <20211012071939.97002-7-AjitKumar.Pandey@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211012071939.97002-1-AjitKumar.Pandey@amd.com> References: <20211012071939.97002-1-AjitKumar.Pandey@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0c0b2923-59af-47f0-97be-08d98d511c2c X-MS-TrafficTypeDiagnostic: BY5PR12MB4997: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3276; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cRU/ocIXFpl7DKMFCvkBFjYaMaptYsyECE+ZfozaL7iUIXLtwmkfZqKuVHojZ2TzqiOSX07ONt276tblYx+MKWzcLy0Ur1QX3M63aQTxLZ/c4+iqfCSF6dPqqs9Sjms5x4/YyUNHdEO9XTBEYUF6VYNuPY1lYseYfcrTVGW9lrKW25mPezMjiruwjmJY2XAp+EXSVLgbQIYCwThfe0s0syJ/OCqrLAjPg2LYJM+gGx3ROqwYryXcCY+BZQXqEJagFCkwJRDNUfHfzAT++y2WA4Xw9+8QE8gRguH1VGPrEzx23UXlvclhQTG96twkK31MMSN0JSrVT2EgxbO+d8VDvBKnvKtL9tAGwo97wG3O5BhjU+XHhn4S2ZEaB/TAt6CpF/GleGPzmyZNm3H7AdYyhFcpQbSByaKMzIxQYUwAbh5fCxJE/1QdI+Bt6ewaJUe8Xy4Jd4W+oPn+yL5zGNyICCOVBK+SwdS8BKyC5jiut55Q7dsiGXIga7wr1Ump4TnF06yW1M6/KVMX+tXm02PmY+icIZ0n8r4XHT9sBzZC+AGpHIQQi7xVQ8yTsOrb9g0EIN7BgHtDwAKDcCh9et6/2Br6pdQUm08YJnwH9feDzf/kgl40UknvTfO1kANoxQeJWyeUhi84/c1kyNBLfqNaM1NBUQFWKm7pDhqn6kPE1NUeJEgvvhWb+ydHkfgHqELoP5RuUP8Z9k/95M3KbWz956+6agP07+Wx7g2WGNZMhuM= 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:(4636009)(46966006)(36840700001)(316002)(186003)(6666004)(83380400001)(81166007)(36756003)(8676002)(356005)(8936002)(4326008)(36860700001)(2906002)(7696005)(336012)(508600001)(26005)(1076003)(47076005)(70586007)(5660300002)(426003)(2616005)(86362001)(110136005)(54906003)(70206006)(82310400003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 07:22:55.3738 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c0b2923-59af-47f0-97be-08d98d511c2c 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: BN8NAM11FT028.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4997 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Chrome board has RT5682 codec and RT1019 amp connected to I2S SP controller on ACP hw. Also it support DMIC capture endpoints with inbuilt pdm controller on ACP hw block. Add driver module to create backend dai links for sof dsp core. We pass driver data with audio end points configuration to register sound cards and create device nodes for all audio endpoints. Signed-off-by: Ajit Kumar Pandey --- sound/soc/amd/acp/Kconfig | 6 ++ sound/soc/amd/acp/Makefile | 2 + sound/soc/amd/acp/acp-sof-mach.c | 103 +++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 sound/soc/amd/acp/acp-sof-mach.c diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig index d8d49d04fe41..f03af79de592 100644 --- a/sound/soc/amd/acp/Kconfig +++ b/sound/soc/amd/acp/Kconfig @@ -41,3 +41,9 @@ config SND_SOC_AMD_LEGACY_MACH select SND_SOC_AMD_MACH_COMMON help This option enables legacy sound card support for ACP audio. + +config SND_SOC_AMD_SOF_MACH + tristate "AMD SOF Machine Driver Support" + select SND_SOC_AMD_MACH_COMMON + help + This option enables SOF sound card support for ACP audio. diff --git a/sound/soc/amd/acp/Makefile b/sound/soc/amd/acp/Makefile index aef6f981c770..16c144c2965c 100644 --- a/sound/soc/amd/acp/Makefile +++ b/sound/soc/amd/acp/Makefile @@ -14,6 +14,7 @@ snd-acp-renoir-objs := acp-renoir.o #machine specific driver snd-acp-mach-objs := acp-mach-common.o snd-acp-legacy-mach-objs := acp-legacy-mach.o +snd-acp-sof-mach-objs := acp-sof-mach.o obj-$(CONFIG_SND_SOC_AMD_ACP_PCM) += snd-acp-pcm.o obj-$(CONFIG_SND_SOC_AMD_ACP_I2S) += snd-acp-i2s.o @@ -22,3 +23,4 @@ obj-$(CONFIG_SND_AMD_ASOC_RENOIR) += snd-acp-renoir.o obj-$(CONFIG_SND_SOC_AMD_MACH_COMMON) += snd-acp-mach.o obj-$(CONFIG_SND_SOC_AMD_LEGACY_MACH) += snd-acp-legacy-mach.o +obj-$(CONFIG_SND_SOC_AMD_SOF_MACH) += snd-acp-sof-mach.o diff --git a/sound/soc/amd/acp/acp-sof-mach.c b/sound/soc/amd/acp/acp-sof-mach.c new file mode 100644 index 000000000000..e143aa24afb3 --- /dev/null +++ b/sound/soc/amd/acp/acp-sof-mach.c @@ -0,0 +1,103 @@ +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) +// +// This file is provided under a dual BSD/GPLv2 license. When using or +// redistributing this file, you may do so under either license. +// +// Copyright(c) 2021 Advanced Micro Devices, Inc. +// +// Authors: Ajit Kumar Pandey +// + +/* + * SOF Machine Driver Support for ACP HW block + */ + +#include +#include +#include +#include +#include + +#include "acp-mach.h" + +static struct acp_card_drvdata sof_rt5682_rt1019_data = { + .hs_cpu_id = I2S_SP, + .amp_cpu_id = I2S_SP, + .dmic_cpu_id = DMIC, + .hs_codec_id = RT5682, + .amp_codec_id = RT1019, + .dmic_codec_id = DMIC, +}; + +static const struct snd_kcontrol_new acp_controls[] = { + SOC_DAPM_PIN_SWITCH("Headphone Jack"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), + SOC_DAPM_PIN_SWITCH("Spk"), + SOC_DAPM_PIN_SWITCH("Left Spk"), + SOC_DAPM_PIN_SWITCH("Right Spk"), +}; + +static const struct snd_soc_dapm_widget acp_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_SPK("Spk", NULL), + SND_SOC_DAPM_SPK("Left Spk", NULL), + SND_SOC_DAPM_SPK("Right Spk", NULL), +}; + +static int acp_sof_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = NULL; + struct device *dev = &pdev->dev; + int ret; + + if (!pdev->id_entry) + return -EINVAL; + + card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL); + if (!card) + return -ENOMEM; + + card->dev = dev; + card->owner = THIS_MODULE; + card->name = pdev->id_entry->name; + card->dapm_widgets = acp_widgets; + card->num_dapm_widgets = ARRAY_SIZE(acp_widgets); + card->controls = acp_controls; + card->num_controls = ARRAY_SIZE(acp_controls); + card->drvdata = (struct acp_card_drvdata *)pdev->id_entry->driver_data; + + acp_sofdsp_dai_links_create(card); + + ret = devm_snd_soc_register_card(&pdev->dev, card); + if (ret) { + dev_err(&pdev->dev, + "devm_snd_soc_register_card(%s) failed: %d\n", + card->name, ret); + return ret; + } + + return 0; +} + +static const struct platform_device_id board_ids[] = { + { + .name = "rt5682-rt1019", + .driver_data = (kernel_ulong_t)&sof_rt5682_rt1019_data + }, + { } +}; +static struct platform_driver acp_asoc_audio = { + .driver = { + .name = "sof_mach", + }, + .probe = acp_sof_probe, + .id_table = board_ids, +}; + +module_platform_driver(acp_asoc_audio); + +MODULE_IMPORT_NS(SND_SOC_AMD_MACH); +MODULE_DESCRIPTION("ACP chrome SOF audio support"); +MODULE_ALIAS("platform:rt5682-rt1019"); +MODULE_LICENSE("GPL v2"); -- 2.25.1