{"id":2228606,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2228606/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/20260427061934.1489551-3-aaron.ma@canonical.com/","project":{"id":15,"url":"http://patchwork.ozlabs.org/api/1.1/projects/15/?format=json","name":"Ubuntu Kernel","link_name":"ubuntu-kernel","list_id":"kernel-team.lists.ubuntu.com","list_email":"kernel-team@lists.ubuntu.com","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20260427061934.1489551-3-aaron.ma@canonical.com>","date":"2026-04-27T06:19:33","name":"[SRU,R,2/3] ASoC: SOF: Intel: Add a is_amp flag to fix the wrong name prefix","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"584fc99dfb22289439256232de78c7f4d43e0deb","submitter":{"id":72035,"url":"http://patchwork.ozlabs.org/api/1.1/people/72035/?format=json","name":"Aaron Ma","email":"aaron.ma@canonical.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/20260427061934.1489551-3-aaron.ma@canonical.com/mbox/","series":[{"id":501584,"url":"http://patchwork.ozlabs.org/api/1.1/series/501584/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/list/?series=501584","date":"2026-04-27T06:19:31","name":"ASoC: enable rt1320 speaker amp and DMIC on PTL SoundWire platforms","version":1,"mbox":"http://patchwork.ozlabs.org/series/501584/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2228606/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2228606/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (4096-bit key;\n unprotected) header.d=canonical.com header.i=@canonical.com\n header.a=rsa-sha256 header.s=20251003 header.b=N2CU52WP;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com\n (client-ip=185.125.189.65; helo=lists.ubuntu.com;\n envelope-from=kernel-team-bounces@lists.ubuntu.com;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g3thZ5c9hz23Zb\n\tfor ; Mon, 27 Apr 2026 16:19:57 +1000 (AEST)","from localhost ([127.0.0.1] helo=lists.ubuntu.com)\n\tby lists.ubuntu.com with esmtp (Exim 4.86_2)\n\t(envelope-from )\n\tid 1wHFJt-00071r-0s; Mon, 27 Apr 2026 06:19:49 +0000","from smtp-relay-internal-0.internal ([10.131.114.225]\n helo=smtp-relay-internal-0.canonical.com)\n by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.86_2) (envelope-from )\n id 1wHFJr-00070J-V2\n for kernel-team@lists.ubuntu.com; Mon, 27 Apr 2026 06:19:47 +0000","from mail-pf1-f198.google.com (mail-pf1-f198.google.com\n [209.85.210.198])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id D4BF93F071\n for ; Mon, 27 Apr 2026 06:19:47 +0000 (UTC)","by mail-pf1-f198.google.com with SMTP id\n d2e1a72fcca58-82f6a5b4f88so13322227b3a.2\n for ; Sun, 26 Apr 2026 23:19:47 -0700 (PDT)","from localhost.localdomain ([103.155.100.1])\n by smtp.gmail.com with ESMTPSA id\n d2e1a72fcca58-82f97eb5ce8sm29098493b3a.61.2026.04.26.23.19.44\n for \n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sun, 26 Apr 2026 23:19:45 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com;\n s=20251003; t=1777270787;\n bh=H70qgRQTIoIB9FdjedKDG4GDDxjWJF3Ee8o3ngUcU6I=;\n h=From:To:Subject:Date:Message-ID:In-Reply-To:References:\n MIME-Version;\n b=N2CU52WPXBJr/RSAsTmnUAItKkrnUVO2rSKk6OjYjD6MoEKoPBukvFTPx4eoUPuA7\n WPAxl5fCsw18XKQ3ex03YVGXNQYLYA9tvwqnHROgkFrldMLIaoAbFGSwgzPt0njawh\n HcieRQCJnyADUC82NBuWUnT/63oWZ8KFmZKbQKKt9vhQqOIFqBaKVTPcJWCEGDihxQ\n TfSQRfTphhyKr2P+MVOvDSzvgvFuF4ftxVmjw2zpx0/8cS8+SuT3t5OZFXNNAVI8v6\n lSSuaxG63Ca5wj6rJpEMUIX/fvrLnNEW+4uAaNzPGtCaYpqe/Ckfax0cwk2W9IFo5G\n hN0PBNNXlLcOpNFinzBvBt8iDISmANfbqc1tqCZ49sYBw42/a4unrVPrudGNRppPxV\n 6anu8qDwRmBSpkGNt84n2Po3NoPHFO9eBXDh4Hef96uBpghEp78oYxZtSGHqP6xtNB\n aw1XiSEJQoOK4/f+1dEcG8t5mzlFoepzaZLj2IiTiceuPxpWayxS5uciJ5dsArW6Jr\n RlAVOx6mrUAOPqzE2TxmOwXNH3AGyDICL12ztsgNMkCbJXf3YUAK58KGxnMAJWl5xq\n kMFI6t1HhqaeUXJsNc665/Bhudxjw1+d3makbR4JF9pby1m9cbNbmhyQg0dMMPQPh6\n YCvH5UeO+DXigxE18LqxoDbU=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777270786; x=1777875586;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=H70qgRQTIoIB9FdjedKDG4GDDxjWJF3Ee8o3ngUcU6I=;\n b=KKKLzZf4obxrvwuB30p1nYsHsxr+CHUV7OV1PXyPamJVsRp+MD/h70KOJ7GbZFTFli\n vxNUn/m/LopNQZaR0G6N+o0WH96EcN5vzrLR3LrEzmoOX8vJOS0bOYOqczniDb0hoTDx\n jiTwy0GLjF3FOJegiVj+/dTsLJAsNHE4h22uE7gJOk3VFilaHYjAaJo/sSUG97VpaFrM\n 6wo2M5Jcg4ofMsfq/wwBoE5crupMWppl2LXvTa2/bxoXfyIj7RGlMZYhwHvH0Kh6KYUj\n cyv9pp68ATK+f1NEDXrFYzOyZ1FW4FKu1Ebkxn1UlZa/v+8jS6If4oU51JWpE6Nrysur\n aVbA==","X-Gm-Message-State":"AOJu0YzpTlLTTusREKgklJ4fqkJZNQMZEJXaehpvBS6I1t/UiDJRTHR6\n bWaamfhXzJVA1JH7aqRKjASZtzAIuXDlHgCiEOxB/oxIMTy8Up/rrxNbqfgmdUEqMmcYx1Yi6Th\n oDOuUCwnOkiq29uGpUKMC2OPZXRa81FNLT9z+ZyJn4A8SIIvEw85W75tyfJJcxqJDLp2tGnc4tE\n nH3tCCQXJpwqkBKJPV","X-Gm-Gg":"AeBDiesFmSVvXgsCA5uJKBwp1D2oQjrtBvSgn5PNKmJ565X0amodMVDjMsOhvWeNV9Z\n i93yI3Fg388cAd509Pv2A/sJoBzLCrveSlA6LGGLm/kvGCCV4GJ09+AEaSWg9/TSQH8j1Qgfer/\n ZmA3E917JTKPc0AkDf/+Pfs0u3V2IlIy3zT/J9sNAfEvhBkrOWyqR1iiPkI+PJ9LgIk/FpYN8SB\n Gd/oxoQ9zAIKh6lBAeSbb2SfmFnAscTvktXCEqgbhFKPyjnJPBVfTti8sx5JvZ73qUUFKqsokWL\n tqldL3QB5nRRlsDcminN/cm6ANM8Es+Kb+nv7H9YGQUHn+FLRbl1dR/s0SxCNUrW/hoh38xmSa2\n ZB+nq6CFEXQbpOxD4Vr4o9waMaY1hKNbMrb7206srtqcp74qp","X-Received":["by 2002:a05:6a00:2d06:b0:82c:b808:4c59 with SMTP id\n d2e1a72fcca58-82f8c93901amr42802196b3a.46.1777270786514;\n Sun, 26 Apr 2026 23:19:46 -0700 (PDT)","by 2002:a05:6a00:2d06:b0:82c:b808:4c59 with SMTP id\n d2e1a72fcca58-82f8c93901amr42802183b3a.46.1777270786112;\n Sun, 26 Apr 2026 23:19:46 -0700 (PDT)"],"From":"Aaron Ma ","To":"kernel-team@lists.ubuntu.com","Subject":"[SRU][R][PATCH 2/3] ASoC: SOF: Intel: Add a is_amp flag to fix the\n wrong name prefix","Date":"Mon, 27 Apr 2026 14:19:33 +0800","Message-ID":"<20260427061934.1489551-3-aaron.ma@canonical.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260427061934.1489551-1-aaron.ma@canonical.com>","References":"<20260427061934.1489551-1-aaron.ma@canonical.com>","MIME-Version":"1.0","X-BeenThere":"kernel-team@lists.ubuntu.com","X-Mailman-Version":"2.1.20","Precedence":"list","List-Id":"Kernel team discussions ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"kernel-team-bounces@lists.ubuntu.com","Sender":"\"kernel-team\" "},"content":"From: Derek Fang \n\nBugLink: https://bugs.launchpad.net/bugs/2150196\n\nAccording to the Intel sof design, it will create the name prefix\nappended with amp index for the amp codec only, such as:\nrt1318-1, rt1318-2, etc...\n\nBut the rt1320 is a codec with amp and mic codec functions, it doesn't\nhave the amp index in its name prefix as above.\nAnd then it will be hard to identify the codec if in multi-rt1320 case.\nSo we add a flag to force the amp index to be appended.\n\nSigned-off-by: Derek Fang \nSigned-off-by: Bard Liao \nLink: https://patch.msgid.link/20260326075303.1083567-3-yung-chuan.liao@linux.intel.com\nSigned-off-by: Mark Brown \n(cherry picked from commit dd4a1963ddf0d0f5e129efec03f34ea37109b4b7)\nSigned-off-by: Aaron Ma \n---\n include/sound/soc_sdw_utils.h | 2 ++\n sound/soc/sof/intel/hda.c | 10 ++++++++++\n 2 files changed, 12 insertions(+)","diff":"diff --git a/include/sound/soc_sdw_utils.h b/include/sound/soc_sdw_utils.h\nindex 227347c8f0b33..6726c63ad50c2 100644\n--- a/include/sound/soc_sdw_utils.h\n+++ b/include/sound/soc_sdw_utils.h\n@@ -82,6 +82,8 @@ struct asoc_sdw_codec_info {\n \tconst int dai_num;\n \tstruct asoc_sdw_aux_info auxs[SOC_SDW_MAX_AUX_NUM];\n \tconst int aux_num;\n+\t/* Force AMP-style name_prefix handling (append AMP index) even if MIC/Jack DAIs exist */\n+\tconst bool is_amp;\n \n \tint (*codec_card_late_probe)(struct snd_soc_card *card);\n \ndiff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c\nindex 8a240dcb7fcb3..ac2ac030f9bb7 100644\n--- a/sound/soc/sof/intel/hda.c\n+++ b/sound/soc/sof/intel/hda.c\n@@ -1227,6 +1227,16 @@ static struct snd_soc_acpi_adr_device *find_acpi_adr_device(struct device *dev,\n \t\treturn NULL;\n \t}\n \n+\t/*\n+\t * codec_info_list[].is_amp is a codec-level override: for multi-function\n+\t * codecs we must treat the whole codec as an AMP when it is described as\n+\t * such in the codec info table, even if some endpoints were detected as\n+\t * non-AMP above. Callers/UCM rely on this to keep name_prefix and AMP\n+\t * indexing stable and backwards compatible.\n+\t */\n+\tif (codec_info_list[i].is_amp)\n+\t\tis_amp = true;\n+\n \tadr_dev[index].adr = ((u64)sdw_device->id.class_id & 0xFF) |\n \t\t\t((u64)sdw_device->id.part_id & 0xFFFF) << 8 |\n \t\t\t((u64)sdw_device->id.mfg_id & 0xFFFF) << 24 |\n","prefixes":["SRU","R","2/3"]}