From patchwork Mon Jun 26 13:55:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Saba Kareem, Syed" X-Patchwork-Id: 112962 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7514284vqr; Mon, 26 Jun 2023 07:14:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6cztCsbG+Tkb0AQc5h1U6rLPXx+gOqxeEw3hIAf7cEgD429Hp4RQUBxKCpF50vuSauT6kE X-Received: by 2002:a19:8c01:0:b0:4f8:6d99:f4f3 with SMTP id o1-20020a198c01000000b004f86d99f4f3mr12963247lfd.52.1687788895431; Mon, 26 Jun 2023 07:14:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1687788895; cv=pass; d=google.com; s=arc-20160816; b=AMaqeKTGxjYbCLPjGLudhWVO+zZCZc2Co/1FVvsqXAR6anGlfDxvWJo3JJjQipIBSs 9BlsNwA/J6Bz97Tbhima6IMxUMviYaqGUSXPRAAwO69pHcZVUuZtsFlMcwfhQelYRMGI D5HXUD9K4qO2MrKxboQd/39HqJU7EN0VsPVHMcVnFl85hoNfYeqeqYPNQxRjnlIGZNAd m6TF1Wj3VdRJrp7NO8xYdd2+QNoAoa9ZFL3wZMxdoBc4jxwb4etA6WnZs4KiQ99iCawt IPJ71gZfgK/YMvv7Rhn4C++cLP2Ef0h85Ma7B0F76050mJczINDL6Dr7HE4ruRVn4afB gAUQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iBy8FZtzhflK/O11biPfyMuMDcZU0bVlpYPp66Nv80c=; fh=jwGyvZPrPZQuPTJQDh5jRLIr3GoouyaMZopym/Bkivs=; b=eIlth5JS55sgCOiACoEmId+J/yBvwRtR/WM+OTcAb7NSycTQTTzBmLIJTjO6ThJond sMn2INLtTAiCrM7yPl2s1WRTsvULIRAwCnMG5mA09//6skZzbXfKu90shpi8TOKY7omg xgnDqoRLHarqah39NW1f1pBmJrlrehAZcWNKVHtTcINka2T/6y1zwT4XmO59ROQe1/rD yFNlSLtmO8inA5vu1d90g+L0eXEpUTdrabvP73I0f5nSsIJAOb4cYs6v0xk0WTy/05Sb BV0/7inc+iMi9qBsQ+2Llt7Zs6Umm04/+RKKEGQEnghQpx4Zl/ixenkggWYyW4Al63LZ 0K5Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=ytdCZywe; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l22-20020aa7cad6000000b0051bec072038si2555334edt.260.2023.06.26.07.14.30; Mon, 26 Jun 2023 07:14:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=ytdCZywe; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230413AbjFZN5s (ORCPT + 99 others); Mon, 26 Jun 2023 09:57:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230296AbjFZN5a (ORCPT ); Mon, 26 Jun 2023 09:57:30 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2056.outbound.protection.outlook.com [40.107.92.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4803410C4 for ; Mon, 26 Jun 2023 06:57:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NFD3iYK+efdKwRFHPeM0doxbL7aeBHnNAkN1QJTfSxUq36cy9fJadhEBtJSASNYZk47mTOekOzoFSyHu0WduqXEhtjkxAyZsbfn/Drk+q+fr1nd60ZrBgnNUkRc6JfwHvusVA2DIwGXyi/5vCDxSf4yQrf01bi67FXETS8frCZHBwsZ72PLoy3LgiS16lmlIQMgMf0PlSblOLmRONVsCJz7kWDtS2KCl9nOuLQF+UhDeisTypWG6V7+hqIovxGwNodqV6BRHlA6wfRXly73mVtqHUWmodAQV4v+PMRps5zmivxkAkRK+b8o+WRyhrwb3hjq5DxNrUz/jvmTDZ+q1QQ== 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=iBy8FZtzhflK/O11biPfyMuMDcZU0bVlpYPp66Nv80c=; b=bDoAafdjy/TLv/MfekvjxjOekf2u31kOPk/IT6NpQFsAARtw3rV2bYw0rC327DzdiCTPYHPffERt03Vv5S60zMCxoPXlXabCwruYIz++aAVS5csbFa7ZHlrRqI3RcSamJwwcHTvYvzFry6vWPjyvMHWewov0+kfWes4FqI9yGnEzreV7aSWGwPPqeK+3hzd8Fc9kjlUwbmwIRzwwJuEW9KuHP0hqBdOiM20AuT7h5QMg94DRgcuRUJ7ci+5AgdnRiEa+cosh+naXeq0SwGjIXHJCwhdlsQ0YwFb51U0h/R+bRYTefiQ1hfD6FGcZBpQNlvbGl5nxM0NZePhH1AxGsA== 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=iBy8FZtzhflK/O11biPfyMuMDcZU0bVlpYPp66Nv80c=; b=ytdCZywevSpL9TvBio4cfSl5tL/7sswFpzBBvBfd8NcFRS/7Gf7DPQ14q7KECOci0NvJ/yw8oJ5T9dZ2+02TLjeRkUMQx8GNv1HL5nR45TjfTayZRKb52vjqYxwXeqUYwMyYcoaISGlaz4sRB+Q4CdMsMK7RC+wR6qbGZdGG2ro= Received: from BN9PR03CA0301.namprd03.prod.outlook.com (2603:10b6:408:112::6) by CH2PR12MB4118.namprd12.prod.outlook.com (2603:10b6:610:a4::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Mon, 26 Jun 2023 13:56:58 +0000 Received: from BN8NAM11FT099.eop-nam11.prod.protection.outlook.com (2603:10b6:408:112:cafe::ca) by BN9PR03CA0301.outlook.office365.com (2603:10b6:408:112::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Mon, 26 Jun 2023 13:56:58 +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 BN8NAM11FT099.mail.protection.outlook.com (10.13.177.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6500.47 via Frontend Transport; Mon, 26 Jun 2023 13:56:58 +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.23; Mon, 26 Jun 2023 08:56:58 -0500 Received: from amd-B450M-DS3H.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.23 via Frontend Transport; Mon, 26 Jun 2023 08:56:54 -0500 From: Syed Saba Kareem To: , CC: , , , Syed Saba Kareem , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , V sujith kumar Reddy , Venkata Prasad Potturu , Ajit Kumar Pandey , open list Subject: [PATCH v2 09/10] ASoC: amd: acp: move pdm macros to common header file Date: Mon, 26 Jun 2023 19:25:13 +0530 Message-ID: <20230626135515.1252063-10-Syed.SabaKareem@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230626135515.1252063-1-Syed.SabaKareem@amd.com> References: <20230626135515.1252063-1-Syed.SabaKareem@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT099:EE_|CH2PR12MB4118:EE_ X-MS-Office365-Filtering-Correlation-Id: ce468f8f-d0f5-4fd7-34a3-08db764d3592 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GtmOSUB7WGO3mUZS3t23KzfEwP64MXOerAd3ZgsRfuUtMf2X8h3YUC9CbXo44nyOskp13LO0a3OiAo1qSH7CAM0j19s6M0xWdJvjer/1cGUf/NUH9yXUupF6hffG0fJ8/2S9h3dIr1krjkt9l9DC5MJHJwSpA08oYkV99Gq8/mtNR6G3gkDfgFUHAjusEujJ2ShZ/em0E+ADWXuNidRtdp7lfRVPwDGCW+m6WT6Xf108wMftYDAnGL8ntUaY+EdcvFugtJVZEK4blLYsrI2/zWe9Scb0k5e+d5p1HBcj6j935G0RMzjDpz5fcVGiDWEV+sjhIZFcCuzie6XzknHvnZQ3IyGi/4BdzMqmzxeayCd5KRVI/CB9sSu0rCbmhs5w4NBmm9M0HE9fWSgFVrVf9kvYM/ihtUsi5j75do/VcTOL3HYHEBO7YyGRN1lQ80lSdV96yoOv1hokYgiLESwMqIF6YCALUcPtx4fTh2ImZ/l+35KOb+f80aWnSRSBe/SHRTVboHeFyLLZJIDWdnZhbhAj+mO6mYJ1QzxERCryf7ZGXkbegiVZ7AsGx/3a9CWAp3cdRrSJv/ZI0/eVlhCxZX7vSYtzSiGeUv+H2Qtd4/6HCEylUl9qZFREG2r65uUwyfwHao0qgAhg5qzF3zhZ6gdEeYxLeAqdGx6/kXVIkpgqywfc2YERWF8o6DLe8Si7Dds6s9pkXkd8fEFR4fpCin1kZ1NLtt8PjKq+BvYrIvQsYVjJ/KhxvxkTLsyXX0iiUcsyJol6J4wIeytU4pfahg== 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:(13230028)(4636009)(376002)(396003)(39860400002)(136003)(346002)(451199021)(46966006)(36840700001)(40470700004)(2906002)(186003)(26005)(1076003)(426003)(47076005)(2616005)(81166007)(336012)(356005)(40480700001)(36860700001)(41300700001)(40460700003)(83380400001)(70586007)(70206006)(8936002)(8676002)(36756003)(82740400003)(6666004)(54906003)(7696005)(86362001)(110136005)(478600001)(4326008)(316002)(82310400005)(5660300002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2023 13:56:58.5921 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ce468f8f-d0f5-4fd7-34a3-08db764d3592 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: BN8NAM11FT099.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4118 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769774928896744817?= X-GMAIL-MSGID: =?utf-8?q?1769774928896744817?= Move pdm related macros from pdm file to common header file so that it can be used across different files. Signed-off-by: Syed Saba Kareem --- sound/soc/amd/acp/acp-pdm.c | 12 ------------ sound/soc/amd/acp/amd.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/amd/acp/acp-pdm.c b/sound/soc/amd/acp/acp-pdm.c index 2833d2b7e596..f754bf79b5e3 100644 --- a/sound/soc/amd/acp/acp-pdm.c +++ b/sound/soc/amd/acp/acp-pdm.c @@ -25,18 +25,6 @@ #define DRV_NAME "acp-pdm" -#define PDM_DMA_STAT 0x10 -#define PDM_DMA_INTR_MASK 0x10000 -#define PDM_DEC_64 0x2 -#define PDM_CLK_FREQ_MASK 0x07 -#define PDM_MISC_CTRL_MASK 0x10 -#define PDM_ENABLE 0x01 -#define PDM_DISABLE 0x00 -#define DMA_EN_MASK 0x02 -#define DELAY_US 5 -#define PDM_TIMEOUT 1000 -#define ACP_REGION2_OFFSET 0x02000000 - static int acp_dmic_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { diff --git a/sound/soc/amd/acp/amd.h b/sound/soc/amd/acp/amd.h index 82e0684cb284..8dc663c8d98a 100644 --- a/sound/soc/amd/acp/amd.h +++ b/sound/soc/amd/acp/amd.h @@ -111,6 +111,18 @@ #define ACP_TIMEOUT 500 #define DELAY_US 5 +#define PDM_DMA_STAT 0x10 +#define PDM_DMA_INTR_MASK 0x10000 +#define PDM_DEC_64 0x2 +#define PDM_CLK_FREQ_MASK 0x07 +#define PDM_MISC_CTRL_MASK 0x10 +#define PDM_ENABLE 0x01 +#define PDM_DISABLE 0x00 +#define DMA_EN_MASK 0x02 +#define DELAY_US 5 +#define PDM_TIMEOUT 1000 +#define ACP_REGION2_OFFSET 0x02000000 + struct acp_chip_info { char *name; /* Platform name */ unsigned int acp_rev; /* ACP Revision id */