From patchwork Wed Dec 6 11:06:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Prasad Potturu X-Patchwork-Id: 13481549 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="xcQXbEqC" Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2053.outbound.protection.outlook.com [40.107.223.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14978D3; Wed, 6 Dec 2023 03:06:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SpvVU0rtc8eRU1E33bjydU1VCyaDz9Icrk7wUsuhs+V/8mjxk1MPtaqzMVf3lJFe88gywfDKM10L300iF1wPr9wsBIedUi6Mvc5+Jq80V1jLX60vNxdDsbunnUXBdLNRvZ73U2rfQi1piT/dCfE1Ur66U/lqTv50dSEat1T0VpcGXUBW9pHW2j5SMaxKdAMOwnzZkE0Eh4Ei5QYt+pKkU99U+59+oGaIEyJiGt9k5Xc1UKK56WVrEhg+TokXOoauPavY4SajYj184CiTbe7r03Rc0ZLvhJ+jn66eJ9A8HXhzdjTUOdkPtnmk7jT4Y8PkETGMvQ+xybCVI+KN/rPgVA== 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=/vvXWSHBYZgr9lE5HLHqahrWcZxeUN4rh5k6aov2QBw=; b=XPAc7yOykKpvCWMXeCCfDR+8cs6OrC0qCiPdF2YEl5TOTGzWfGlbkjQEi4N0aZ3RfYYGdBYDEsi5MXC19BFe2bpKgRXLnO75daGrg6IDX6TdD1GVistgwdqFhAnwGptgZjUNxdlPkdLWjJof94xAlkAV7Ky8l0rUV/rCC+vcnWt2pYALBRkcH64ugXd5u8tp103/ISNaP+vL7BT36UyoxMkeZ8iRkLYgjHbAbE24nHCg/dM0ZvjJRzEaht8dZkm+1Df7yDGmN6Gl0eBHvECTg4grtq2wA/RxNZr09fnhYRsYP6CH6xXQ/2ZkrCM6bqOywML7iXVRTGFaA77xDV/W5A== 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=/vvXWSHBYZgr9lE5HLHqahrWcZxeUN4rh5k6aov2QBw=; b=xcQXbEqCV/yOPYtvFpLMHTxDhOiBSez4JG0qMIY2umaGopQFxAArdf7Xu5LUv3G2imMlQpvBDlqw5sPYOLKvkgTUp4EgoW/t7gsiojUID+gkdqG4775ltjNIRl/dEdXM7FYN485MqgH8i1q8wCWzBJZFrWfBSVTA1d+faoTLi2c= Received: from MW4PR04CA0074.namprd04.prod.outlook.com (2603:10b6:303:6b::19) by DS0PR12MB8443.namprd12.prod.outlook.com (2603:10b6:8:126::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.37; Wed, 6 Dec 2023 11:06:25 +0000 Received: from CO1PEPF000044FD.namprd21.prod.outlook.com (2603:10b6:303:6b:cafe::c6) by MW4PR04CA0074.outlook.office365.com (2603:10b6:303:6b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34 via Frontend Transport; Wed, 6 Dec 2023 11:06:25 +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; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1PEPF000044FD.mail.protection.outlook.com (10.167.241.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7091.2 via Frontend Transport; Wed, 6 Dec 2023 11:06:25 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.2507.34; Wed, 6 Dec 2023 05:06:24 -0600 Received: from prasad-lnx-mach.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 6 Dec 2023 05:06:20 -0600 From: Venkata Prasad Potturu To: , CC: , , , , "Venkata Prasad Potturu" , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , "Marian Postevca" , "open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [PATCH 1/7] ASoC: amd: Add new dmi entries for acp5x platform Date: Wed, 6 Dec 2023 16:36:12 +0530 Message-ID: <20231206110620.1695591-1-venkataprasad.potturu@amd.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044FD:EE_|DS0PR12MB8443:EE_ X-MS-Office365-Filtering-Correlation-Id: bbcbdd4f-e756-484e-22a9-08dbf64b6359 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J4DYWNDnVITvJmmxe/gQ6WKgz73kaOH2QuYe7hUo8CDWWgvsMwMIcqXhinz9ninW+yUtMzR1wpM8IcR3RmQ0j/jYeOUvNuphUt1BqgjavL3nyC4BwPLO/EreWanbxS6K2QYiQkpe/yhL9iMxC8KSzeR214BUIh+WGi23GQRErSAG8dvdGYRDxb2da0eb9uI7X3PpPgIkKBpLU7SpP0MmsX2KS00eKN6tnIEMU5o0eUWW1E56rzAOFLRWabSDlE5vpzo6COxC+bUJb2/JaC58ZqOSfolJmc6ZetzU40pIL2c0N3Eex8QXIGR0orrHnxM2mTIzE+l6P/fZB94llwTv2IJ7aCOqmeilNftjn3xeXj2oingWEsAMO9LRPBli/8rOWlAwgO5b7a4w9PJPwcy4n7mmhG0icIivIEamfe+QBE5hbx0p5pPqDNWEB0CkKcIppqfRyupp4aCDcwBTLGqth+PnqqE/WDJu+sneDC3xDC7eXyVPkNbAbtiEgZuA4UMwIV9Z8F5nK2lj04aYyGVGRxMH1CzDlPzNymP6sxXkKfQjpgFS1Fh0pZSi5QkYLr6imfzVRoxqFCsWlChgpvB4I7rHlGo4DKp8quBdXwJVfNBNyi5hYlXsxeupoLzHPihX0PhHYbvT7SIWY13VR4idO+IJoVwxt5ILlz/Vr0L2XDzc+ncgGBiQoWh1gywDs673KNzZUotmo6eefI1A9agjHv+70L3v5zD/xYzVh2OYww9cnmZH3oaGzHQR3o+lVzBxzvfpT9Oea/EXTyhdE5JLVRSOdWlJpnR2SPN2f5m6G49qi5rk4LE+M7oPABlHimmHcGtuilrgP8yp1UmTw7Siww== 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:(13230031)(4636009)(346002)(396003)(376002)(39860400002)(136003)(230922051799003)(82310400011)(64100799003)(451199024)(1800799012)(186009)(36840700001)(46966006)(40470700004)(8676002)(8936002)(70206006)(70586007)(478600001)(40480700001)(4326008)(7696005)(6666004)(5660300002)(316002)(54906003)(110136005)(2906002)(2616005)(40460700003)(26005)(1076003)(36756003)(47076005)(81166007)(82740400003)(356005)(36860700001)(83380400001)(426003)(336012)(41300700001)(86362001)(42413004)(32563001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 11:06:25.1104 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bbcbdd4f-e756-484e-22a9-08dbf64b6359 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: CO1PEPF000044FD.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8443 Add sys_vendor and product_name dmi entries for acp5x platform. Signed-off-by: Venkata Prasad Potturu --- sound/soc/amd/acp-config.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sound/soc/amd/acp-config.c b/sound/soc/amd/acp-config.c index 20cee7104c2b..19a30f145143 100644 --- a/sound/soc/amd/acp-config.c +++ b/sound/soc/amd/acp-config.c @@ -3,7 +3,7 @@ // 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. +// Copyright(c) 2021, 2023 Advanced Micro Devices, Inc. // // Authors: Ajit Kumar Pandey // @@ -47,6 +47,19 @@ static const struct config_entry config_table[] = { {} }, }, + { + .flags = FLAG_AMD_LEGACY, + .device = ACP_PCI_DEV_ID, + .dmi_table = (const struct dmi_system_id []) { + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Valve"), + DMI_MATCH(DMI_PRODUCT_NAME, "Jupiter"), + }, + }, + {} + }, + }, { .flags = FLAG_AMD_SOF, .device = ACP_PCI_DEV_ID, From patchwork Wed Dec 6 11:06:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Prasad Potturu X-Patchwork-Id: 13481550 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="g7IRYH9V" Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2084.outbound.protection.outlook.com [40.107.220.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4C0BB2; Wed, 6 Dec 2023 03:06:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hrM5AXdWnC7Odo3YST9jQgW+GE7THzSrfxpj2fNVkZqTlVzcgbaeImCZFOoDrnUTri4MVt0FJQA2Y4jPCcIHwXUKwAuNbiKovo6KRTxyGGbHQWd2/DlVXGjFRzsw39CS7bLWBxoTG37JPuiz+FrGc6a2UiOE+yPqeHBuTWQj5W92yeKP+ZCWeixburGFCWQQFOscCYhqqNoWmIBfzDVO/031tSJXkl+LfNhg0yKUwo3fy9nheGCvO3Qv5hwalgDhApLEUdb9jO0QfBxQ2vOLB3w+AvBWdLeWOYb90oi/htYvBrNDeQxmNLjFHiHltX0/TTgs7g47jX/VI28pWlg59A== 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=1cv52DuRUYZgv6YRplLvGa50YGTE58yTv3s1SwHY+Sc=; b=lyC9iK1f0ON9YCqSbtAg1FY3tmoYIPg3tRuWhqhKdfl2FAq9vBUsLnMPRzwn6+E9nB571Xk72p+oa/MnGUr/kX1HN5CjNhpAGG3FlZ1fArJxPf0zkmtXGEFGSV/OCNTV/dR3hYf3SdUdIwXBNkae91+8zZdBtwGEtYGi5uR/CzIeRkNAjNqRfhM6ynnVfPQcNk/o+QJGJBVqm9j9XZslCUsjhHLdREkwtg9OsukM4f9vMoOCg1hcARBnAbQyErqZr7YMu2in4Pz7yQOpJuAyhav5/UIOK0qIvMT4x3DibtTYbHQ41FoAAXc4YDKoB+X1UabN2AAMm2O+ppjDKWaggQ== 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=1cv52DuRUYZgv6YRplLvGa50YGTE58yTv3s1SwHY+Sc=; b=g7IRYH9VgInTB7A+IHK2FFRG+FV5UbVBKY2K3TJ0CRPVS5UdwJPo3vzmpKh6FcR1Np7GlTb9LtsTbt3OWN4xYTGW4+Fqtx6Eu4T9x3oB6kCKutwgWyPirZTzkbakWqmyMZBgXBhjgeDYcADLD/asFhacJEe1LWFOQe1Dme+e0rY= Received: from DM6PR11CA0072.namprd11.prod.outlook.com (2603:10b6:5:14c::49) by SJ2PR12MB9192.namprd12.prod.outlook.com (2603:10b6:a03:55d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34; Wed, 6 Dec 2023 11:06:30 +0000 Received: from DS1PEPF0001708F.namprd03.prod.outlook.com (2603:10b6:5:14c:cafe::33) by DM6PR11CA0072.outlook.office365.com (2603:10b6:5:14c::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.32 via Frontend Transport; Wed, 6 Dec 2023 11:06:29 +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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0001708F.mail.protection.outlook.com (10.167.17.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7068.20 via Frontend Transport; Wed, 6 Dec 2023 11:06:29 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.2507.34; Wed, 6 Dec 2023 05:06:28 -0600 Received: from prasad-lnx-mach.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 6 Dec 2023 05:06:25 -0600 From: Venkata Prasad Potturu To: , CC: , , , , "Venkata Prasad Potturu" , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , "open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [PATCH 2/7] ASoC: amd: vangogh: Add condition check for acp config flag Date: Wed, 6 Dec 2023 16:36:13 +0530 Message-ID: <20231206110620.1695591-2-venkataprasad.potturu@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231206110620.1695591-1-venkataprasad.potturu@amd.com> References: <20231206110620.1695591-1-venkataprasad.potturu@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0001708F:EE_|SJ2PR12MB9192:EE_ X-MS-Office365-Filtering-Correlation-Id: 87f0490b-e75d-44e7-2a54-08dbf64b65fe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 20BLgfaCqXOdvtFNj4OwxUEAYyJJx7YxpOK73gCFiUa9DCqq485ZjP7PVNI8CmIzo5Tn6ACwhIRKVegfPLWZsZClfHAhDqfeoFP9V8LNsp3DMzfbBssJdRG9thQPwJfbrvhOR/swgB6dcEnue3hqeBYYcIVZAWP1LWayx6moBsCrOGNo8vNA2kXq+sOtqsOufisgJZRNF81PxwOzgXPM6hO2rnpDwanTN7L1HhOpwdaIZdHvmtMuFlExqe5fge7wsTSppeL7BrLvwVO4QqknWSSnc7B5giim7LBOilWuZoVCkR5XEWQdR9ERfb3/m/7FcZn6L23JZ39X8xY8lq2TNTlZTaHqC7/rwL2dU4doJ1MbPZutvhyXYlruge8l8RChJ8F61GU+NtBQgTobOSr9O8M22cVauRwxT3/b8rU7/rsLvMnUdWxq3FnElAwuWb/lLt0wZDkIkDuVqF9QeFo3rd/j/XWostzVsB2UQm4Jb4rprRM9LpCE1UWMdiSoV/uf010I56YH9mXrbznQ8wIQUpC9c/NlUoNPz9m/WzwE8ZlfzujcRFKH5hWw0GzATuX9sTp085Axadli5To8hrRBC3W2zg1gPhdYueA72VTBKpHDCBax/27/lyYA68iLJkwE/RpN+WcWfSH1kGjWJPJcNRYopqF9MtKdGg+95DKT5mljqagZ8onE4Vu2mnn/SP9ukBajDqLMbkMC3ZOrfZ6lQ3rSgD7QYO8zUKCZ7MxYwtZ57yE4QXccIKk+kQ3lpw/CYAvsjdB/p5IdDRYKlsm9yQ== 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:(13230031)(4636009)(376002)(39860400002)(346002)(136003)(396003)(230922051799003)(82310400011)(1800799012)(186009)(451199024)(64100799003)(36840700001)(46966006)(40470700004)(83380400001)(82740400003)(40480700001)(336012)(426003)(41300700001)(36756003)(47076005)(356005)(81166007)(36860700001)(2906002)(26005)(2616005)(1076003)(6666004)(478600001)(40460700003)(5660300002)(70586007)(86362001)(110136005)(70206006)(7696005)(54906003)(316002)(8676002)(8936002)(4326008)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 11:06:29.6411 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 87f0490b-e75d-44e7-2a54-08dbf64b65fe 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: DS1PEPF0001708F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB9192 Add condition check for acp config flag to load legacy driver only. Signed-off-by: Venkata Prasad Potturu --- sound/soc/amd/vangogh/pci-acp5x.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/amd/vangogh/pci-acp5x.c b/sound/soc/amd/vangogh/pci-acp5x.c index c4634a8a17cd..3826443d77b9 100644 --- a/sound/soc/amd/vangogh/pci-acp5x.c +++ b/sound/soc/amd/vangogh/pci-acp5x.c @@ -2,7 +2,7 @@ // // AMD Vangogh ACP PCI Driver // -// Copyright (C) 2021 Advanced Micro Devices, Inc. All rights reserved. +// Copyright (C) 2021, 2023 Advanced Micro Devices, Inc. All rights reserved. #include #include @@ -13,6 +13,7 @@ #include #include "acp5x.h" +#include "../mach-config.h" struct acp5x_dev_data { void __iomem *acp5x_base; @@ -131,7 +132,7 @@ static int snd_acp5x_probe(struct pci_dev *pci, /* Return if acp config flag is defined */ flag = snd_amd_acp_find_config(pci); - if (flag) + if (flag != FLAG_AMD_LEGACY) return -ENODEV; irqflags = IRQF_SHARED; From patchwork Wed Dec 6 11:06:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Prasad Potturu X-Patchwork-Id: 13481551 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="MRpqYSgh" Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2062.outbound.protection.outlook.com [40.107.223.62]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE995137; Wed, 6 Dec 2023 03:06:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OWGEW/4sLc7xrqEvinar+IG57jcRg8WAIzSuBf8XaOlFVGS2hQt2UrElFT6+fvK9+iX+zjU+k14PL3eIKayvAYRhmaNc412M1SMvmVd0U8kXcFEs3CkFFVz8vM3iAzmFye3m1dWeoRlSX/QfooC0e81P5V+0n5JcejWCNyiIjT/evNgOlMaafQCMiJNsRfrE0WP5G7zSP76uyyKiykSFHb9kDem8EfTNKR8pBd1WtzsG3ZqTxT5254EZIkUINI7ZE4QCodUbuiMTrm/GX++gUvcKdYzdF7SUeLBy++UQBUBC0bMQXifqK57hYXrgO161z4he0xWggXmTrhRJR+LfAg== 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=7/NzWYCG5OQPPxl4qdNffnyHNAPl6R6W+0oTRG5CWGY=; b=Li0EJAnvPAt2er6h5MqAQhcdoUcEmVD6z9E03+QayOpuNPTTOu1yBJFPzYXyHf66pPaugE6+LygR0QI2N73G2S/umzHc+lqZ1RJ3KWqUYtToZshPw73EbBVpD5P7R7kKfZUGSrgj/BekD+1gL1rg8f3uy8s09dwyE5JEBtF1fg1Illeqa6jUecg9jgM6JUJLV8fiFCBioLqCnNMR+/C9/ry8x1UCL0Sml5gCH/QTHfzlawO5rwYTbscZuCArDe1kpfs4AqX/7wIOf65Zrv1mIEH+NTioiM9IVvrhk4W4hT+PAqUKDsZe4QYgi5CqF3RB4KBBD/iI0SEq2/qQbm2Wsw== 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=7/NzWYCG5OQPPxl4qdNffnyHNAPl6R6W+0oTRG5CWGY=; b=MRpqYSghPuLSpFdXxlMyg/wdQ7qHL2xNZ1egySYNNtF1iNeBdxlZTqxZvx7lgeSxAPQmOYBMk91AzRGQN5i4unM0MS6uA9ZRtXsvEb6EM19Ar3hl54L1VZI5FAEPf5mi9KcsuFDuLlDop1t2AVn3Hj+0wXXD+kL1iD94aeGB004= Received: from DM6PR11CA0044.namprd11.prod.outlook.com (2603:10b6:5:14c::21) by DM4PR12MB5117.namprd12.prod.outlook.com (2603:10b6:5:390::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34; Wed, 6 Dec 2023 11:06:34 +0000 Received: from DS1PEPF0001708F.namprd03.prod.outlook.com (2603:10b6:5:14c:cafe::8e) by DM6PR11CA0044.outlook.office365.com (2603:10b6:5:14c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34 via Frontend Transport; Wed, 6 Dec 2023 11:06:34 +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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0001708F.mail.protection.outlook.com (10.167.17.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7068.20 via Frontend Transport; Wed, 6 Dec 2023 11:06:34 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) 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.2507.34; Wed, 6 Dec 2023 05:06:34 -0600 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Wed, 6 Dec 2023 03:06:33 -0800 Received: from prasad-lnx-mach.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 6 Dec 2023 05:06:30 -0600 From: Venkata Prasad Potturu To: , CC: , , , , "Venkata Prasad Potturu" , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Marian Postevca , "open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [PATCH 3/7] ASoC: amd: Remove extra dmi parameter Date: Wed, 6 Dec 2023 16:36:14 +0530 Message-ID: <20231206110620.1695591-3-venkataprasad.potturu@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231206110620.1695591-1-venkataprasad.potturu@amd.com> References: <20231206110620.1695591-1-venkataprasad.potturu@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0001708F:EE_|DM4PR12MB5117:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ea3cce9-95c2-47cb-9175-08dbf64b68ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rc37HpcUg6sDr+m+yCpq8MjfyTx1Zu02bUHzWDaIEeYbJMNiegiGP65JbEcoV2XtrBtD5N3tU4jTkNqKVV19MHdSv4uv/S9Qwvz2iOirzXQhoy4nRhav3BPUetbBbv5+WXq3uJ0HY3MXMzoOv4YwwEc+JIRwKZqE0VBXj6WDSHQBRCl4aTplFMGSpXvFawdU5FVIZgtDZNsT+0wnB/slN+aqRf8fkXzMzi1U4YxVjMG3PltBRumb9xA8//I0JPnuC4BcAjFjU8eXNbMRPCqV7WTE1Cc2l+4I2voWWTAVmtcbeMVXuk8Y8cCJ8w8MxP32YloyVFqrjGtfp2kSN/IgabcP2kiz+yAnN/tUXVaRxg7oPNuLh/8ob6DhCxgrT4eNnTS3NSzH7mAewMiYaZup6TfYJaTtglEPgVWlaP+wZNIiysstb8bBK26rtVsY0T6551iS6LHIjBAUfb4RO8ZBtA/RmilVkNOItxkZpPQB3mtSvj6avm/y/JYYViA8cZihj5swTgThpZRSti/3E7nR/3AVl6mAk3WGIwpx2Goa6QEznq+I6mwZnC6eHgsTPoQKbp0V7axd/9phvw2obzk8fus+XH85U5tgk2SLDkTJTEWPrnSAUX7kEkr4zDyuoIOoVdsyxuLQ/Q2/0/6xFEWcR1LgHRypoiGD1LJkD9jDcmy7pYfbIik4gI+2qFCr7GlhezRTO47IPZPNf+gXoCDii+gp0w3XB2gU132ioLhQpSlbkCFViBx825zF/ZCYpft8RfUFJ6F5i059t6x02NCFqg== 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:(13230031)(4636009)(346002)(396003)(136003)(39860400002)(376002)(230922051799003)(451199024)(64100799003)(186009)(1800799012)(82310400011)(46966006)(36840700001)(40470700004)(478600001)(4744005)(40460700003)(82740400003)(5660300002)(36860700001)(2906002)(41300700001)(86362001)(356005)(36756003)(81166007)(2616005)(1076003)(6666004)(26005)(7696005)(8936002)(8676002)(70586007)(336012)(70206006)(110136005)(4326008)(54906003)(83380400001)(316002)(47076005)(426003)(40480700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 11:06:34.5786 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6ea3cce9-95c2-47cb-9175-08dbf64b68ef 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: DS1PEPF0001708F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5117 Remove extra dmi_product_family entry in amd config entry table. Signed-off-by: Venkata Prasad Potturu --- sound/soc/amd/acp-config.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/amd/acp-config.c b/sound/soc/amd/acp-config.c index 19a30f145143..04b58fb29a35 100644 --- a/sound/soc/amd/acp-config.c +++ b/sound/soc/amd/acp-config.c @@ -68,7 +68,6 @@ static const struct config_entry config_table[] = { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Valve"), DMI_MATCH(DMI_PRODUCT_NAME, "Galileo"), - DMI_MATCH(DMI_PRODUCT_FAMILY, "Sephiroth"), }, }, {} From patchwork Wed Dec 6 11:06:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Prasad Potturu X-Patchwork-Id: 13481554 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="kl1ImfvD" Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DCE8B9; Wed, 6 Dec 2023 03:07:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KLAxRUWjBtgz7Bup2q/kUDCjSLA3fKdYvG0rayfVuKY5Hmpmu2cSW/yo0Y5qd7oOutOFb4PkZwE0oI8ZWTDIiL86aaD4KPQqkHfYmtcE4SDl+BcuXUqA3JxELOXxobk5wl2Eq0ECARU8xvwYbATQJslbguWyRBQuDHidZzRHdltpy85xZwsz4GEhJHTCkKkBqC2ksqg47yvmfkxxQPk2xvcFFd6EjvNTGdjHezRykgn5JXnCTJ0JV2j/q027D6OS7sreBgbljGg9cuuPDLP85GR1x25hq+DJ8Jgz/F/aVMOiT1CXnzuxUSWPfNx8KYWq152cKgtwU64OqURjYMNWFQ== 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=PEKAv+2ap2RpYec7O8hW6yqQYk+MEILSgfpLaFATnJI=; b=PehT5ZGOVnGa+xwVTVJ+PkdSwfG7h5dxdTtD08G2U4ubmK+oTPkpcb0AjlijDwSiOASAMQeWXZ9tdRVg1C91gHZ8xyEto5kC7NBDMcKVY3DExbVeLvQfd4APf75Z7tM0CyxYcBF+aUZQCsm02VqTmmjQWiBXVlcbJ5as4wtNJBBUO4tEBumeC2yqiQjfb0AhnyTaK3thDNzoACaLqHFDDwVTqlg9HSFiuK0Jau3eKbjucEo5U84HohhuQcQ0yCy07IBZTmY9dzVYVNC0z3JDomzsOHCtwcOaoCsWmZ+1AYRs5NNI48Ss0Y+1T8WlLvoV9zIm1wn3LJuSwq2awPhmKw== 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=PEKAv+2ap2RpYec7O8hW6yqQYk+MEILSgfpLaFATnJI=; b=kl1ImfvDtNjXAA68zKg27hE/C/cN6ldFnktMNqAXrbOEH7KRQnbizIqnpOFs+q15RHs2BhQSkBdQnN4STJ9Txyv9/aYaAgYHk29tNJg2dM9K9jtb8gnJ+nC/gdnwgs5HZ9fFoLrRcTkDk6Vq7U3eMsT1EqhLpnFQ65l4QWBPWN8= Received: from DM6PR03CA0045.namprd03.prod.outlook.com (2603:10b6:5:100::22) by DS7PR12MB6311.namprd12.prod.outlook.com (2603:10b6:8:94::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34; Wed, 6 Dec 2023 11:07:25 +0000 Received: from DS1PEPF00017090.namprd03.prod.outlook.com (2603:10b6:5:100:cafe::95) by DM6PR03CA0045.outlook.office365.com (2603:10b6:5:100::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34 via Frontend Transport; Wed, 6 Dec 2023 11:07:25 +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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF00017090.mail.protection.outlook.com (10.167.17.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7068.20 via Frontend Transport; Wed, 6 Dec 2023 11:07:24 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.2507.34; Wed, 6 Dec 2023 05:07:16 -0600 Received: from prasad-lnx-mach.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 6 Dec 2023 05:06:36 -0600 From: Venkata Prasad Potturu To: , CC: , , , , "Venkata Prasad Potturu" , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , "Alper Nebi Yasak" , Syed Saba Kareem , Peter Ujfalusi , Kuninori Morimoto , Marian Postevca , "open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [PATCH 4/7] ASoC: amd: acp: Add new cpu dai and dailink creation for I2S BT instance Date: Wed, 6 Dec 2023 16:36:15 +0530 Message-ID: <20231206110620.1695591-4-venkataprasad.potturu@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231206110620.1695591-1-venkataprasad.potturu@amd.com> References: <20231206110620.1695591-1-venkataprasad.potturu@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017090:EE_|DS7PR12MB6311:EE_ X-MS-Office365-Filtering-Correlation-Id: 88b8142a-6ba5-4a26-5b2c-08dbf64b8700 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CGyNFivQ5Ohu5+Dh/SE+jUcWvaZQvmg4vWgWkF0u3H93mHeesA4jc8J1eJQ44KXJBvQhHdUk2OGdJ9sZUaUAjkGIKyMQmcWxW0Rf5L5Cq4aFHn9HCbGviwBTHnzZIOD+bk6Z47sWHJg41atqkcI53wbDvSumezRRbVUePtcU+76UcUeyM5a5UA2ougBIjJ5SqL9GxOXPRiMHGXV2cp+t7td+punV/qcdf9TXCmWbf9cwKO/JAitYpbXOdyUVPMXsqMgrY8hMH8Hwuj9SCEfK/LjoIMRuKMnaeljPGH91iYi3VN6hnpLl8PRVdNbMaa4bNcyT28kWJQ1eaO+ZRKel/0oyv1O4pkMlfadMXmHh6ND7B6IHmBRSbRi/gDqcx2C491m7Fo8UxDjnTsisHcLelAbXPYcWgenk8cKaeyPI6TUZxG0nEesxSBPNbPuwGQkizVmkri272bP4YZuGQIt0wnersLBb2TxcXlGpklWIP04N2qr2AGfLJ5ra+1nieQscBRaQiBINEHpgLQnXw48lCVHEgD7hjVE4n5qvVQlQCIM9wvqJqBFQtRfw8JrcnR2CUUvX+XldPWJc7vwVBH5Dv6GJMjvLzj9ZJD7VPALbMeiD7E9IMEQDsXn3U7lR0odZRQFOhzvDtu4uYB7F0yV+09IVeSvGwB5PcJbPboUdkfX9XJqSULjOw7xH6iaMEqxIFgfTh9THiWxtDVoaDNXbARuNguPHSvLPvhWGcADSTtjg+Q6P2irrTA/mkLQhdTjTQIplF9PSfiiHWmgo4vbGrg== 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:(13230031)(4636009)(39860400002)(376002)(136003)(346002)(396003)(230922051799003)(82310400011)(64100799003)(1800799012)(186009)(451199024)(36840700001)(46966006)(40470700004)(2906002)(86362001)(5660300002)(7416002)(426003)(83380400001)(336012)(40480700001)(36860700001)(81166007)(356005)(82740400003)(47076005)(36756003)(7696005)(40460700003)(2616005)(6666004)(1076003)(26005)(8676002)(8936002)(4326008)(41300700001)(478600001)(110136005)(316002)(54906003)(70586007)(70206006)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 11:07:24.9891 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88b8142a-6ba5-4a26-5b2c-08dbf64b8700 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: DS1PEPF00017090.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6311 Add sof_bt cpu id and create dailink for i2s bt instance in acp common machine driver. Signed-off-by: Venkata Prasad Potturu --- sound/soc/amd/acp/acp-mach-common.c | 25 ++++++++++++++++++++++++- sound/soc/amd/acp/acp-mach.h | 3 +++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index 34b14f2611ba..4631af028f15 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -3,7 +3,7 @@ // 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. +// Copyright(c) 2021, 2023 Advanced Micro Devices, Inc. // // Authors: Ajit Kumar Pandey // Vijendar Mukunda @@ -1290,6 +1290,8 @@ SND_SOC_DAILINK_DEF(sof_hs, DAILINK_COMP_ARRAY(COMP_CPU("acp-sof-hs"))); SND_SOC_DAILINK_DEF(sof_hs_virtual, DAILINK_COMP_ARRAY(COMP_CPU("acp-sof-hs-virtual"))); +SND_SOC_DAILINK_DEF(sof_bt, + DAILINK_COMP_ARRAY(COMP_CPU("acp-sof-bt"))); SND_SOC_DAILINK_DEF(sof_dmic, DAILINK_COMP_ARRAY(COMP_CPU("acp-sof-dmic"))); SND_SOC_DAILINK_DEF(pdm_dmic, @@ -1348,6 +1350,8 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) if (drv_data->hs_cpu_id) num_links++; + if (drv_data->bt_cpu_id) + num_links++; if (drv_data->amp_cpu_id) num_links++; if (drv_data->dmic_cpu_id) @@ -1497,6 +1501,25 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) i++; } + if (drv_data->bt_cpu_id == I2S_BT) { + links[i].name = "acp-bt-codec"; + links[i].id = BT_BE_ID; + links[i].cpus = sof_bt; + links[i].num_cpus = ARRAY_SIZE(sof_bt); + 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->bt_codec_id) { + /* Use dummy codec if codec id not specified */ + links[i].codecs = &snd_soc_dummy_dlc; + links[i].num_codecs = 1; + } + i++; + } + if (drv_data->dmic_cpu_id == DMIC) { links[i].name = "acp-dmic-codec"; links[i].id = DMIC_BE_ID; diff --git a/sound/soc/amd/acp/acp-mach.h b/sound/soc/amd/acp/acp-mach.h index cd681101bea7..a48546d8d407 100644 --- a/sound/soc/amd/acp/acp-mach.h +++ b/sound/soc/amd/acp/acp-mach.h @@ -28,6 +28,7 @@ enum be_id { HEADSET_BE_ID = 0, AMP_BE_ID, DMIC_BE_ID, + BT_BE_ID, }; enum cpu_endpoints { @@ -68,9 +69,11 @@ struct acp_mach_ops { struct acp_card_drvdata { unsigned int hs_cpu_id; unsigned int amp_cpu_id; + unsigned int bt_cpu_id; unsigned int dmic_cpu_id; unsigned int hs_codec_id; unsigned int amp_codec_id; + unsigned int bt_codec_id; unsigned int dmic_codec_id; unsigned int dai_fmt; unsigned int platform; From patchwork Wed Dec 6 11:06:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Prasad Potturu X-Patchwork-Id: 13481553 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="0ut6qrfa" Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2063.outbound.protection.outlook.com [40.107.96.63]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED58FB9; Wed, 6 Dec 2023 03:07:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jYBO8g7jsSmIaogZOcPfqinVprJ3n7RgEJvgh/J4hZnFaoAPPjd4Zu1ydJ0NBMaSFujzUhW1Bhn8PGEq4gx3iTZ/temRblfOTgutrHcfeADHuhNEGC2tEiaDc5msep3U77rHOGko010coj3cOTUzHIjUp7r0mzZvZYaCqEh6Jck/+3LxOhOmpKK3pHzsvi2WPDhLMTQj1B3iBxHgsY3S4898JuuiHOsKZvKTk1H61MKJStIawW4nA/VmMbqc69+i5kAM/1H1a2VyarS4D4+5u03cFnijZ7SnWBGJd8ZNqgP4dPZnzQIeF7eHDodPDtJfKYBkgjNQUNCklCdthzoLBQ== 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=UDzqPMYcps4a5DY8Cx/RAjQce+aHfYvgoNfcQ9tTXso=; b=QH1JeDt/Fb6GMxY/OScwSsqchPK0d6Cs4P2uBJnvdshPM13eaE4lcNtKkeDCuDgB2VZBFJFHiZrlBMtRKuk8K1Z+blI0cykPLLB0mwNF5QBTGu43GmaSdBzox3iRAN/fwcvgMCnLjw7+Cv2mvVScbFj/2SE1XotRxd10Pd0XWFfubO4j/hOw1OrSiO1f526ligCmmfBxaMlEYS6emK/5nauAtbxhCW6ooEreq27VHidYoe7xZ4OrTcXAuk8cKut7xq1T12TfG3ExM8GLdc/QOXN9bvdlB4qV/xAxooD/CZha724gTFzpqFTgHRZUHUuNrgeTYSVYu5v/Jg83cs9HWQ== 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=UDzqPMYcps4a5DY8Cx/RAjQce+aHfYvgoNfcQ9tTXso=; b=0ut6qrfaftULwPcN2U5mnENcmkbFAZgipioA0chWWfQN5R1bSgTp0e3MXUJ80hASiSrqVFD/h91yyKsmCO54pIAxjwW+fjGxSfje3Qje13nTlkPIumhqd8O+CjG2QrswSSpEGbN0SoHN21RTz4rANTVaGlxg5Y4SinoCrG0L4ZE= Received: from MW4PR04CA0268.namprd04.prod.outlook.com (2603:10b6:303:88::33) by MW4PR12MB6707.namprd12.prod.outlook.com (2603:10b6:303:1ee::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.25; Wed, 6 Dec 2023 11:07:24 +0000 Received: from CO1PEPF000044F7.namprd21.prod.outlook.com (2603:10b6:303:88:cafe::61) by MW4PR04CA0268.outlook.office365.com (2603:10b6:303:88::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34 via Frontend Transport; Wed, 6 Dec 2023 11:07:24 +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; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1PEPF000044F7.mail.protection.outlook.com (10.167.241.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7091.2 via Frontend Transport; Wed, 6 Dec 2023 11:07:24 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.2507.34; Wed, 6 Dec 2023 05:07:21 -0600 Received: from prasad-lnx-mach.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 6 Dec 2023 05:07:17 -0600 From: Venkata Prasad Potturu To: , CC: , , , , "Venkata Prasad Potturu" , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , "Alper Nebi Yasak" , "open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [PATCH 5/7] ASoC: amd: acp: Add i2s bt support for nau8821-max card Date: Wed, 6 Dec 2023 16:36:16 +0530 Message-ID: <20231206110620.1695591-5-venkataprasad.potturu@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231206110620.1695591-1-venkataprasad.potturu@amd.com> References: <20231206110620.1695591-1-venkataprasad.potturu@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F7:EE_|MW4PR12MB6707:EE_ X-MS-Office365-Filtering-Correlation-Id: 51056e00-2072-4e11-3e08-08dbf64b867c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rhMxQ0QtPtQ2115wPR4j4wYnLt16j9vj8Ul9CTMFdYMUrViY0BQNZ5b2NATduODLN9kUBO/3q7r3xqqHmO//4zkUpshUnlud3mDqriG3boMf4w6Z/rGGNdjhFgTDC9rIp2Wvarqy/PeEnaak64XYABBt5slVl6Z+6zxV9ZQTAwG3dR9rc1l4dAPdhBWBnUDNHV1Adg8hSquEJL3vUh/zf/pkpwM/ZTVHFt4XBoelFCocaj8SuyoUiyOjbOOMAbkY0O19CbBXC1cM+d92+JAhZjeUUywLU+4LuIa9VsGY8/R11/Ar+eKotNTSuAKY9vucs/EnGAMCY0ELUBcEFAy9Hb9MgrAcNdFGP9WbCFuj+OMfDY3osDXkpNKopari2NUjb7FPadTfs8alZcy+TNvjNaLCnm41Uv4mwMOsX6tj7oUzHo1c/B29EldO8gLEel24hOFtlKqp1HAwNDRvJid3hdYfPxNQycW2yMlBegud1ObYo0gf/FI4c+65+1OUHsMB7Sn4Lx7mDehZ3vuDS9qgOESwJYpTFE0vnBYZF6yelvpXDX36kAtGLap4dtwRN+lGOr1fBfmxUrIcjbWeFi3Ryq9EQN5noaHl+MFARNPyGY755h9H3eEtTJrf9O8JbYZBcx00Jho7+cFEopcCd/58WIlxFFRphIS5jkj6SLMWGo2J3uQqQOsEszuoR35FFu3Cv31m/jHNjc2l4jebbJHwE0YfGmCmrHNgZw9KDMEyw1nnUKzB44GOEnkDegCX5OuHT9PsbJls/m0wncUD0K0hPA== 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:(13230031)(4636009)(376002)(39860400002)(396003)(346002)(136003)(230922051799003)(82310400011)(186009)(1800799012)(64100799003)(451199024)(36840700001)(40470700004)(46966006)(2906002)(5660300002)(36756003)(41300700001)(86362001)(4326008)(8936002)(8676002)(316002)(110136005)(70586007)(54906003)(70206006)(40480700001)(36860700001)(47076005)(82740400003)(356005)(81166007)(478600001)(1076003)(40460700003)(7696005)(426003)(83380400001)(336012)(26005)(2616005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 11:07:24.0607 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 51056e00-2072-4e11-3e08-08dbf64b867c 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: CO1PEPF000044F7.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6707 Add i2s bt support for sof-nau8821-max sound card. Signed-off-by: Venkata Prasad Potturu --- sound/soc/amd/acp/acp-sof-mach.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/amd/acp/acp-sof-mach.c b/sound/soc/amd/acp/acp-sof-mach.c index 5223033a122f..2a9fd3275e42 100644 --- a/sound/soc/amd/acp/acp-sof-mach.c +++ b/sound/soc/amd/acp/acp-sof-mach.c @@ -3,7 +3,7 @@ // 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. +// Copyright(c) 2021, 2023 Advanced Micro Devices, Inc. // // Authors: Ajit Kumar Pandey // @@ -86,9 +86,11 @@ static struct acp_card_drvdata sof_rt5682s_hs_rt1019_data = { static struct acp_card_drvdata sof_nau8821_max98388_data = { .hs_cpu_id = I2S_SP, .amp_cpu_id = I2S_HS, + .bt_cpu_id = I2S_BT, .dmic_cpu_id = NONE, .hs_codec_id = NAU8821, .amp_codec_id = MAX98388, + .bt_codec_id = NONE, .dmic_codec_id = NONE, .soc_mclk = true, .tdm_mode = false, From patchwork Wed Dec 6 11:06:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Prasad Potturu X-Patchwork-Id: 13481555 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="ytjFoWkc" Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2050.outbound.protection.outlook.com [40.107.244.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CC22CA; Wed, 6 Dec 2023 03:07:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UdVsrSBpYOLoJtPm7PVtejH3QDI4F55Iej1etbEen/JwU6UvWBH2Z3qMG+rg+la1OQgHcj1yR99S08rZ+uv00aeb2yCOoDf5zDOW2/6L6wukXdRHpjXJGQzMfNfniXysefu5AcOv9JYst8kueGd5PJvbD2HQlLuu99G05EVq7Q4wdx9L8G8DJG7k7d0wNUhX27J5myXlDUunOVgyz+9amJAM8/qmG6vyQ9ZCMeijhiao6w4gqS1Ikv+1q1Hodtr4C8Rn2A4/yBuVLNnf9BqwBiHtsK1D8M3ELyOhgLFWNRCwhYeIS+p59JpI82+vjW0f07VfvVmnvNwk6JdgXyM0jw== 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=sMw7UXYPOH9Pu34WBiATYbROV60mTBr8EBSemRn5xIw=; b=cbThn9HGjL7KG2tKjpXfoLZuuEZAFHLoO7inQUo89V8IpanRAeQeiX05nWJY0KTlMh2oXsMVWAV44+4SuDefXfi1gRKOxebcgw6S9WGTT1kYgknVm1H54yG4HiHfYvhCeI6fz1ZpWtyda29laTo98hoOYuUQjElU3IGa2BEoZ47CO9cKgUmr5dYh1Jv1abet2MLzc3X/ZYAdBRLUmfcaAgfXm++0GwXjkFo5LLO4WmEfl+aymFGzV7/iQ61tM8DhhOoUgIAVcy9iJt2q+dC0WlxMAfEnySJQjEjuxSICbx122z8JmLCcvhXJP3ycHxSPSrQYUlwJDO3NRwQPBTDB+g== 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=sMw7UXYPOH9Pu34WBiATYbROV60mTBr8EBSemRn5xIw=; b=ytjFoWkc9gUU1bXqZP+NkYRsvdT7a5OIZBxGNfx6qkdYcM8chc3bAnX4TMM6X7CqY8rRM2ljL7ZLeQKABa07uiBpls7SnM+MCGEUIkbxaijYaDkmxcYr3Fcrm9VweNE8nTK3lG2FIj9PnNpwAQqfCBrVDSh3LQucusARZXC1sho= Received: from MW4PR04CA0067.namprd04.prod.outlook.com (2603:10b6:303:6b::12) by DM4PR12MB5312.namprd12.prod.outlook.com (2603:10b6:5:39d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34; Wed, 6 Dec 2023 11:07:35 +0000 Received: from CO1PEPF000044FD.namprd21.prod.outlook.com (2603:10b6:303:6b:cafe::ed) by MW4PR04CA0067.outlook.office365.com (2603:10b6:303:6b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34 via Frontend Transport; Wed, 6 Dec 2023 11:07:35 +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; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1PEPF000044FD.mail.protection.outlook.com (10.167.241.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7091.2 via Frontend Transport; Wed, 6 Dec 2023 11:07:35 +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.2507.34; Wed, 6 Dec 2023 05:07:32 -0600 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.2507.34; Wed, 6 Dec 2023 05:07:31 -0600 Received: from prasad-lnx-mach.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 6 Dec 2023 05:07:22 -0600 From: Venkata Prasad Potturu To: , CC: , , , , "Venkata Prasad Potturu" , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Alper Nebi Yasak , "Syed Saba Kareem" , Kuninori Morimoto , Marian Postevca , "open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [PATCH 6/7] ASoC: amd: acp: Enable dpcm_capture for MAX98388 codec Date: Wed, 6 Dec 2023 16:36:17 +0530 Message-ID: <20231206110620.1695591-6-venkataprasad.potturu@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231206110620.1695591-1-venkataprasad.potturu@amd.com> References: <20231206110620.1695591-1-venkataprasad.potturu@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044FD:EE_|DM4PR12MB5312:EE_ X-MS-Office365-Filtering-Correlation-Id: de65d562-434b-4ace-19b9-08dbf64b8d55 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vyE1O2QFvgdyMA2QFA2U3cRIBltU6Y2/1NSTPW4rEttdY/nWRgFc43lOXlMS4wpkQF+3a9pJi4uIS3njRxvskvAkwBh900377AWT/e4SKqiiigohj4OFF9jdqL6teYDtvtrMuwaNRuNBI8L0NqvAW5s0NXIeD49TORZHqBwpZVTA7yW+Wnp9mUcMtcT3DAx4zNDofN9CtNplBktlVW2OvzEQGJiSJiSpZq0Uak2m17CB/hxvea1QkNJMpeco7qFnMiyUA3jrFMkE/8ZLOxABxh6NX2JLP5CETIyAIJ53qGVKPdbRw5MZTaqOp2q1WTO+HGQr1Utsd3YCMnLtzVuqRIxotBoiR/PdTUjB0uvINfbYwaP11wr7noKyBlX36LQZKJGi1nhbS0NwpjuDNAFZS/EYfpVg82ZwbKWOhYFyzI4rWxpAGQk6JIum3AU3I7L4cow2YM1C0Lnq8jI/fF9OT1Zw6vv8MyVeLY4d/LAoP6eJ8Ug900g8URT0kbKKT9HJLmjNNCmmQYahQ65UjiSaA+bVHVUTsS6heFA4pZlEfKS+s9H/vqEgrml31MLWzdB1RW7DoqvWSj04yQjxk0y83qoHvmZe3ax5nrvB8LnTbQV+zc3q9wry04OXfXiaP8V/nxfpCgNnApHtRtYYWi87KdT0+Scg8y/KNO9w29NZBh/hYLPhRQWeZwt1OOr1OqeXBtceOIurSULuSRGtkmt6pWFXS3xkvRWys3NYHiB6yH72PlUDchLKWxFfhKGQAQAbNgHdcOkVvRYbWSzrwd6ajw== 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:(13230031)(4636009)(39860400002)(396003)(346002)(136003)(376002)(230922051799003)(1800799012)(186009)(82310400011)(451199024)(64100799003)(36840700001)(46966006)(40470700004)(36860700001)(7696005)(40480700001)(6666004)(478600001)(110136005)(54906003)(81166007)(70586007)(70206006)(356005)(316002)(26005)(2616005)(1076003)(47076005)(4326008)(8676002)(8936002)(426003)(336012)(82740400003)(5660300002)(7416002)(2906002)(40460700003)(41300700001)(86362001)(4744005)(36756003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 11:07:35.5483 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: de65d562-434b-4ace-19b9-08dbf64b8d55 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: CO1PEPF000044FD.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5312 Enable dpcm_capture for amplifier codec MAX98388 for reference stream capture in smart amplifier case. Signed-off-by: Venkata Prasad Potturu --- sound/soc/amd/acp/acp-mach-common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index 4631af028f15..b72beb8e9b13 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -1483,6 +1483,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].init = acp_card_maxim_init; } if (drv_data->amp_codec_id == MAX98388) { + links[i].dpcm_capture = 1; links[i].codecs = max98388; links[i].num_codecs = ARRAY_SIZE(max98388); links[i].ops = &acp_max98388_ops; From patchwork Wed Dec 6 11:06:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Prasad Potturu X-Patchwork-Id: 13481556 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="UfrjWdD/" Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2074.outbound.protection.outlook.com [40.107.244.74]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDE97DE; Wed, 6 Dec 2023 03:07:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SbxxFAREue76lM3mP8/oMyvFKiVI0mFn8jN9MR6JSQMbRIiAvfwfg1SYLV8Ey5RwZGC9PLi+17H1G9DfpKXJA7vqh+WToZS86kXua3B8QrPq+F4TuAc90vH3UPt1B0x4op6QiJTbcP547b6Bb2wZg9bQS5PzC5ejUw6A7AcEeDvFFgsOwpASa/2mX9+XlQXTKCnd1JhaP/JGqXYFRV88KhW8tHoTtuuuikatH0Fsn7ioekpsOWoxOWWgdYSxgJZfVBlHSxFPZUoSlWtNS3+hSgaFtKEEM6OiZR0ft8IuWiDhUGY+cmpTJAEs2+n7NLj7Apix/4r7Rs+8s4JTeAadxw== 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=qhwFWLv7JfCGRvb0WPD0pnr3Q3jEArGyuG8DCk0BwH4=; b=lQt7l8YKG58i+8L5qpN6vlSI+G+sZtbPducMKftKg3utjS3Mml4R9xlWvkro89KmZ/xIFDt7uJto+aLAdgEzkjIFquQ9aOGO2R3J7WcsW9BCXb6l9Zzijl6MRPUfx12bOFeTkViJwXbnUY3i4Vm4ABFufUUjMA9ZgUqFqvapv2KgtRds5+23o/8gEBm41j0VKk1a1w+Q++W8m/38KSy+7zv/1DRTTwoEJdZeRfrR1a913fhcZXphymaoOQTVJiSDNqdfmoBeDekUsRynBTK1sFdw68BHuh6RZ826emBEomJ7RmDBDyQ8iIMg6oI7asl+YZw5Wx6a7OHNWjFYEP15OA== 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=qhwFWLv7JfCGRvb0WPD0pnr3Q3jEArGyuG8DCk0BwH4=; b=UfrjWdD/0xy4tyEkcDxqOzKSO4yzOP1vxC/L45iY7gpDKdN7Hh5Jv0wyFln1lMRWOohe9tgxmGoYRGvrn+bRsu70/WXHdPaQOz8Dljh/D4l8+0eHJh/8KQ5QKr8Hj0H3lSTtRO5M3E6t9k4ROcARwy7UUC3XchFQIKwpCcQWtOg= Received: from MW4PR04CA0087.namprd04.prod.outlook.com (2603:10b6:303:6b::32) by BL3PR12MB6569.namprd12.prod.outlook.com (2603:10b6:208:38c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.26; Wed, 6 Dec 2023 11:07:43 +0000 Received: from CO1PEPF000044FD.namprd21.prod.outlook.com (2603:10b6:303:6b:cafe::ba) by MW4PR04CA0087.outlook.office365.com (2603:10b6:303:6b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34 via Frontend Transport; Wed, 6 Dec 2023 11:07:43 +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; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1PEPF000044FD.mail.protection.outlook.com (10.167.241.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7091.2 via Frontend Transport; Wed, 6 Dec 2023 11:07:43 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.2507.34; Wed, 6 Dec 2023 05:07:42 -0600 Received: from prasad-lnx-mach.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 6 Dec 2023 05:07:33 -0600 From: Venkata Prasad Potturu To: , CC: , , , , "Venkata Prasad Potturu" , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , "Alper Nebi Yasak" , Syed Saba Kareem , Marian Postevca , Kuninori Morimoto , "open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [PATCH 7/7] ASoC: amd: acp: Set bclk as source to set pll for rt5682s codec Date: Wed, 6 Dec 2023 16:36:18 +0530 Message-ID: <20231206110620.1695591-7-venkataprasad.potturu@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231206110620.1695591-1-venkataprasad.potturu@amd.com> References: <20231206110620.1695591-1-venkataprasad.potturu@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044FD:EE_|BL3PR12MB6569:EE_ X-MS-Office365-Filtering-Correlation-Id: 113081ba-3f16-45fb-3437-08dbf64b91de X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G88pdZ5HEcsxdXUjgGVf2TW8XCnV4LV2AaWFQKVPF/SrnqSw9097J8ml1cmc8SR5tPblHXbHjEPS0MzjZ3srbuYz1h4dPG65kHFR9EOlK1Knd1vtQ6FTNgbhx8p+Mvy+kTUZD2Py/0WwDbLUZqtDfVGxCosTV6frHfAOyHCjf+tHNNG2fxmWI3kLE3Sf3hnlnATO5hQWnButsvJS+wffC6ksGasH47prbUkJATzjoiYm9Bx57uPFo/zlJxFpwH7jGW57QMkkh+AVtlcutieKQBGokJX/X2gLFygtZqb2/IGi2NZndaTFP1AlFetX+GVSDAJ2Pt7RJPSsAyoHip2NxwOZluJ5j72IIrBClWf+PAeDUtBEqlJJTcyO0WSuw3eT8lBL5bjwOu15lVckhCsBa3FV+V+JX99l28KzDRkOi1y5vYgQv+0KJR6Zt5hThyqDCo5iiNA79brLFvDCZ1V53yllD++iX3pfKeHOoSGSZY+e4MhHRAndc2+5vc+6LANDGsHnRR7DgbvMXtg2jx2WimdXTS41dyNpPR6xKVdi/W3oD11ijkALJN4wwsLQwv7bBo+NFDdWQsXEeamzTw2c7YzOOMYJ3E8x72IHGHPON6gTmp8ON97BhEiTHAmwhOIArq1z3hICpHU1ldlsOkFdeCXyQBxXAyDejBFU/qrISVPve+WKpIksBLAP6MRt+2Jc4GBQRMWRBottFH83A2YNPUV0izHMwzzDUJKoTY/tTg2z88lv0mf63OTVTklgSn9lSdZR3Q9mxb1IzIZuXcrj/A== 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:(13230031)(4636009)(346002)(39860400002)(396003)(376002)(136003)(230922051799003)(451199024)(186009)(64100799003)(1800799012)(82310400011)(40470700004)(46966006)(36840700001)(1076003)(2616005)(41300700001)(8936002)(8676002)(4326008)(336012)(426003)(83380400001)(82740400003)(40460700003)(26005)(86362001)(478600001)(110136005)(70586007)(70206006)(316002)(54906003)(6666004)(36756003)(7696005)(36860700001)(356005)(2906002)(40480700001)(5660300002)(7416002)(81166007)(47076005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 11:07:43.1733 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 113081ba-3f16-45fb-3437-08dbf64b91de 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: CO1PEPF000044FD.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6569 Some platforms doesn't have reference mclk pin to codec, so set bclk as a clk source for rt5682s codec pll in tdm mode. Signed-off-by: Venkata Prasad Potturu --- sound/soc/amd/acp/acp-mach-common.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index b72beb8e9b13..74e83c2dae53 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -464,6 +464,22 @@ static int acp_card_rt5682s_hw_params(struct snd_pcm_substream *substream, return ret; } + if (drvdata->tdm_mode) { + ret = snd_soc_dai_set_pll(codec_dai, RT5682S_PLL1, RT5682S_PLL_S_BCLK1, + 6144000, 49152000); + if (ret < 0) { + dev_err(rtd->dev, "Failed to set codec PLL: %d\n", ret); + return ret; + } + + ret = snd_soc_dai_set_sysclk(codec_dai, RT5682S_SCLK_S_PLL1, + 49152000, SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(rtd->dev, "Failed to set codec SYSCLK: %d\n", ret); + return ret; + } + } + /* Set tdm/i2s1 master bclk ratio */ ret = snd_soc_dai_set_bclk_ratio(codec_dai, ch * format); if (ret < 0) {