From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=pass header.oldest-pass=0 smtp.remote-ip=52.101.46.47 ARC-Seal: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=pass; t=1792738441; b=u65MBrmNMyLStK+CBZJussOvFO+XchVME65ovaVoDO2Omy0cjsGukV6y2AD/Zy6mGW43 0UOOfAkepTW3YXCnwfUAzNcwaH21Ia8VITshpeuf6/HvNvcoPKXJMK0/0ZIRlqORDMdxW xYfGHW2FWNrCkekDGuETLEPhjwJclomKZaRTn1qQcJJ3A++icJ2++r4ww0gy+LmpihN7e KGcmXlESwf4nCESkeV9ZHBNyJeKjtILyurQznqaljl+iGSCYUJJV/QJygVRcpVksZoCsf dwOiTrrC6jidGGDbpgTbfu6PZwqitsPymYMkToUSZj6sM+BpZHGrgK+CDQd7lllhAHg== ARC-Message-Signature: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792738441; h=DMARC-Filter:DKIM-Signature:Received:Received: X-MS-Exchange-Authentication-Results:Received-SPF:Received:Received: Received:From:To:CC:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:Content-Type: X-EOPAttributedMessage:X-MS-PublicTrafficType: X-MS-TrafficTypeDiagnostic:X-MS-Office365-Filtering-Correlation-Id: X-MS-Exchange-SenderADCheck:X-MS-Exchange-AntiSpam-Relay: X-Microsoft-Antispam:X-Microsoft-Antispam-Message-Info: X-Forefront-Antispam-Report: X-MS-Exchange-AntiSpam-MessageData-ChunkCount: X-MS-Exchange-AntiSpam-MessageData-0:X-OriginatorOrg: X-MS-Exchange-CrossTenant-OriginalArrivalTime: X-MS-Exchange-CrossTenant-Network-Message-Id: X-MS-Exchange-CrossTenant-Id: X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: X-MS-Exchange-CrossTenant-AuthSource:X-MS-Exchange-CrossTenant-AuthAs: X-MS-Exchange-CrossTenant-FromEntityHeader: X-MS-Exchange-Transport-CrossTenantHeadersStamped; bh=09pF8QdF90ITXeW1/tPh4eN41BdHZ3vEegQaX7NnWhY=; b=5JH54YhYlE4j003QmOBV7TdALxbIRhH3zm+GqM45mBjl7+wLzUf9qVXnIkt/hilLkOu7 AloUc7Mj1Kqv6MEdAVoLJ838C/073nvMRizlZePqQSJ+C89zZ5nSBBhn6l4ktKJHGHTUv jtWinkuDqPNu88CurdIaZTublTDBf90f3A+39SYmCh+InwjC4/cRNe6qLTn/GjJCzP3gu 6xVuLi/xGzW8AAxJ/hI6fVjMam49XkZTlm/UQWQDfpJAtcHPBitmDf016/o9IWj/oP0E0 1GMn2S5g8sENTEiNGtppSSeC3KMs6Sv2lsQOdNEA937y9KlKgu9L4M3IED3w1YmJeaQ== ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=aKMNORSa; arc=pass header.oldest-pass=0 smtp.remote-ip=52.101.46.47 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010047.outbound.protection.outlook.com [52.101.46.47]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (secp384r1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CD61606A32A; Fri, 23 Oct 2026 06:54:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 0CD61606A32A Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=aKMNORSa ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=B188CEHqJPoWv4V0YyP0x2FqVP0RS46l4nU+81600D3rwo7iY2sjc0cTRUW3E6xLb5HPJnc0sGxZeyfNEngiwIoxqZoOsZyVtBQywTEM+JF3B8XnBpx8VuXGDUscvQkMk18ACXhta9UKNZLOmGSnrikgw1GV+JtgCTpzqmySfaXNpdIfEjsh3hXccVJMezu+VG7K9AwjlTB5JUTeo37w0d9M9Ly9YH5YHfeYK7fuxeYtZerEJMFA8FufPHPiaE0QIAig7n4CtpK89hK6MKbOuyRQGL9IFNAiJD9bALCRSxl7N5kmZm000B7roQkI/V7rwxan4ugbfpfWeX3n3YPAdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=09pF8QdF90ITXeW1/tPh4eN41BdHZ3vEegQaX7NnWhY=; b=l6w7qzMU3EJIHAehmxMK6JZh3imHT3erskOvyLO3x+inb0z4qH3nXVmKW02gqvtq65MhsOFd7tWATX+syYWQe33WO9VZgBF1gwjTHjBBrPRooQaQ/eLBSltA8KKKB3xqtea2AxUHh06Ecq1ETKz+RQRjumNBNb7yfI2nIKMqPhES8iNSg5inbRpgHtmQlGKsWfqoFeaS5/lSZMl4col+f+NRzPofIbAttL6sapsOTNCS5mpzZF43EClLALm8wdn2L5IEoSmfFaBiXI1MR2+Go7zDZXrFc3v6cCc/wisVjZ1VDuZ08tLp4c2tbtbQQmH3udCa9jEzyrhjRpgcO4Wa5Q== 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 (0) 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=09pF8QdF90ITXeW1/tPh4eN41BdHZ3vEegQaX7NnWhY=; b=aKMNORSajaHnWTkWEDrREVXYHFQF+2Fd8+PRQTIP38XR4ho1w2/36AyJIDBbyd1S5x3PePVFZLIAWEGfiByfQhgIMQMZ/VTGv0IlsNnvuJVHNeGroKBw7AiD4AFEvprBxG1SSTPIqYjFLno6/OW52vWejGnlNBMmqnfBPo0/y9c= Received: from MW4PR04CA0191.namprd04.prod.outlook.com (2603:10b6:303:86::16) by MN2PR12MB4391.namprd12.prod.outlook.com (2603:10b6:208:269::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.522.19; Fri, 23 Oct 2026 06:53:58 +0000 Received: from CO1PEPF00012E62.namprd05.prod.outlook.com (2603:10b6:303:86:cafe::87) by MW4PR04CA0191.outlook.office365.com (2603:10b6:303:86::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.546.19 via Frontend Transport; Fri, 23 Oct 2026 06:53:58 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; 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=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by CO1PEPF00012E62.mail.protection.outlook.com (10.167.249.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.546.15 via Frontend Transport; Fri, 23 Oct 2026 06:53:58 +0000 Received: from satlexmb07.amd.com (10.181.42.216) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.53; Fri, 23 Oct 2026 01:53:57 -0500 Received: from amd-System-Product-Name.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.53 via Frontend Transport; Fri, 23 Oct 2026 01:53:53 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , , , Subject: [PATCH v3 07/13] ASoC: amd: acp: add DMIC components string for SOF SoundWire machine driver Date: Fri, 23 Oct 2026 12:20:43 +0530 Message-ID: <20261023065216.3473883-8-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20261023065216.3473883-1-Vijendar.Mukunda@amd.com> References: <20261023065216.3473883-1-Vijendar.Mukunda@amd.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00012E62:EE_|MN2PR12MB4391:EE_ X-MS-Office365-Filtering-Correlation-Id: d83aac0d-58e3-40cc-461a-08df30d26986 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|23010399003|36860700016|1800799024|82310400026|261009223027099003|10067099003|56012099006|261021123027099003|261022105027099003|22082099003|18002099003|11063799006|261021121427099003; X-Microsoft-Antispam-Message-Info: sn4yR/CNvDI/3pAA2ccuRhTFXKuYRpcSROFqlvzjztgCpcRXHXVdvq5Eh9E+UU9yFmJdR4kpPQnGvVbIfHu+moxuizjhh2RHGAiEzBHeJsN5+rKRMJfwXAkYzdZD+9ITvZK4rCPIEvfGCSeT5SYQjDHXfb+k974PfbHVKHXbZ1V6WtzeoI4KVgaJzBmTdvmk2c4j/7GYxUTWtXN9onBHePuD0kKQFKL7aY93yf1qmHXgvMNiGppctI6Pqonv8JrUXCr4evG3I2voRpj/LepafsBnuUbL8Uzf7WSvuuFKym6HFSb3cYdTgCf9jxR32lE5dheWB9wQ1LkVvqMI31g3ypbbUhOs9nMDpnQs5BTxnEWirWP7s/n5jIMx8IktfQ2RPaOimtXMtHspfi46WfC0Tth8h3/7JHiAfNQ/stPZQzOvn8Pr6YEXCZYXsadJ4VVCj6O4r2j3lfXWRwfv9chAp6Hbno6wdlFwW819K2glgzDXAEBDCZnodqtKGy2QgJeydiCitsLhLoXELx9rbkNLgfVWRkYa0f+BoNtV76XcbIEsQixlgWdSGCH6O52r79zlaSlcP99kEY86zJX54lVHQ5XOfJOEdbfbK+aG7B963Y2nlogDyDPcmP8CpJB03CIK4SDE/a9/xYeDdlCk/Lj3O1XdOSQn6MK+8z6F/YRzleXKMUklcbXInwmQiHQPB4ZlykRX04mJDTTIRs6SCef1jQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(376014)(23010399003)(36860700016)(1800799024)(82310400026)(261009223027099003)(10067099003)(56012099006)(261021123027099003)(261022105027099003)(22082099003)(18002099003)(11063799006)(261021121427099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hZzt1XJeMrA/W24YfuylxoSGwcbUVfUafJpimR0LrPZ8Hioj08hQelvYViMhKewJhxanpOUzoWsVpLDwMvQE6qprmf0aXxbXJjxhqnGD7ZKVWcwj9FLZT20koglCLyuZmJV9gEmHRSAUvOlfIABH5eKhQxRrGcJKCcJsYlPVBlAZRQ09Aw9NkAvttfUlhv9/N77t/9LiO8rUZFpbyR+0RlxUbPmzipGRGEdrLNN84qkCVQimfNW6p4IFTpRghGKPTbgEFW9NqFGpU9uHx1BzFvt7raTtziMULenhL3nyjfwqXybHqhf/8jT9UXU2hHScLseL8SerQmh+WM4MbcdqqeVap2KSEUkq6jp9x1RSPlxMM67uPzrfWQmcs9EvscqtexdHAJJZzzss9O8l53npPZRETB5GYJJ2tpHSzRO3TikRBsYuOkpdxLplM6uKORF1 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2026 06:53:58.0444 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d83aac0d-58e3-40cc-461a-08df30d26986 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=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF00012E62.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4391 Append "mic:acp-dmic cfg-mics:N" to card->components in mc_probe() when a DMIC DAI link will be registered, keeping the components string consistent with what sof_card_dai_links_create() actually creates. Gate on the same three-way condition used in sof_card_dai_links_create() (ASOC_SDW_ACP_DMIC quirk, mach_params->dmic_num, or amd_ctx->pdm_sel) and suppress when ctx->ignore_internal_dmic is set. Use mach_params->dmic_num for the mic count when platform-reported; fall back to 1 for quirk and pdm_sel paths. Signed-off-by: Vijendar Mukunda --- sound/soc/amd/acp/acp-sdw-sof-mach.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sound/soc/amd/acp/acp-sdw-sof-mach.c b/sound/soc/amd/acp/acp-sdw-sof-mach.c index 5c201d0b3bef9..4c171e52410a6 100644 --- a/sound/soc/amd/acp/acp-sdw-sof-mach.c +++ b/sound/soc/amd/acp/acp-sdw-sof-mach.c @@ -406,7 +406,7 @@ static int mc_probe(struct platform_device *pdev) struct snd_soc_card *card; struct amd_mc_ctx *amd_ctx; struct asoc_sdw_mc_private *ctx; - int amp_num = 0, i; + int amp_num = 0, i, dmic_num; int ret; amd_ctx = devm_kzalloc(&pdev->dev, sizeof(*amd_ctx), GFP_KERNEL); @@ -489,6 +489,17 @@ static int mc_probe(struct platform_device *pdev) if (!card->components) return -ENOMEM; + if ((sof_sdw_quirk & ASOC_SDW_ACP_DMIC || mach->mach_params.dmic_num || + amd_ctx->pdm_sel) && !ctx->ignore_internal_dmic) { + dmic_num = mach->mach_params.dmic_num ? mach->mach_params.dmic_num : 1; + card->components = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "%s mic:acp-dmic cfg-mics:%d", + card->components, + dmic_num); + if (!card->components) + return -ENOMEM; + } + /* Register the card */ ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { -- 2.48.1